Quoting fixes, remove old version, add optional targrey patch. #211928 by Douglas Mayle

Package-Manager: portage-2.1.4.4

4 files changed, 49 insertions, 27 deletions

diff --git a/mail-filter/postgrey/ChangeLog b/mail-filter/postgrey/ChangeLog
index 58f204ea0eda..f5ae76cc2349 100644
--- a/mail-filter/postgrey/ChangeLog
+++ b/mail-filter/postgrey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/postgrey
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/ChangeLog,v 1.45 2007/11/19 12:19:19 armin76 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/ChangeLog,v 1.46 2008/03/15 19:39:01 dertobi123 Exp $
+
+*postgrey-1.31-r1 (15 Mar 2008)
+
+  15 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -postgrey-1.24.ebuild, postgrey-1.31.ebuild, +postgrey-1.31-r1.ebuild:
+  Quoting fixes, remove old version, add optional targrey patch. #211928 by
+  Douglas Mayle
 
   19 Nov 2007; Raúl Porcel <armin76@gentoo.org> postgrey-1.31.ebuild:
   alpha stable wrt #199035
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index cb8678d1261a..3dadcfff9a71 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -1,8 +1,8 @@
 AUX postgrey.conf.new 1915 RMD160 15b64509c13c5fbb50e620da7339763a88969357 SHA1 6bf1f4358e8ed93096fccdeae0866e363e4e8be1 SHA256 2c84116caad8ba675ad73c4f2a10c766bd048572677c74720ad3ae2448ea9519
 AUX postgrey.rc.new 2434 RMD160 2dce06f836b63bba634206af32592c3838096760 SHA1 57765eb2a88ed0561a58feb648cc01e8ef6bdba9 SHA256 a5851a80ce9250e183a8339f0bfd06fa4724ebe507c1d46322cfd675f7f9ae9c
-DIST postgrey-1.24.tar.gz 27444 RMD160 232c8fb70370f85ccd4542a11ae2880386a47e1c SHA1 3bc93536a4f49462f77ed69dd32ecd9884912c25 SHA256 266506813ee56314ea3f2e96dbfe0c7cbfe8a8548f3718f2d0952b0370683b77
 DIST postgrey-1.31.tar.gz 34895 RMD160 b78bc600617e5ed84a2b783a439f83427d168d97 SHA1 198ba4ebb84be87f189a336bceaa81c22049c697 SHA256 d458701bc0e1ffa900492c853c5fb5d254a12e223c3c58ca3f445eee0c3d6e6a
-EBUILD postgrey-1.24.ebuild 2086 RMD160 ad8152b6b43ff965276a03de466b653377268497 SHA1 193a90cdc5835a16089852bc9fdff8a79f8d0f17 SHA256 7a3b5924e4049168be8426df1184826cfad758ed703a280c5afdcfe09874ca3c
-EBUILD postgrey-1.31.ebuild 2155 RMD160 e6398aa6cd8ef7abfb642047febac603f88d8f3b SHA1 53fa220c12d3c7f0660225b789bb461b84e86177 SHA256 13d5b7ca568b5947902eb594d043e2ce405c88a597ce72421e76075d5873d519
-MISC ChangeLog 7255 RMD160 751a9776d9bd3d84b2457f5ec6200fc0719eeddb SHA1 dc5ccce4a1332a83a1bf4e4a8d86f18c5b7a456d SHA256 326785ce85aa83f263e126ea81f9b047b454daa096a41137aebe6e38649c0421
+DIST targrey-0.31-postgrey-1.31.patch 11572 RMD160 8a7b7cc966739d408e3d033f1ff80e563a6e07ff SHA1 4bee9e85bc2fcf464dba1d99184862249107a516 SHA256 cca42e6575bc7fc260b3891193bc614a82b3b3b408b4eca28721fe0a1508a701
+EBUILD postgrey-1.31-r1.ebuild 2588 RMD160 5ea49dcfad7881c5e530dc95e78af32251a1ba82 SHA1 8d0681faf124b297f27c8719dbb9bbe4897e23d7 SHA256 2759ce1c91552e739a6d29a3fb2f5d243331c24d602c73df38e145628d2a6a9f
+EBUILD postgrey-1.31.ebuild 2152 RMD160 13d94ffd4bb521022a0b7a2413e50748c6dc8d2e SHA1 55627bc77fea5035349ef06a6022df5ffd067ef3 SHA256 8833e1d6d5e0825c22f0cc05ad330f5af855e8b59e263c57624dbd3b5529d0df
+MISC ChangeLog 7513 RMD160 9f88178d0cb496e5aac2a76b27f50adcefb0784f SHA1 9c31a7e33d0dbe853db4be6eca77dd52c252d5d7 SHA256 2b6d803dc029c29f370c27bacc1730528982f75c0d18da08c4d6c95617df89a4
 MISC metadata.xml 304 RMD160 5ea326ad63c413b939071e1db865ccf570de61b8 SHA1 5b243ebc069fa30919c289cab15b6e1f6cc71702 SHA256 66d816b6bbbb5bcc1ded82027b2d2fd6b6f439faf149ac70f305003d7ace1e2b
