mail-mta/nullmailer: Drop old, obsoletes #521552 & #532588

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

3 files changed, 23 insertions, 185 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index fd08dffe574d..90b3ce2a487c 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,9 @@
 # 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.90 2014/12/31 16:20:24 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.91 2015/01/05 12:46:00 jlec Exp $
+
+  05 Jan 2015; Justin Lecher <jlec@gentoo.org> -nullmailer-1.13-r4.ebuild:
+  Drop old, obsoletes #521552 & #532588
 
   31 Dec 2014; Agostino Sarubbo <ago@gentoo.org> nullmailer-1.13-r5.ebuild:
   Stable for ppc, wrt bug #532622
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index 863f43f46ffd..b31a8de4c3f4 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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-r4.ebuild 4778 SHA256 cdef6108ec43cb8dbfe30ba3eaf3766ca14e64ea478fb6fb47b3283587f64888 SHA512 2ab984a2bb8c72390fe8ff61e75c8ddaf6ffdc88927353d5a7097f20b6503b9656656c59d8bcf0541e9ca4274f9603342aac8c665b50461eea71aec88671deaa WHIRLPOOL 6856ce373577475d062dc12d11a204824057f8176ba635cc7184826768f9dd031c187e2d8fad11137fbef09191a5f565befa2bb8a5ee33e1c6db3795b1306596
 EBUILD nullmailer-1.13-r5.ebuild 4810 SHA256 83d4636f376a4e6f76c46405e0b4c860c88556f594ab764866a695cd5e5dee0d SHA512 f19fcc7fa3d3c326356eeeca954353636fd1badb38e13ee50c7c4cfe821270fca7f561a503d0d45e84836a59954e04c28980e4f4a6611ea6bf939d186deb63a5 WHIRLPOOL d8c2982411f056ad1be0bd6f5a83473ebc322bf061d53f99b6c69ccae3646e78da5af0232a2ddf81809ef97230b469799b7452dfce5c4a5fc8b794724834f8d4
-MISC ChangeLog 16209 SHA256 855eddb16cd13513e15a6237f7a6fa0e8887845a010fb33223f24f0ab62fc1f7 SHA512 a7ef162e5ff515f9a69fc8d6319908733cfa56d05e9af0acc6fa34687efee2583504bc71409786539c827b26fb1fcb56917e887d8e5af6c508fe7b1ee2addec0 WHIRLPOOL 09db56303dc245e23d9058a382808c0564763551a83c55b47249a7a286bd687f7d203533d0f65aa5aa95163654e5a91317f53c1960551b748a216fd626b271a6
+MISC ChangeLog 16326 SHA256 707dc5811173c1622e66d4dfd7f063abb525573a8986c88f99e2322a1aa84384 SHA512 e1a5fb29a5d82686691da543e063411b18adfd9ec5a9f198f80e897ab5a4b3425d432cb2edc08b3e28acdaed8d75323a3a752a7edf935c3d0690d1b7d4236851 WHIRLPOOL 60749ed97297c103861a6783a8ebd96c381d28245acd41472862ab2e0f18680a7dd384a6a49fca0cc3d96cece356d859f436267cb95e60efc566a568d4df5611
 MISC metadata.xml 363 SHA256 838fae6a4f4cabb0217b0d1ebbd63acf840e802b3852e7360a4b9ae12a10459e SHA512 18675ce1eba12e093f0d73ac35ca6e456d2d7c0b1f3eee41d9b5bb466391778e3aed877d06028e7fa28c121dfff20fd6729451e5c5706a5ebc33a4f3c10c6f85 WHIRLPOOL d8911b227b42c2f4e47d68cb72f65c1e3349df2e34659aa4a597522138e9f8b055913829e504e11492db81081fbeb51e4b62512aeffde65d105e1120fbd572a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUpCJJAAoJELp701BxlEWfOccQAJRnTN7otAIu4dcNOmJauaXM
