added patch for -fPIC on cdb files only

(Portage version: 2.0.51.20-r5)

4 files changed, 29 insertions, 26 deletions

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index d42a54a20427..fbc066f38ca1 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.51 2005/04/27 15:46:33 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.52 2005/04/29 22:05:46 anarchy Exp $
+
+  29 Apr 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +files/vpopmail-cdb-Makefile.patch, vpopmail-5.4.9-r1.ebuild:
+  add patch for -fPIC on cdb only
 
   27 Apr 2005; Fernando J. Pereda <ferdy@gentoo.org>
   vpopmail-5.4.9-r1.ebuild:
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 8ce81071cbdb..cf26e35fde3d 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,27 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0ff288b8ae4cd23414ca59cd3e602f69 vpopmail-5.2.2-r1.ebuild 7452
-MD5 2828b048c4925e917c933c2819e0f6c9 vpopmail-5.4.9.ebuild 7574
-MD5 bbc62246c05e4aeea634d409670a5938 vpopmail-5.4.6-r1.ebuild 7649
-MD5 72cebebc8219c2d1b730876e0262f28b vpopmail-5.4.9-r1.ebuild 7703
 MD5 298382858144dedf36e1e4f6dc09deb1 ChangeLog 8309
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 8c6ca78a4c32c9a267dd9c3f7e9db5f1 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
+MD5 0ff288b8ae4cd23414ca59cd3e602f69 vpopmail-5.2.2-r1.ebuild 7452
+MD5 bbc62246c05e4aeea634d409670a5938 vpopmail-5.4.6-r1.ebuild 7649
+MD5 3d0cd9abd1203acfadd4c46ca70ea08e vpopmail-5.4.9-r1.ebuild 7557
+MD5 2828b048c4925e917c933c2819e0f6c9 vpopmail-5.4.9.ebuild 7574
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
-MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9 66
-MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
 MD5 d0bc9f5393a1f0602c71fdee0b3d2cd8 files/digest-vpopmail-5.2.2-r1 134
 MD5 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6-r1 66
-MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9-r1 66
+MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9 66
+MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
+MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.6-access.violation.patch 918
 MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.9-access.violation.patch 918
-MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
+MD5 8c6ca78a4c32c9a267dd9c3f7e9db5f1 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
 MD5 851f9c731b7d03472a08ee21c046823d files/vpopmail.clearopensmtp 235
-MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.6-access.violation.patch 918
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCb7PyViELBEf1JB0RAsmpAKCFcJMsBX7VYPV2kUHo0DvH0RBz5wCeJBas
-rHhyEw5YnOi6O376MqIwYag=
-=myut
------END PGP SIGNATURE-----
+MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
+MD5 4b9ecca5815031b05bd173888da4d228 files/vpopmail-cdb-Makefile.patch 363
+MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9-r1 66
diff --git a/net-mail/vpopmail/files/vpopmail-cdb-Makefile.patch b/net-mail/vpopmail/files/vpopmail-cdb-Makefile.patch
new file mode 100644
index 000000000000..dc2942c29c6b
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-cdb-Makefile.patch
@@ -0,0 +1,10 @@
+--- vpopmail-5.4.9/cdb/Makefile.orig	2005-04-29 17:59:48.829109280 -0400
++++ vpopmail-5.4.9/cdb/Makefile	2005-04-29 18:00:18.645576488 -0400
+@@ -43,7 +43,7 @@
+ compile: \
+ warn-auto.sh conf-cc
+ 	( cat warn-auto.sh; \
+-	echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \
++	echo exec "`head -n 1 conf-cc`" -fPIC '-c $${1+"$$@"}' \
+ 	) > compile
+ 	chmod 755 compile
diff --git a/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild
index 0549d33fad50..9a0d94529336 100644
--- a/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild,v 1.3 2005/04/27 15:46:33 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.9-r1.ebuild,v 1.4 2005/04/29 22:05:46 anarchy Exp $
 
-inherit eutils gnuconfig fixheadtails flag-o-matic
+inherit eutils gnuconfig fixheadtails
 
 # TODO: all ldap, sybase support
 #MY_PV=${PV/_/-}
@@ -72,6 +72,7 @@ src_unpack() {
 	gnuconfig_update
 	autoconf || die "reconfigure failed."
 	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
+	epatch ${FILESDIR}/vpopmail-cdb-Makefile.patch || die "failed to patch Makefile"
 }
 
 src_compile() {
@@ -96,9 +97,6 @@ src_compile() {
 		&& myopts="${myopts} --enable-clear-passwd=y" \
 		|| myopts="${myopts} --enable-clear-passwd=n"
 
-	# So -fPIC is used which allows courier-authlib to build on amd64 bug #81605
-	use amd64 && append-flags -fPIC
-
 	econf \
 		${myopts} \
 		--sbindir=/usr/sbin \