diff --git a/mail-filter/postgrey/postgrey-1.24.ebuild b/mail-filter/postgrey/postgrey-1.31-r1.ebuild
index 7e093543e0ab..b6e9e534bf24 100644
--- a/mail-filter/postgrey/postgrey-1.24.ebuild
+++ b/mail-filter/postgrey/postgrey-1.31-r1.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.24.ebuild,v 1.7 2007/07/26 12:46:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.31-r1.ebuild,v 1.1 2008/03/15 19:39:01 dertobi123 Exp $
 
 inherit eutils
 
 DESCRIPTION="Postgrey is a Postfix policy server implementing greylisting"
 SRC_URI="http://postgrey.schweikert.ch/pub/${P}.tar.gz
-			http://postgrey.schweikert.ch/pub/old/${P}.tar.gz"
+			http://postgrey.schweikert.ch/pub/old/${P}.tar.gz
+			targrey? (http://k2net.hakuba.jp/pub/targrey-0.31-${P}.patch)"
 HOMEPAGE="http://postgrey.schweikert.ch/"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="targrey"
 DEPEND=""
 RDEPEND=">=dev-lang/perl-5.6.0
 	dev-perl/net-server
 	dev-perl/IO-Multiplex
 	dev-perl/BerkeleyDB
 	dev-perl/Net-DNS
-	>=sys-libs/db-4.1
-	>=mail-mta/postfix-2.1.0"
+	dev-perl/Parse-Syslog
+	dev-perl/Net-RBLClient
+	>=sys-libs/db-4.1"
 
-KEYWORDS="alpha amd64 ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86"
 
 pkg_setup() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 /dev/null ${PN}
 }
 
-src_install () {
-	cd ${S}
+src_compile() {
+	if use targrey ; then
+		epatch "${DISTDIR}/targrey-0.31-${P}.patch"
+	fi
+}
 
+src_install() {
 	# postgrey data/DB in /var
 	diropts -m0770 -o ${PN} -g ${PN}
 	dodir /var/spool/postfix/${PN}
@@ -41,6 +47,9 @@ src_install () {
 	dosbin ${PN}
 	dosbin contrib/postgreyreport
 
+	# policy-test script
+	dosbin policy-test
+
 	# postgrey data in /etc/postfix
 	insinto /etc/postfix
 	insopts -o root -g ${PN} -m 0640
@@ -50,8 +59,8 @@ src_install () {
 	dodoc Changes README
 
 	# init.d + conf.d files
-	newinitd ${FILESDIR}/${PN}.rc.new ${PN}
-	newconfd ${FILESDIR}/${PN}.conf.new ${PN}
+	newinitd "${FILESDIR}"/${PN}.rc.new ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
 }
 
 pkg_postinst() {
@@ -67,8 +76,16 @@ pkg_postinst() {
 
 	elog "Also remember to make the daemon start durig system boot:"
 	elog "  rc-update add postgrey default"
-	echo
-	ewarn "Read postgrey documentation for more info (perldoc postgrey)."
-	echo
-	epause 5
+
+	if use targrey ; then
+		elog "The targrey patch has been applied, read the"
+		elog "documentation for more info at"
+		elog "\thttp://k2net.hakuba.jp/targrey/index.en.html"
+		elog
+		elog "Activate targrey and set options using POSTGREY_OPTS in"
+		elog "/etc/conf.d/postgrey"
+		elog
+	fi
+
+	elog "Read postgrey documentation for more info (perldoc postgrey)."
 }
diff --git a/mail-filter/postgrey/postgrey-1.31.ebuild b/mail-filter/postgrey/postgrey-1.31.ebuild
index 26f284565ec9..941966a1a415 100644
--- a/mail-filter/postgrey/postgrey-1.31.ebuild
+++ b/mail-filter/postgrey/postgrey-1.31.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.31.ebuild,v 1.6 2007/11/19 12:19:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.31.ebuild,v 1.7 2008/03/15 19:39:01 dertobi123 Exp $
 
 inherit eutils
 
@@ -29,8 +29,6 @@ pkg_setup() {
 }
 
 src_install () {
-	cd ${S}
-
 	# postgrey data/DB in /var
 	diropts -m0770 -o ${PN} -g ${PN}
 	dodir /var/spool/postfix/${PN}
@@ -54,8 +52,8 @@ src_install () {
 	dodoc Changes README
 
 	# init.d + conf.d files
-	newinitd ${FILESDIR}/${PN}.rc.new ${PN}
-	newconfd ${FILESDIR}/${PN}.conf.new ${PN}
+	newinitd "${FILESDIR}"/${PN}.rc.new ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf.new ${PN}
 }
 
 pkg_postinst() {