mail-mta/nullmailer: Drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 22 insertions, 227 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index fbf02b986817..42c6cdd69f85 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.85 2014/03/24 15:09:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.86 2014/03/27 07:15:09 jlec Exp $
+
+  27 Mar 2014; Justin Lecher <jlec@gentoo.org> -nullmailer-1.13-r2.ebuild,
+  -files/init.d-nullmailer-r3:
+  Drop old
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> nullmailer-1.13-r4.ebuild:
   Stable for ppc, wrt bug #502832
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index afa3bd999c31..dfe3afb95827 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX init.d-nullmailer-r3 1076 SHA256 1f59a1e06c5c709f16343c581ffa318f4c8eb342b77f86af52af8d736f77b6bd SHA512 041d6269a270cd8aea1b1d5b9175d5de3e44386e87e6f14109416459f6b484caf4f85a200644c4e0ea5c431e6b58c6804e56c0f961ac23eecfd7ff7026761945 WHIRLPOOL b71cef10bfe9211d08f03c4fa480a8a5c2a33ff42c8889a273303af37b8e6b75a7bf29e0f90ddff4410675daf0cb4276efa1e3186b4c6006a22c1c3a0bbfe60b
 AUX init.d-nullmailer-r4 1094 SHA256 91d39a07d712f03be51e15682ae92ce4e260e6add9f3c0fe452db9121d2b5022 SHA512 86554e37fa06a3e58946f283324206638419a78a48e8b754a1546b49dd26c7c9c165a192d5d3b9ce0db423fe4a2e9fd98818503249417c9cac999d6de83620d0 WHIRLPOOL 29a130e1220926af4a9ce037662cf40d2bdd152220b7adf44c0b04bdc6ddac93800a298bc06e288fdc3944836dbd9252d6a43cad5304fa07895c9da6189aa21d
 AUX nullmailer.service 401 SHA256 2fe58518b9a024c2136bd6b20cd7bd9458a37f32bc3e6be1203cb5711e8b8ba5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7 WHIRLPOOL f81a87473ce5c4f4717aba023ce62cfb72b6b964b6c34aa7dc25f5826cf5ab41eeeed3d3de329cc6abc662fbd4436a1b5bbb744b09dff4be75cca84e8cf062e0
 AUX remotes.sample-1.13 970 SHA256 56b9adc7762cfac88769ee6a87fa5057a42599a3d50a3cfd1c6d8d9327d02080 SHA512 8ff23a3f30e9f3b8bfca05f6e8bda44d8142b547c667d604e5e1f15b49342e0a098591578ef26c599a965d0b17e7237232e6713bb7b95b2af4e3bf6bde2604c6 WHIRLPOOL 39e87ec264d023c4d3852d1173bf9e87b8eb35fe3809c9ebfa3d2c9be81ad9a709fc1c873697be8ad80c01881566542cb8950a5e312ed9e06c65535c8cd4dac4
 DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c
 DIST nullmailer-patches-1.13.tar.xz 8384 SHA256 8685dfbf23e9dc15269b1a0d14f700c4ef990cf49d4e6e830c0217289e8f4733 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c WHIRLPOOL 84f523be7963ceb7fbafd3f5632571e7bc12085b1b4bce5bb5c63871fd6c7ed1367a49ddf5ed66acad7055e28856b23fb1dcb59e60158fed26447128edd0a4fa
-EBUILD nullmailer-1.13-r2.ebuild 4591 SHA256 9e0436548344929ca230a5fac83425f4faa16e0aff77e969d208f2254db10106 SHA512 c75584d2b01022cb89ea80654154598314b017cb3bd83c88c3b102a3b5be38f8ce6cf3ce518b8606626ac67dd75bf4238f27b5af23d3d1338c65212e0c952361 WHIRLPOOL dda295707aa653c8bb5e81b8d4df88a70e89b7a8cb7088aca6f23491203b4f3a83c51befb48ee7e3ed708eeeb1e2f15ff5aa80f8bfe150c9c2d2d35b86d52aa4
 EBUILD nullmailer-1.13-r4.ebuild 4778 SHA256 cdef6108ec43cb8dbfe30ba3eaf3766ca14e64ea478fb6fb47b3283587f64888 SHA512 2ab984a2bb8c72390fe8ff61e75c8ddaf6ffdc88927353d5a7097f20b6503b9656656c59d8bcf0541e9ca4274f9603342aac8c665b50461eea71aec88671deaa WHIRLPOOL 6856ce373577475d062dc12d11a204824057f8176ba635cc7184826768f9dd031c187e2d8fad11137fbef09191a5f565befa2bb8a5ee33e1c6db3795b1306596
