Fixing LDFLAGS problem

Package-Manager: portage-2.2_rc91/cvs/Linux i686

4 files changed, 42 insertions, 20 deletions

diff --git a/net-irc/psybnc/ChangeLog b/net-irc/psybnc/ChangeLog
index 0aa6a293872d..29c3bfdc827d 100644
--- a/net-irc/psybnc/ChangeLog
+++ b/net-irc/psybnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/psybnc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.15 2010/09/26 17:28:39 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/ChangeLog,v 1.16 2010/10/10 18:30:09 gurligebis Exp $
+
+  10 Oct 2010; <gurligebis@gentoo.org> psybnc-2.3.2.9-r2.ebuild,
+  +files/ldflags-fix.patch:
+  Really fixing LDFLAGS problem this time.
 
   26 Sep 2010; <gurligebis@gentoo.org> -psybnc-2.3.2.7-r2.ebuild:
   Removing old version
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 1d0ef1e52350..ca35180e4650 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX compile.diff 3231 RMD160 f484b2f3878c4a4da8033a23a26e7b0d75d93f3b SHA1 0bcf8a297512cc568718a1c569d0abbb2c800968 SHA256 e6b301659412519872948ee21958b97c57c21e248dae3d040cefcd61032764ee
+AUX ldflags-fix.patch 564 RMD160 10d247c31749bf4e121e8608b11cb07976b7595c SHA1 8a5e781c361db5dae85e695705b9effc938ed7ca SHA256 3d746f73467e8ca27e24bec8407865e7a397bd1c39c567a3be5bac4de58c4021
 AUX oidentd.conf.psybnc 92 RMD160 690ab54b796e4959d81a23d06dd194c7a4a081c2 SHA1 be9f023fe93250e44be3dc52b94c9d16a8d61bbf SHA256 0363f6f7c2b2a39dc2b1ee3e41596adf6209bf3e770e9e7c0f13a9f6787c50dc
 AUX psybnc-2.3.2.9-multinetwork.patch 261 RMD160 788a0354a953c08210f2938fe5eb8eb934665dc3 SHA1 20e1e2f81f5c6a322a058c12bb49a5fa420d3b59 SHA256 485375e40144079c69ba3dfd942ad9924aba2c7fc4545b67114d74c943c92fed
 AUX psybnc-2.3.2.9-oidentd.patch 237 RMD160 24cd04928d4fb503bbfbff13bad33a9475ca782c SHA1 7312415f50c9024b369d843d0b787cfc92b6ea7b SHA256 43593043db85bf3dc3f1a5162afd873ac079afcb0aff9520799b51f362a2e29f
@@ -11,13 +12,13 @@ AUX psybnc.conf 313 RMD160 446813d0753d5b6d3c7592bd90f83f821a993973 SHA1 f914956
 AUX psybnc.confd 113 RMD160 106f0f680fcd5720ab7eead55b782a271627b81d SHA1 bb64a2eda5953fbdc39653c0612e26e5016dac78 SHA256 5077226f94b59e2e1874b0019d00375f17b73a77a25533275a59f18af6bf24f2
 AUX psybnc.initd 1009 RMD160 415cc2b29e9fed2f64b671527583c0666c699121 SHA1 38599f1702c2c5d411ae099cb98b0acb647b5d66 SHA256 6ca56b5cdabae78d19710f46be0524bfd451866f7aae0a9c953cab28fde5fcbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 RMD160 6e27479b9721bb6aa9f599150af3abfa9a915a2e SHA1 78266e39ed128a587b158b6195e580cb7f560f08 SHA256 9129ade198f26f7a47301d2ab5933a2844bdd187fca437f8264ae88f168e1644
