Respect cc and QA. Remove old

(Portage version: 2.1.10/cvs/Linux x86_64)

4 files changed, 14 insertions, 176 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/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
-}