reversed yet_exec workaround, changing solution to make proftpd compile for users when -fPIC is found in C[XX]FLAGS or using hgcc.. see bug #30359

3 files changed, 20 insertions, 13 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 6473a0482036..c6da1c9c057d 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.38 2003/10/05 10:05:42 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.39 2003/10/05 15:01:09 solar Exp $
+
+  05 Oct 2003; <solar@gentoo.org> proftpd-1.2.9_rc2.ebuild:
+  reversed yet_exec workaround, changing solution to make proftpd compile for
+  users when -fPIC is found in C[XX]FLAGS or using hgcc.. see bug #30359
 
   05 Oct 2003; Alexander Gabert <pappy@gentoo.org> proftpd-1.2.9_rc2.ebuild:
   added yet_exec flags for configure run, otherwise build failure due to broken
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 7ec0336ada0e..36f3ba7cbafd 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,15 +1,15 @@
-MD5 48254d103a8fa63e6ff0f828f6095963 proftpd-1.2.9_rc2.ebuild 3066
-MD5 3ae04eafb730c36ccc8984f86799af79 proftpd-1.2.8.ebuild 2739
+MD5 d5e56bcc7d33c02846950a666c3dca42 ChangeLog 6082
 MD5 6af0a703972bb7f858aabcc18896454b proftpd-1.2.5-r1.ebuild 2487
-MD5 ed644dbda898814d27dbf3b8b8775fef proftpd-1.2.9_rc1.ebuild 2911
 MD5 bef00204f7097fbe4c9cc00c6f638e93 proftpd-1.2.7.ebuild 3670
-MD5 5741325bcd08c181158d3d647b1e7f2e ChangeLog 5870
-MD5 305b9ec34f3caa3722cf5a7dc1a59880 files/proftpd.rc6 743
-MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
+MD5 3ae04eafb730c36ccc8984f86799af79 proftpd-1.2.8.ebuild 2739
+MD5 ed644dbda898814d27dbf3b8b8775fef proftpd-1.2.9_rc1.ebuild 2911
+MD5 52a4951fa28542163e71336339fdbe57 proftpd-1.2.9_rc2.ebuild 3036
+MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66
 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
 MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66
+MD5 2cb8d1fb115bf19c162c4b6510f98bca files/digest-proftpd-1.2.9_rc1 69
 MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
+MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
+MD5 305b9ec34f3caa3722cf5a7dc1a59880 files/proftpd.rc6 743
 MD5 313cde04e0ea4cd747e6b905e6c982b4 files/proftpd.xinetd 302
-MD5 2cb8d1fb115bf19c162c4b6510f98bca files/digest-proftpd-1.2.9_rc1 69
 MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2 70
-MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66
diff --git a/net-ftp/proftpd/proftpd-1.2.9_rc2.ebuild b/net-ftp/proftpd/proftpd-1.2.9_rc2.ebuild
index 655ae053daf2..97a61fbed3d1 100644
--- a/net-ftp/proftpd/proftpd-1.2.9_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.9_rc2.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9_rc2.ebuild,v 1.5 2003/10/05 10:05:42 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9_rc2.ebuild,v 1.6 2003/10/05 15:01:09 solar Exp $
+
+
+inherit flag-o-matic
 
 IUSE="ldap pam postgres mysql ssl tcpd ipv6"
 
@@ -58,7 +61,9 @@ src_compile() {
 	# modules="${modules}:mod_radius"
 	# modules="${modules}:mod_rewrite"
 
-	has_version sys-devel/hardened-gcc && append-flags "-yet_exec"
+	# bug #30359
+	has_version sys-devel/hardened-gcc && echo > lib/libcap/cap_sys.c
+	is-flag -fPIC && echo > lib/libcap/cap_sys.c
 
 	econf \
 		--sbindir=/usr/sbin \
@@ -70,8 +75,6 @@ src_compile() {
 		--with-modules=${modules} \
 		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
 
-	has_version "sys-devel/hardened-gcc" && find ${WORKDIR} -name Makefile -type f -exec sed -i "s,-yet_exec,," {} \;
-
 	make || die "compile problem"
 }