Respect cc and QA. Remove old

Package-Manager: portage-2.1.10/cvs/Linux x86_64

5 files changed, 36 insertions, 180 deletions

diff --git a/mail-filter/p3scan/ChangeLog b/mail-filter/p3scan/ChangeLog
index 48ce46df5922..9d2f42d4f8f5 100644
--- a/mail-filter/p3scan/ChangeLog
+++ b/mail-filter/p3scan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/p3scan
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/ChangeLog,v 1.15 2010/07/12 09:05:02 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/ChangeLog,v 1.16 2011/06/09 19:56:58 eras Exp $
+
+  09 Jun 2011; Eray Aslan <eras@gentoo.org> p3scan-2.3.2-r1.ebuild,
+  -p3scan-2.3.1-r1.ebuild, -p3scan-2.3.2.ebuild:
+  Respect cc and QA. Remove old
 
 *p3scan-2.3.2-r1 (12 Jul 2010)
 
diff --git a/mail-filter/p3scan/Manifest b/mail-filter/p3scan/Manifest
index 36cecefdbc26..2306b1e09220 100644
--- a/mail-filter/p3scan/Manifest
+++ b/mail-filter/p3scan/Manifest
@@ -1,10 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX p3scan-ocreat.patch 433 RMD160 f4545bf316afc41918436f69f7850679766d6fc7 SHA1 7e019ba262b0020cc8bf6c2dd4d11e9e5456b8be SHA256 06f2d8bea897990df6d6b09a5fcb564f4a1e4eae37027a9a11a5cd62145d6670
 AUX p3scan.init 612 RMD160 169ee83c5df7079aaae9359c10edc24c1d0c820c SHA1 1f7399362bf64fbc9db816d145c835cc1ece96df SHA256 8cd2a9029c045184667a098e136092505bf04b3223817b8013094a0440e43415
 DIST p3scan-2.3.1.tar.gz 315677 RMD160 bb3ece736f44f2c8a8b919163fcb9d9d90ff7ec8 SHA1 896120aca194a96b34dbcf8f0e062afb8fbd8f41 SHA256 2c51185caddde414de13f7de9b94986145a6519deac1de655f38538113122329
 DIST p3scan-2.3.2.tar.gz 321684 RMD160 ed5857d1e711d4f303eeddf03b8ab93fa6c2a3dd SHA1 bc2d01699d34183e78cef44ac6a229326473d5d4 SHA256 570bdf87132b23120339e247809dc2cf37c2735d504f4e1072528c04d940bb5f
-EBUILD p3scan-2.3.1-r1.ebuild 2125 RMD160 8589d7a352c61021c02e343c19728706fef284cc SHA1 a3f49453e3326f054290cc3b57b6f15c57742ebb SHA256 e790014e9e7ef3db31c0abb8893c5c05c0ce7711371fa267ce9007f085ee8435
 EBUILD p3scan-2.3.1.ebuild 2029 RMD160 95d1d38bc5abc90d92e5e31f485a794ac15e0ebb SHA1 3593f0f2f66765756943f957b0ed5a0fa65f0548 SHA256 1248fa2ed5c9bb565199aea686f051df3aa8b583d0e38d37631ceb364e7c02d0
-EBUILD p3scan-2.3.2-r1.ebuild 2648 RMD160 ae6e95b4c55570a78d545bbaf2d4860b0fe3a52d SHA1 1560129f0f156c49bdc43c1eef286284808481db SHA256 d353978ea96966254aea5a82260f09854b838cb53125468ba8fe603886d2214a
-EBUILD p3scan-2.3.2.ebuild 2189 RMD160 845d9f4a9c59e90d6991c971849d2592d72221c7 SHA1 2ea040cdaaaa6f9968242cecad2c31a12103acf4 SHA256 d617b18df2958357944bb8191d12503a1af064925dac25871ef96e9d0e08f70e
-MISC ChangeLog 2601 RMD160 c50cf8c75f47b8267d41c0d937a3de371166724f SHA1 0d814a2a022bcef78f67a9574090accfdd1bfc7a SHA256 56b65f744854689c76f639382c81a73c242229d2647fe9a6c3ce88edd588bccc
+EBUILD p3scan-2.3.2-r1.ebuild 2644 RMD160 2e072cd97f5cfcb43a9f6141a74e4fdb9233b81b SHA1 379786ada9368b9245021adb769c5ec7c7443217 SHA256 1cb86c851504bf649a6893cec089f2d2ab2a5b0dcc35e9b01b8dc8ecc8403d1d
+MISC ChangeLog 2747 RMD160 ffc830af787ab7e766cc829d1ec630cb3ad1ba7f SHA1 2f1c2856a5cfbd1f3aff69be3afc4f9931c45029 SHA256 2f23ecbbd09a94588bceae5e56da39d4826aa8a21b0ae71eec74f8ec522bb05a
 MISC metadata.xml 409 RMD160 5addb80d549a6bded7171e895652c0336d7f7160 SHA1 6a75719b6d3f69678028cae53f4fe02e910d6c14 SHA256 8b53ab62bbcc46fedd73c744afccb5cfd4d99571d30e65d3021115ba8a0ed16b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJN8SWYAAoJEHfx8XVYajsfwboP/3oM4l3ZbWO060Br/uM4qTfU
