remove -r1 with unnecessary TMP fix - fix SRC_URI, honor ROOT

(Portage version: 2.1-r1)
 (Unsigned Manifest commit)

3 files changed, 23 insertions, 62 deletions

diff --git a/net-mail/qmail-qfilter/Manifest b/net-mail/qmail-qfilter/Manifest
index 83dc5458fa3f..f19ede725749 100644
--- a/net-mail/qmail-qfilter/Manifest
+++ b/net-mail/qmail-qfilter/Manifest
@@ -1,8 +1,24 @@
-MD5 419d16230448aacd700dc31af43ace55 ChangeLog 1845
-MD5 1e65732b4867860ca2730089153ac275 files/digest-qmail-qfilter-2.0 68
-MD5 b72be61d0b21a050ef4bdb30c5b6f37d files/digest-qmail-qfilter-2.1 250
-MD5 2681aa260980579fc0ebb844b0b197ab files/digest-qmail-qfilter-2.1-r1 68
-MD5 6960049fd2ef514faf55d683311edbb3 metadata.xml 484
+DIST qmail-qfilter-2.0.tar.gz 16251 RMD160 d3a81e53d1ffe786963e5367b40e2926c445ec94 SHA1 35c7ef9ebf11f75aab8f5b614546e2b432141364 SHA256 3d3ad41fab5198ae3a00383247fc8cd12a2d342f33e60867a0b3bff0e17b2df2
+DIST qmail-qfilter-2.1.tar.gz 22242 RMD160 4336fef69e7f5216d11b4ee71110b7c9504d3970 SHA1 5ac595a9b6f7c14efa1bca3621fa16abfc382fc0 SHA256 67d7f6d92eb034b1696ceb1672114c871dde06618c33dfc7f83e3a6667034468
+EBUILD qmail-qfilter-2.0.ebuild 1153 RMD160 a49eafc5932191159c1bb6173a186b60ad22abe0 SHA1 4211c4fa4a6ea0b71493c168d0bb9dbfbb888209 SHA256 749780c6aacbbbfe117e9c06d3be2d26d97955c83cff8094a10a27cd8a8aa866
 MD5 60d50141bfd209aed95f3a95cc86938c qmail-qfilter-2.0.ebuild 1153