-MISC ChangeLog 15538 SHA256 16802f1bc19dea4b5c57ee08e84d52ca5ff9bf0e81e660ecbdedd278231b366c SHA512 e9f6d066b168617df4f6b6270a7d1b14e8cbbd7b520205b3dc46c2342c271e28fa882423cfc16313bcbf056f6aaa9f2ec9ced7ecba358df13c64e1096c6c1702 WHIRLPOOL 98e50de8faf8fbd2520095643702baf3dbe05c30f1ae0c939e87a972b2a9cc108ffe68fae608bf17f1e802ccf1b38823449e2ba49bded3fc58424c8487fc94e8
+MISC ChangeLog 15657 SHA256 3e6c5ae22be9de168391492f055f7c6813f48a536ce7af24f0eb02fde0b500c4 SHA512 4dff732bea93ab1bfddaaa049610082a4eab3b370a84f233e23f82f8dbf6f7fe55a9a871869f0510f9ce776d8dec7709a987e9d4ebb09acc1385ac70babd2e3b WHIRLPOOL 51462cfc23ecd65f1af2dc89628cc77d883534f4507baf1b8aef04fe7fbd3a34f97f6ab1671af77c6dcc6140c822abc6737a85071cf3db2cc6e7d8e38af46c5b
 MISC metadata.xml 363 SHA256 838fae6a4f4cabb0217b0d1ebbd63acf840e802b3852e7360a4b9ae12a10459e SHA512 18675ce1eba12e093f0d73ac35ca6e456d2d7c0b1f3eee41d9b5bb466391778e3aed877d06028e7fa28c121dfff20fd6729451e5c5706a5ebc33a4f3c10c6f85 WHIRLPOOL d8911b227b42c2f4e47d68cb72f65c1e3349df2e34659aa4a597522138e9f8b055913829e504e11492db81081fbeb51e4b62512aeffde65d105e1120fbd572a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMEq8AAoJELp701BxlEWfE6gP/i3N3HK3DJ2jwMn7Id+uy/LE