+TXylii1gUwxT1l0T0cU0N3m2SEQ3O5LaKeP8zceYNLhuSMlbZRKORqoxlMBR89OQ
+MKLLJev1Jtc2Mz5kd/fNod/1vz3ptZaSbrHLQOspf1UVZdcBjQhiC97GKI2TEAk2
+G3Q9Lj1kgPXRiGj9zyvzZwzGt0J601KoEPHvwK3rxojr4kliC4U0NI02bzSNpM6W
+uDHPE8AQOF45j7uT1S3FhQ1CEBj1vXbU6itE5m10LWQi1e9vTSmIQ0c5sBmKxzcs
+3XeeoFazVGrnKJFZAC2MVXo68AjZrKtVPuRapuyQUP1nXchcAqpJmCRDsr6+4pzs
+9DS5y1smde0dkRFl1Ev43gWTJwdp5thLXKENEFOr8blBdp00wfST4dkIFPRUCcdS
+dQalw+W4ADHizEkTfv//nilH0Vlu8ZxkAkx4CQRwcKYrL4dfKhcHyyzr5Cq5vPqM
+N0UyiWUAqJ1RaCWxcEK1k9FJeccdDY+DpSp/GAHcpeTRVIBsokMp+aFRiZWQnIgJ
+rFK5nY07I4oIgWKYqWWxY+8GR0ukTrjH/5vXXKihw5YWe6o1Y1ElyojKCmQLz6R3
+VBrZb7aSutPs7f+8JODj6nYIqz4WC0SfBrfp2elTOhrN0NmwnUZjeiEsPkJJGxuh
+yG6ZHbpFr2YTerTmG9wD
+=7Ung
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/p3scan/p3scan-2.3.1-r1.ebuild b/mail-filter/p3scan/p3scan-2.3.1-r1.ebuild
deleted file mode 100644
index f13efb114f99..000000000000
--- a/mail-filter/p3scan/p3scan-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/p3scan-2.3.1-r1.ebuild,v 1.2 2007/03/18 04:41:14 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="This is a full-transparent proxy-server for POP3-Clients."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://p3scan.sf.net/"
-
-DEPEND="dev-libs/libpcre"
-RDEPEND="net-firewall/iptables"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	newinitd ${FILESDIR}/${PN}.init ${PN}
-
-	dosbin ${PN} || die
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins ${PN}.conf ${PN}-*.mail
-	doins ${PN}-*.mail
-
-	keepdir /var/run/${PN}
-
-	keepdir /var/spool/${PN}
-	keepdir /var/spool/${PN}/children
-	keepdir /var/spool/${PN}/notify
-
-	fowners mail:mail /var/run/${PN}
-	fperms 700 /var/run/${PN}
-
-	fowners mail:mail /var/spool/${PN}
-	fperms 700 /var/spool/${PN}
-
-	fowners mail:mail /var/spool/${PN}/children
-	fperms 700 /var/spool/${PN}/children
-
-	fowners mail:mail /var/spool/${PN}/notify
-	fperms 700 /var/spool/${PN}/notify
-
-	doman p3scan.8.gz p3scan_readme.8.gz
-
-	dodoc AUTHORS CHANGELOG CONTRIBUTERS LICENSE NEWS README \
-		README-rpm TODO.list p3scan.sh spamfaq.*
-}
-
-pkg_postinst() {
-	enewuser mail 8 /bin/true /var/spool/mail mail
-
-	if [ ! -L /etc/${PN}/${PN}.mail ]; then
-		ln -sf /etc/${PN}/${PN}-en.mail /etc/${PN}/${PN}.mail
-	fi
-
-	echo
-	elog "Default infected notification template language is set to english, change the"
-	elog "symbolic link /etc/${PN}/${PN}.mail if you want it in another language."
-	elog
-	elog "To start ${PN}, you can use /etc/init.d/${PN} start"
-	elog
-	elog "You need port-redirecting, a rule like:"
-	elog "  iptables -t nat -A PREROUTING -p tcp -i eth0 --dport pop3 -j REDIRECT --to 8110"
-	elog "to forward pop3 connections incoming from eth0 interface."
-	elog
-	elog "You will need to configure at least following in /etc/${PN}/${PN}.conf:"
-	elog "scannertype, scanner, virusregexp"
-	elog
-	elog "An example scanner script has been installed to:"
-	elog "/usr/share/doc/${PF}/p3scan.sh.gz"
-	echo
-}
diff --git a/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild b/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild
index ce8e0853d00f..018ceba48c4b 100644
--- a/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild
+++ b/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild,v 1.1 2010/07/12 09:05:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild,v 1.2 2011/06/09 19:56:58 eras Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="This is a full-transparent proxy-server for POP3-Clients."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -26,8 +26,8 @@ src_prepare() {
 
 	# respect CC (bug #244144), and CFLAGS (bug #240786)
 	sed -i \
-		-e '/^CC=/d' \
-		-e "s:^CFLAGS=-Wall -O2 :CFLAGS=-O2 ${CFLAGS} :" \
+		-e "s/gcc/$(tc-getCC)/" \
+		-e "s:^CFLAGS=-Wall -O2 :CFLAGS=${CFLAGS} :" \
 		-e '/^LDFLAGS=/d' \
 		-e '/^ripmime\/libripmime/,+7d' \
 		-e '/^\.c\.o:/,+3d' \
@@ -38,11 +38,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die
+	emake || die
 }
 
 src_install () {
-	newinitd ${FILESDIR}/${PN}.init ${PN}
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
 
 	dosbin ${PN} || die
 
@@ -71,7 +71,7 @@ src_install () {
 
 	doman p3scan.8.gz p3scan_readme.8.gz
 
-	dodoc AUTHORS CHANGELOG CONTRIBUTERS LICENSE NEWS README \
+	dodoc AUTHORS CHANGELOG CONTRIBUTERS NEWS README \
 		README-rpm TODO.list p3scan.sh spamfaq.*
 }
 
diff --git a/mail-filter/p3scan/p3scan-2.3.2.ebuild b/mail-filter/p3scan/p3scan-2.3.2.ebuild
deleted file mode 100644
index 4096810045cd..000000000000
--- a/mail-filter/p3scan/p3scan-2.3.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/p3scan-2.3.2.ebuild,v 1.3 2009/05/16 00:39:52 halcy0n Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="This is a full-transparent proxy-server for POP3-Clients."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://p3scan.sf.net/"
-
-DEPEND="dev-libs/libpcre"
-RDEPEND="net-firewall/iptables"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/p3scan-ocreat.patch"
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	newinitd ${FILESDIR}/${PN}.init ${PN}
-
-	dosbin ${PN} || die
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins ${PN}.conf ${PN}-*.mail
-	doins ${PN}-*.mail
-
-	keepdir /var/run/${PN}
-
-	keepdir /var/spool/${PN}
-	keepdir /var/spool/${PN}/children
-	keepdir /var/spool/${PN}/notify
-
-	fowners mail:mail /var/run/${PN}
-	fperms 700 /var/run/${PN}
-
-	fowners mail:mail /var/spool/${PN}
-	fperms 700 /var/spool/${PN}
-
-	fowners mail:mail /var/spool/${PN}/children
-	fperms 700 /var/spool/${PN}/children
-
-	fowners mail:mail /var/spool/${PN}/notify
-	fperms 700 /var/spool/${PN}/notify
-
-	doman p3scan.8.gz p3scan_readme.8.gz
-
-	dodoc AUTHORS CHANGELOG CONTRIBUTERS LICENSE NEWS README \
-		README-rpm TODO.list p3scan.sh spamfaq.*
-}
-
-pkg_postinst() {
-	enewuser mail 8 /bin/true /var/spool/mail mail
-
-	if [ ! -L /etc/${PN}/${PN}.mail ]; then
-		ln -sf /etc/${PN}/${PN}-en.mail /etc/${PN}/${PN}.mail
-	fi
-
-	echo
-	elog "Default infected notification template language is set to english, change the"
-	elog "symbolic link /etc/${PN}/${PN}.mail if you want it in another language."
-	elog
-	elog "To start ${PN}, you can use /etc/init.d/${PN} start"
-	elog
-	elog "You need port-redirecting, a rule like:"
-	elog "  iptables -t nat -A PREROUTING -p tcp -i eth0 --dport pop3 -j REDIRECT --to 8110"
-	elog "to forward pop3 connections incoming from eth0 interface."
-	elog
-	elog "You will need to configure at least following in /etc/${PN}/${PN}.conf:"
-	elog "scannertype, scanner, virusregexp"
-	elog
-	elog "An example scanner script has been installed to:"
-	elog "/usr/share/doc/${PF}/"
-	echo
-}