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

(Portage version: 2.1.4.4)

3 files changed, 45 insertions, 23 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/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() {