Fix space separation between LDFLAGS (bug #321749).

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

4 files changed, 31 insertions, 5 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 098b728713b1..22685f66de31 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.203 2010/05/26 23:05:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.204 2010/05/29 16:28:53 jer Exp $
+
+  29 May 2010; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.3.ebuild,
+  +files/rrdtool-1.4.3-ruby-ldflags.patch:
+  Fix space separation between LDFLAGS (bug #321749).
 
 *rrdtool-1.4.3 (26 May 2010)
 
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index e12a0fb5e603..bfa5598e36a9 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,5 +1,6 @@
 AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e SHA1 973b40a3954942dd3306d5781f31faf4f88c257d SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1
 AUX rrdtool-1.3.8-configure.ac.patch 410 RMD160 7bc8ae6bf64fbc8602c0e4a4571c74d9afea818b SHA1 b28a7f253ff66d788a29d491ef57f11c6721bb16 SHA256 220d42a1228d015f6bd02124b3f8c878f0b7bda2e277e9e3b15d4f05603328b5
+AUX rrdtool-1.4.3-ruby-ldflags.patch 614 RMD160 dc43e0e459709323ab191005dcfb31b71eabd609 SHA1 ebc5b5140007266ec935b3693e680391ddd58091 SHA256 d51f1e01a5faccc0a83a09a7aca2fa251fdfd662ba19f3670ef6591e46afec09
 DIST rrdtool-1.0.50.tar.gz 1474200 RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b SHA1 399e2bf807e3fbc987eec4c5364dc4cb416ba287 SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91
 DIST rrdtool-1.2.29.tar.gz 1092333 RMD160 a54f80cf3eec6d1484e062311a96e5691656288e SHA1 bd6c201eb12ff9007081fda81aa6bd1410a30bf2 SHA256 0e3b2febfc36276fc8e5c4ec98c73830aa2313ba77663e979d4c4859928f64b9
 DIST rrdtool-1.2.30.tar.gz 1092483 RMD160 ee4d492fee4e109da89ca85bd9dd561cb9ddfcec SHA1 c850dc6008bd6580eefa4257e339f78bd3f78fa3 SHA256 3190efea410a6dd035799717948b2df09910f608d72d23ee81adad4cd0184ae9
@@ -16,6 +17,6 @@ EBUILD rrdtool-1.3.8-r1.ebuild 2791 RMD160 f2773ddce102fddb879420fa1231af599c349
 EBUILD rrdtool-1.3.8.ebuild 2602 RMD160 f7bee371d1410101e74c6152885ba58a9487bc40 SHA1 5fa8c902b737ecda779c4bf14fc1074e0b50e4ff SHA256 044d1cc514e3d07595f81bfe53a7729f80718f5d25dcbaeed39c9203ce42a0a1
 EBUILD rrdtool-1.3.9.ebuild 2776 RMD160 bb5a72c574c337bfebdadf2f11bb3da594b0ebf3 SHA1 18a3a7b9f8877c9747e4c9cc73d482c5280d7da8 SHA256 58bb63b2b6903945414c85015306561e6be685c9b7b307dc2e88f76d66af7141
 EBUILD rrdtool-1.4.2.ebuild 2773 RMD160 1925709cb77ef0b782dd9af09b21e3ab1f0ac8ed SHA1 a2eb17dcfea2b211e41a64e1fe745a10ddc94676 SHA256 2fc595a30197c34ad3a8f19e300223d1ea9dd503a5fe7582a6e7b97be16af37d
-EBUILD rrdtool-1.4.3.ebuild 2772 RMD160 a2bb509f33e3c0ab164f7ea742764891264de427 SHA1 e642e8f6ee44548d17c43161fa5f7c04eba9977d SHA256 4bab64c57d7a846923ac555059b885df98b5863b77b7790baec2e7f38c2264c7
-MISC ChangeLog 30599 RMD160 7aec929f65e4d0486e2cae868f851537816608cf SHA1 a2b46a9edf3480b0e7ff9b9ccebd8f018bd71567 SHA256 bdea018f1a4428e6c42b4ddff5f8216d48024132402efe1bfb0762ab8f39ea71
+EBUILD rrdtool-1.4.3.ebuild 2816 RMD160 a85061bfe6a1013e91464a1184b2bb980e9bd866 SHA1 382a3ddfb66075c0facef8a412d3c975d9ae9729 SHA256 a475b8dfc3905ff549d0dd7e7abbb721cc0f7a343503bcd9a3e49c29d2c6e52f
+MISC ChangeLog 30766 RMD160 0b06c31f6d3edfdaf73566147504f22cb4a30bdc SHA1 bfcfaae13f65413696ff0e9853ca087285d46c22 SHA256 1345b4303ddee70e34e24dbc9ecc39dbb0136a3342afa94ced81ae8ba3f4d1c2
 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch
new file mode 100644
index 000000000000..8a325f41c608
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch
@@ -0,0 +1,20 @@
+--- a/bindings/ruby/extconf.rb
++++ b/bindings/ruby/extconf.rb
+@@ -4,13 +4,13 @@
+ require 'mkmf'
+ 
+ if /linux/ =~ RUBY_PLATFORM
+-   $LDFLAGS += '-Wl,--rpath -Wl,$(EPREFIX)/lib'
++   $LDFLAGS += ' -Wl,--rpath -Wl,$(EPREFIX)/lib'
+ elsif /solaris/ =~ RUBY_PLATFORM
+-   $LDFLAGS += '-R$(EPREFIX)/lib'
++   $LDFLAGS += ' -R$(EPREFIX)/lib'
+ elsif /hpux/ =~ RUBY_PLATFORM
+-   $LDFLAGS += '+b$(EPREFIX)/lib'
++   $LDFLAGS += ' +b$(EPREFIX)/lib'
+ elsif /aix/ =~ RUBY_PLATFORM
+-   $LDFLAGS += '-Wl,-blibpath:$(EPREFIX)/lib'
++   $LDFLAGS += ' -Wl,-blibpath:$(EPREFIX)/lib'
+ end
+ 
+ dir_config("rrd","../../src","../../src/.libs")
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild
index aa77e487211a..48f81c6d3b8a 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild,v 1.1 2010/05/26 23:05:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.3.ebuild,v 1.2 2010/05/29 16:28:53 jer Exp $
 
 EAPI="3"
 
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}
 	sys-apps/gawk"
 
 src_prepare() {
-	epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch"
+	epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch"
+	epatch "${FILESDIR}/${P}-ruby-ldflags.patch"
 	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
 	eautoconf
 }