-cTblZPcVsxJMz78SNuY8iBaVsS9yNDaZLYc9AVzAiT48kDvOcK6ArJp2gFhrCRG+
-lZ4hc5VV7Juwz/75OpP0nN4c6FNPbRtYXg94N1GJyREicQ7SWDFfE7Rk7PLcoJi4
-2obYksi2vRQe60y+/IXcy/1TOUrjwwIfGOrHuE3MR9rf9G1Hv0TIJHm+x8paIyah
-RVAm8X82/K90nZqGnGeb6eRaN0MvuWX54qLdp6M8inAw6w6ggB/Sm9XI2Y8WgQzd
-g0KGk3gJ9d4nmJ0Oyd18qSdg2kH64zod31qrRQ88jknjEALPdXF0Sm67/5loelXO
-n5P96FfGDYWglxgEEUYCWsNZLFJUSckJI+b9NS5YOTn1y8tgbdFESreWGRY2ydGw
-UYAV+Ipig/1vZBLiiQgcYe0BHENUB2AMNcgrThq225ioaYN5jjGUDaJOfXrlH7wh
-B1RkIqwGOYXPMVi6g7WpSuwg8FDqY1WVRe9zEOlciBF9dJAUWoi9n1wKge/er8TJ
-mGiVYlIDo5wZvOGg75fq7sAxmMwIIVvFlGk0U8C7nS+CcT70UF/93CK/es2O8dgd
-bLrTJIHAqEz37KBLz+UVYMwFQLiU3powXwQ4MEvsL/sZsjfG3TVjo3Y/2wIcpWmU
-j7YONoClm2+09NJwKTcM
-=w5Cp
+iQJ8BAEBCgBmBQJUqod4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViroRoP/0LNSpKTb7hCCARBL0gXIrxG
+nmwECZsgLzI1jXwzgzzRzCiJ/SRo7/nUglPxCWpyjrin2BhD6dNS1/kyDbs1b3cd
+SjBP+CGMtFL2MJSxrD/jqUlLyoDHTLtRTcwR1RAQ/3oQNngdbA16C2VVO5e6vTZb
+BMelX38og85cPXwi1kMWRUtl0FmmYW0qh2n73cnob9Lr349wL5/gBY/NtDzo86or
+0kE4XUAcEB8C4cE/ShYqyMkwroo+A7rd4Iv+MfTMY0/5Vx4efTsWgZK8oSqHqr3j
++1cVsimWHE6VIcnYB/KOn7un0Auo2VI/uqdq9EF1dQ4oh/1gtHTug6ycCzRqfZYj
+5ETSqJkSYr1LVAY5bPy9lujj4C8loiS6fI7LgSUAnjH4ypgLM8PWzKmpnc7+vm38
+mmux1ohsDZ8wVyQw/wWPD6nM0Y24k+cheY8Zo1cz7i+MfCWfqG5srEjILviCs31T
+WH0RswsU6ACur5x5JjUUCj2hKa2mIwMneoJM/RuGPPq9DTzvceIkSuN3OKUGXfgC
+6GJh3mOXXfW8lntpAksli+L9riVExRAP9Utz+g9kExXjFHxY5APt/vD/InUX+axq
+0z93fTe8ZwlqF2aagfIKrWeuhBJmhz6NgC7QgCqZ6zROxqJEFTnw08jpEhSGwZtQ
+pUkdpmPXzhKT/KC9pZ0Z
+=HIYc
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r4.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r4.ebuild
deleted file mode 100644
index d76f962c6859..000000000000
--- a/mail-mta/nullmailer/nullmailer-1.13-r4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r4.ebuild,v 1.4 2014/03/24 15:09:47 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
-	http://dev.gentoo.org/~jlec/distfiles/${PN}-patches-${PV}.tar.xz"
-#		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
-
-	# old debian patches from 1.11
-	# DO NOT APPLY patch 0009... It breaks
-	epatch "${WORKDIR}"/patches/000{1..8}*patch
-
-	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-r4 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
-}