-EBUILD psybnc-2.3.2.9-r2.ebuild 4627 RMD160 b5673b0521717b69bf32c0e8b6606d87f36d0122 SHA1 23b0d34c835c4579cf982e89b928ab7db949440c SHA256 f96444e643aea292028b27a9707cb0e242f18951a9a83120ac1e6c8d467c634d
-MISC ChangeLog 2510 RMD160 2f3da51e99e1e3b756ace1f491e06a1e1a6b9da6 SHA1 4f52c7a049b648473eddc4cb640795dee67eed96 SHA256 a8170910391850ec14c6d9a83ea5822fb848e73be4ae198ac8a4eba49900de1f
+EBUILD psybnc-2.3.2.9-r2.ebuild 4695 RMD160 90290e66faf3fe071e510542adaa392c79a272dd SHA1 c08e67a06157fcee115f89b33460d04e523da119 SHA256 b212fb2524666a0e5fd5b6a98ffe6e8834b7cabbda2603822af88e57af010b73
+MISC ChangeLog 2647 RMD160 58bd8bf36efbcca8f4fe5bbf45dde693ddab9963 SHA1 357fb802d28b6213c45061661be65057e0cc6d96 SHA256 5fa0345884acc1cc060ec8d55d776dc1b3c9c78fb6abb59e11ca02cbe8f56a1a
 MISC metadata.xml 562 RMD160 294dc8e7e000d88056aa9b2ab0d17663f83d830c SHA1 532637538b526dc886425b15fd3e084d9f9e1b2b SHA256 2353776ea8c6323f8eec951b14ab9998aa409cf1176ad8298d5e8c5ea613ae6d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyfnu8ACgkQsR7PQhRXYEkFTgCcCylvgiPO78+MX9xCTWHbuPy1
-XwAAnjv9l3laVlWhaj51eSlbGc3EUhjG
-=0+YN
+iEYEARECAAYFAkyyIlUACgkQsR7PQhRXYElq1QCfXsti5WuyUQX0VjGMsAGz0taa
+UDMAn0ALANWDuy0M7pplvFa1M6wXyWb+
+=I3RJ
 -----END PGP SIGNATURE-----
diff --git a/net-irc/psybnc/files/ldflags-fix.patch b/net-irc/psybnc/files/ldflags-fix.patch
new file mode 100644
index 000000000000..c06f3e48b32f
--- /dev/null
+++ b/net-irc/psybnc/files/ldflags-fix.patch
@@ -0,0 +1,12 @@
+diff -aurp a/tools/autoconf.c b/tools/autoconf.c
+--- a/tools/autoconf.c	2010-10-10 20:25:29.295001235 +0000
++++ b/tools/autoconf.c	2010-10-10 20:26:02.738999569 +0000
+@@ -449,7 +449,7 @@ int main()
+     fprintf(makefile,"TARGET	= psybnc\n");
+     fprintf(makefile,"\n");
+     fprintf(makefile,"all:	$(OBJS)\n");
+-    fprintf(makefile,"	$(CC) -o $(TARGET) $(CFLAGS) $(OBJS) $(LIBS)\n");
++    fprintf(makefile,"	$(CC) -o $(TARGET) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)\n");
+     if(ssl==0)
+     {
+ 	if(!fexists("key/psybnc.cert.pem")) /* only create, if not exist */
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
index ce92c88c1129..b6e87e920c2a 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild,v 1.4 2010/09/26 17:26:42 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild,v 1.5 2010/10/10 18:30:09 gurligebis Exp $
+
+EAPI="2"
 
 inherit eutils versionator toolchain-funcs flag-o-matic
 MY_PV="$(replace_version_separator 3 -)"
@@ -29,7 +31,23 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Useless files
+	rm -f */INFO
+
+	# Pretend we already have a certificate, we generate it in pkg_config
+	mkdir key
+	touch key/psybnc.cert.pem
+
+	if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]
+	then
+		einfo "Using existing salt.h for password encryption"
+		cp "${ROOT}"/usr/share/psybnc/salt.h salt.h
+	fi
+}
+
+src_prepare() {
 	epatch "${FILESDIR}/compile.diff"
+	epatch "${FILESDIR}/ldflags-fix.patch"
 
 	# add oidentd
 	use oidentd && epatch "${FILESDIR}/${P}-oidentd.patch"
@@ -40,21 +58,8 @@ src_unpack() {
 	# add multinetwork support
 	use multinetwork && epatch "${FILESDIR}/${P}-multinetwork.patch"
 
-	# Useless files
-	rm -f */INFO
-
 	# Prevent stripping the binary
 	sed -i -e "/@strip/ d" tools/autoconf.c
-
-	# Pretend we already have a certificate, we generate it in pkg_config
-	mkdir key
-	touch key/psybnc.cert.pem
-
-	if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]
-	then
-		einfo "Using existing salt.h for password encryption"
-		cp "${ROOT}"/usr/share/psybnc/salt.h salt.h
-	fi
 }
 
 src_compile() {