-MD5 b7f8887f65d21be1807bf86176a009d8 qmail-qfilter-2.1-r1.ebuild 1382
-MD5 5708874da34be11605550109db02491a qmail-qfilter-2.1.ebuild 1152
+RMD160 a49eafc5932191159c1bb6173a186b60ad22abe0 qmail-qfilter-2.0.ebuild 1153
+SHA256 749780c6aacbbbfe117e9c06d3be2d26d97955c83cff8094a10a27cd8a8aa866 qmail-qfilter-2.0.ebuild 1153
+EBUILD qmail-qfilter-2.1.ebuild 1167 RMD160 29146754306440dc8ab74db0e8cae6d67869557d SHA1 aac498b0ce7013936e0bd5ea96c141e4f12eab78 SHA256 94415bf02d48d7bc6c2e63988d03216034dce25930e1d3f0a000133a1c09cf5b
+MD5 3ec15f37945a5dd9b9b759c529f722e5 qmail-qfilter-2.1.ebuild 1167
+RMD160 29146754306440dc8ab74db0e8cae6d67869557d qmail-qfilter-2.1.ebuild 1167
+SHA256 94415bf02d48d7bc6c2e63988d03216034dce25930e1d3f0a000133a1c09cf5b qmail-qfilter-2.1.ebuild 1167
+MISC ChangeLog 2018 RMD160 4a173e753683cf0f58989d55a5fa5c3484645b34 SHA1 66a9f4ca6c84625774730a23bafda57ce135121e SHA256 460590ecc456de811abfb8aa2b40c4f33562ebf092950b0e6ff493d619b5b9a8
+MD5 6a60797888f1f688e39d0acc29781514 ChangeLog 2018
+RMD160 4a173e753683cf0f58989d55a5fa5c3484645b34 ChangeLog 2018
+SHA256 460590ecc456de811abfb8aa2b40c4f33562ebf092950b0e6ff493d619b5b9a8 ChangeLog 2018
+MISC metadata.xml 484 RMD160 3f53772cecc0b619882d298de58890a7716276df SHA1 0030683931600fd223acbfccef707cdfed164d9f SHA256 273c866d1f6bfe2aebf909bef815b2ff0de3ecbb674ee23b6431c939064dc199
+MD5 6960049fd2ef514faf55d683311edbb3 metadata.xml 484
+RMD160 3f53772cecc0b619882d298de58890a7716276df metadata.xml 484
+SHA256 273c866d1f6bfe2aebf909bef815b2ff0de3ecbb674ee23b6431c939064dc199 metadata.xml 484
+MD5 66e3d59272a68ab2f283e885a2ff717f files/digest-qmail-qfilter-2.0 250
+RMD160 989f5b57b8fa9d2f10099bebd96d783cae0cf4ca files/digest-qmail-qfilter-2.0 250
+SHA256 9922bdb04eff79075bd61115cd50873624a4a61f2e2e2fdca00e0f2829ece894 files/digest-qmail-qfilter-2.0 250
+MD5 b72be61d0b21a050ef4bdb30c5b6f37d files/digest-qmail-qfilter-2.1 250
+RMD160 ee3edc1585718c97acbb40ebc99b3369838cbee0 files/digest-qmail-qfilter-2.1 250
+SHA256 01edfc9eacb8e716e56e6e0598dcd1849503ef6ba6d0fab3e863ada9a71ce873 files/digest-qmail-qfilter-2.1 250
diff --git a/net-mail/qmail-qfilter/files/digest-qmail-qfilter-2.1-r1 b/net-mail/qmail-qfilter/files/digest-qmail-qfilter-2.1-r1
deleted file mode 100644
index d869d2fc6688..000000000000
--- a/net-mail/qmail-qfilter/files/digest-qmail-qfilter-2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 744c4399a7f8c94b6c198e3de9941093 qmail-qfilter-2.1.tar.gz 22242
diff --git a/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild b/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild
deleted file mode 100644
index 5b90bdc2da37..000000000000
--- a/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-qfilter/qmail-qfilter-2.1-r1.ebuild,v 1.1 2006/06/11 11:36:12 bangert Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="qmail-queue multi-filter front end"
-HOMEPAGE="http://untroubled.org/qmail-qfilter/"
-SRC_URI="${HOMEPAGE}archive/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-*"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=dev-libs/bglibs-1.0.19
-	>=sys-apps/sed-4"
-RDEPEND="virtual/libc
-	virtual/qmail"
-
-QMAIL_BINDIR="/var/qmail/bin/"
-QFILTER_TMPDIR="/var/qmail/qfilter-tmp"
-
-src_compile() {
-	cd ${S}
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	echo "${D}${QMAIL_BINDIR}" > conf-bin
-	echo "${D}/usr/share/man/" > conf-man
-	echo "${ROOT}/usr/include/bglibs" > conf-bgincs
-	echo "${ROOT}/usr/lib/bglibs" > conf-bglibs
-
-	sed -i "s:#define TMPDIR \"/tmp\":#define TMPDIR \"${QFILTER_TMPDIR}\":" qmail-qfilter.c
-
-	make || die
-}
-
-src_install () {
-#	dodir ${QMAIL_BINDIR} /usr/share/man/
-	make install || die "Installer failed"
-
-	keepdir ${QFILTER_TMPDIR}
-	fowners qmaild:nofiles ${QFILTER_TMPDIR}
-	fperms go-rwx ${QFILTER_TMPDIR}
-
-	dodoc ANNOUNCEMENT NEWS README TODO
-	docinto samples
-	dodoc samples/*
-}
-
-pkg_postinst() {
-	einfo "Please see /usr/share/doc/${PF}/README* for configuration information"
-}