-LhohNK/5R3isyJk7KB5KTTD1LOBU0/RtIy+U1nT+3FDZ2fSrgTTBuk5geqH2+agn
-zJ0CXLTBs5ZFCYWLo6vuf56lAEmZSlFFsgjyye5b13YAqKSePAUNqGznX4LvGQf2
-5f5+LRy9u5wXsv/ngta4J5k9dpDN9HP7FIufF5vsdqRViyTYforABm6U6McUVcPg
-yHu3BKoodeVe64UMwkTICRqtGVWWHQBgsxhPtqISdZrTicIPXo7FZWp3y/w9HXOE
-tTjn5LoyVg7He5GqZctYfVKdWflh64IW0Y3JB/TpSY0Ng+pc+qdbRxAyDZgHgKJK
-sXNDFovDLM38sR4GeP+V4kKPvsaWH5RhtG2yfVEMcZzh8rg4MwOsWYTYy/+SpY+y
-kI+IqDvlfRs85IsdaHPP7pcsYWm1PcfW0ciuUBZfHxe12DeiA1H0TwOwcW1I9lvA
-+BVXn2+mqyRrmFAb4aZXuuXb4PFj0NiUCGUp3Ua1sq6djGRFoh59Y4aDvdnSge00
-VTzxis5uOZlZk27Dx6prKQ0wfTli1WmLijvzWkYkoSLCBqoTQEmsSfn4LTQVeMS4
-52VAMdtbyEiI8rnsxw6IBEQjXw9IYRJlNtFsIuRJ3EiOjX4K961Rg/jGKjJZ6gFS
-C8wvr/88xtUNujqKyK4z
-=Vrz3
+iQJ8BAEBCgBmBQJTM8/9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirMisP/j+FkeDo5xwXJ1a54MF7ucOh
+pREuKdZqWKv36rQlfxXaCkKBtsnSIvl5xtpyQvxakZvrTa4yNR5CfTqV3gfxS1gd
+AFur60f76sBauLVD1qlD7sI11Tp8gCqlRYENtUh9xunDe5WvdPWm3yDSYbkvCqic
+oBEwpDoCXQAedF+UdMVaZkdX3qbWf6geppNu+AysVr1+49ikCcbIxOua3PakmQUl
+9NEfR8e/sNVJLZKKY1inaucIgacrkeBxSSAlnpV06sJe5qX1DT+IPHyGU+nuNIz3
+Fls0pDlVHyQxoWzOWqhHxXpEsn9ELXvpqpUvgIaTGSBveoVA6G9Cuj5oJPOM2Ppw
+MD6s7v76ezZmzK99Tk2eVTBWJunGtO7KbTZ3D3YU0+c3+VWVmMXolDWJoIak8kqi
+Zl8fPihJASwtdYms0ow/4Cb5HYpwXn2XcSML+0BIoZdoPavsl2VeLs3G0miHQmwT
+clHlBt/eb+b5hdienOQv7hMnkDjMakxEshiKAjjLSkY5heAtEz3DU2O8iFjstR3h
+BeBO6xs2nVMaJnCs5X55dMyHdtjfPYghcor8Xccxgqh132O2B3dbHC5AngXcSeXs
+sTXLqlmByRkPhKILmgVJsijLi9BRBY5fm5t2Kbww3BpylmaP3eN6pkvNHvdjZ6iA
+cDTnwQKD14v56p0Js2eq
+=fizd
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/files/init.d-nullmailer-r3 b/mail-mta/nullmailer/files/init.d-nullmailer-r3
deleted file mode 100755
index f55ef1fe6c06..000000000000
--- a/mail-mta/nullmailer/files/init.d-nullmailer-r3
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/files/init.d-nullmailer-r3,v 1.1 2013/09/25 10:16:59 jlec Exp $
-
-command="/usr/sbin/nullmailer-send"
-
-start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail"
-
-required_dirs="/var/nullmailer"
-pidfile="/run/nullmailer.pid"
-command_background="true"
-
-depend() {
-	use net logger
-}
-
-checkconfig() {
-	local error=0
-	local f=/etc/nullmailer/me
-	if [ ! -s ${f} ]; then
-		eerror "${f} does not exist"
-		error=1
-	fi
-	f=/etc/nullmailer/defaultdomain
-	if [ ! -s ${f} ]; then
-		eerror "${f} does not exist"
-		error=1
-	fi
-	if [ ${error} -eq 1 ]; then
-		einfo "You need to run 'emerge --config nullmailer'!"
-	fi
-	if [ -e /service/nullmailer ]; then
-		eerror "Nullmailer is already running under svscan!"
-		error=2
-	fi
-	if [ ${error} -ne 0 ]; then
-		return 1
-	else
-		return 0
-	fi
-}
-
-start_pre() {
-	checkconfig
-}
-
-stop_pre() {
-	checkconfig # to avoid init.d stopping svscan instance
-}
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
deleted file mode 100644
index 56be346769ea..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r2.ebuild,v 1.5 2013/12/21 18:56:55 ago Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib systemd user
-
-MY_P="${P/_rc/RC}"
-
-DEBIAN_PV=1.11
-DEBIAN_PR="2"
-DEBIAN_P="${PN}-${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P/-/_}-${DEBIAN_PR}"
-DEBIAN_SRC="${DEBIAN_PF}.debian.tar.gz"
-
-DESCRIPTION="Simple relay-only local mail transport agent"
-HOMEPAGE="http://untroubled.org/nullmailer/"
-SRC_URI="http://untroubled.org/${PN}/archive/${MY_P}.tar.gz"
-#		mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE="ssl"
-
-DEPEND="
-	sys-apps/groff
-	ssl? ( net-libs/gnutls )"
-RDEPEND="
-	virtual/logger
-	virtual/shadow
-	ssl? ( net-libs/gnutls )
-	!mail-mta/courier
-	!mail-mta/esmtp
-	!mail-mta/exim
-	!mail-mta/mini-qmail
-	!mail-mta/msmtp
-	!mail-mta/netqmail
-	!mail-mta/postfix
-	!mail-mta/qmail-ldap
-	!mail-mta/sendmail
-	!mail-mta/opensmtpd
-	!mail-mta/ssmtp"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup nullmail 88
-	enewuser nullmail 88 -1 /var/nullmailer nullmail
-}
-
-src_prepare() {
-#	sed -i -e 's/nullmailer-1.10/nullmailer-1.11/g' \
-#		"${WORKDIR}"/debian/patches/*.diff || die
-#	EPATCH_OPTS="-d ${S} -p1" \
-#	epatch "${DISTDIR}"/${DEBIAN_SRC}
-	# why revert?  Ask Robin when he is back!
-#	EPATCH_OPTS="-d ${WORKDIR} -p0 -R" \
-#	epatch "${WORKDIR}"/debian/patches/02_ipv6.diff
-	# this fixes the debian daemon/syslog to actually compile
-	sed -i.orig \
-		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
-		"${S}"/src/Makefile.am || die "Sed failed"
-	sed -i.orig \
-		-e '/\$(localstatedir)\/trigger/d' \
-		"${S}"/Makefile.am || die "Sed failed"
-	sed \
-		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
-		-i configure.in || die
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-	eautoreconf
-}
-
-src_configure() {
-	# Note that we pass a different directory below due to bugs in the makefile!
-	econf \
-		--localstatedir=/var \
-		$(use_enable ssl tls)
-}
-
-src_install () {
-	einstall localstatedir="${D}"/var/nullmailer
-
-	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO
-
-	# A small bit of sample config
-	insinto /etc/nullmailer
-	newins "${FILESDIR}"/remotes.sample-${PV} remotes
-
-	# This contains passwords, so should be secure
-	fperms 0640 /etc/nullmailer/remotes
-	fowners root:nullmail /etc/nullmailer/remotes
-
-	# daemontools stuff
-	dodir /var/nullmailer/service{,/log}
-
-	insinto /var/nullmailer/service
-	newins scripts/nullmailer.run run
-	fperms 700 /var/nullmailer/service/run
-
-	insinto /var/nullmailer/service/log
-	newins scripts/nullmailer-log.run run
-	fperms 700 /var/nullmailer/service/log/run
-
-	# usability
-	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
-
-	# permissions stuff
-	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
-	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
-
-	newinitd "${FILESDIR}"/init.d-nullmailer-r3 nullmailer
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	if [ ! -e "${ROOT}"/var/nullmailer/trigger ]; then
-		mkfifo "${ROOT}"/var/nullmailer/trigger
-	fi
-	chown nullmail:nullmail \
-		"${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger} || die
-	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue} || die
-	chmod 660 "${ROOT}"/var/nullmailer/trigger || die
-
-	# This contains passwords, so should be secure
-	chmod 0640 /etc/nullmailer/remotes || die
-	chown root:nullmail /etc/nullmailer/remotes || die
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To create an initial setup, please do:"
-		elog "emerge --config =${CATEGORY}/${PF}"
-	fi
-	#echo
-	#elog "To start nullmailer at boot you may use either the nullmailer init.d"
-	#elog "script, or emerge sys-process/supervise-scripts, enable the"
-	#elog "svscan init.d script and create the following link:"
-	#elog "ln -fs /var/nullmailer/service /service/nullmailer"
-	#echo
-}
-
-pkg_postrm() {
-	if [[ -e "${ROOT}"/var/nullmailer/trigger ]]; then
-		rm "${ROOT}"/var/nullmailer/trigger || die
-	fi
-}
-
-pkg_config() {
-	if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then
-		einfo "Setting /etc/nullmailer/me"
-		/bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me
-	fi
-	if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then
-		einfo "Setting /etc/nullmailer/defaultdomain"
-		/bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain
-	fi
-}