Add patch to handle LDFLAGS properly.

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

4 files changed, 86 insertions, 11 deletions

diff --git a/app-i18n/libtabe/ChangeLog b/app-i18n/libtabe/ChangeLog
index 6a7f93e93fa8..c4a5f7064d55 100644
--- a/app-i18n/libtabe/ChangeLog
+++ b/app-i18n/libtabe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/libtabe
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/ChangeLog,v 1.14 2009/06/02 09:38:54 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/ChangeLog,v 1.15 2012/06/14 06:02:48 naota Exp $
+
+  14 Jun 2012; Naohiro Aota <naota@gentoo.org>
+  +files/libtabe-0.2.6-ldflags.patch, libtabe-0.2.6.1.2.ebuild:
+  Add patch to handle LDFLAGS properly.
 
 *libtabe-0.2.6.1.2 (02 Jun 2009)
 
diff --git a/app-i18n/libtabe/Manifest b/app-i18n/libtabe/Manifest
index 952bee5a3e8d..886f1ecb1eaa 100644
--- a/app-i18n/libtabe/Manifest
+++ b/app-i18n/libtabe/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libtabe-0.2.6-fabs.patch 1023 RMD160 739bcd58af300e3bfe2ad2916439bac0a5dd2de0 SHA1 34a35850c0b070da874f8afacfba0ce662959aa8 SHA256 36a1c931d6972aa8acfbaab151596969978790a6305f1616374d3aaa79fddc26
+AUX libtabe-0.2.6-ldflags.patch 2026 RMD160 7fb31700cc337d66d090d4d1e279e94049ffb406 SHA1 1c4936fe8ad079ff95b1eca47b3e91410857d684 SHA256 e61552ffe9566903b7bc729983c1e138bbce9a5e6e1064b6c4752e7a102393e2
 DIST libtabe_0.2.6-1.1.diff.gz 74149 RMD160 731eedb8b498ec11bdcc588aed2a6f02e20e352a SHA1 35017c2b4686b0bb4eb12352c229cd5c1a9edb42 SHA256 92780b9f1727855e6c4e7dcf27fc9f4695cfd66deb6056b52c6b9bf55b863f62
 DIST libtabe_0.2.6-1.2.diff.gz 74362 RMD160 8b2f60b41d47f16a9e6918cf8dc3cc0b31a1b92f SHA1 e622794f44c8a21e8c97b56a19f23852ae3c0a27 SHA256 23315f4086d04120a8edc70599037f329b05507fdd4c40dcd99645ba7b7ea3ec
 DIST libtabe_0.2.6.orig.tar.gz 1792199 RMD160 57645c0670881576888d7b50f4099d55b8140ae0 SHA1 f67dd657e8d56d49215c6f3570b114991bddbbdd SHA256 7fbe0f7bb853f9385ccd14e0ce85a7b881342ecd702f1dfff6df803510e00d0c
-EBUILD libtabe-0.2.6.1.2.ebuild 1484 RMD160 5a5896e91cdb84f7c38853c516c0f4e15e94e813 SHA1 12c86f42ac146abe8ab0fcf3b83edff1276140d5 SHA256 a66b14f22a208092ae74ce0f669655026abbc12cea1a5b9c1bc74d2bcf3910df
+EBUILD libtabe-0.2.6.1.2.ebuild 1546 RMD160 324b78ba7cb9397fb9183c7571e9123ca8b75dee SHA1 b188d9cb733c1fa8c97dd6316a19d4643ae347d3 SHA256 233ca3425a326cbb75ec8eef6578c5d395bdac9640452770dd21d2579f5ad0ce
 EBUILD libtabe-0.2.6.ebuild 1200 RMD160 d59ab5fd516b7a715ce008fe17018279b37b4c31 SHA1 db0345c5e5ed4a79c97292ae69c03b06de0f0878 SHA256 726191032a6770c716239e6debdf6804d94d37b4b80d37262126be5979444c2c
-MISC ChangeLog 1853 RMD160 206ea92ef7fa33f0ff673ecb7220be06e56fef83 SHA1 9d49d31be8752d2ead4dc301f452d9399ec99e21 SHA256 d3b5e9ad0e8f75de13919981c1d6cfd0890d046f63bab81152aac0be50d7f56a
+MISC ChangeLog 2001 RMD160 44e7946dcce5b35a53666df75b31f99030ea19d1 SHA1 43af746a7980a877e3521fc7b304b17b3eafd1e3 SHA256 78fb66a6c46d048b44e4c5992f1e4b49e0407ac0b10280d3415783838d300b65
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAkok8zQACgkQAiZjviIA2XjihACfVHm1TDjyJIqo6MjLflsItGv9
-s64AoII1AL8xVurU4aqAj2SKmNwPyPk2
-=6m94
+iQIcBAEBCAAGBQJP2X6LAAoJEDYO1FT4VRUUawoP/iQcaeNrurSch1a79oidSd6h
+CGSBMEJKb1peZw6jEbQtCYirKpqRI6w92vF0XxQkOxMhh32PLLM4VVPul9Qg+cUh
+/cbBP948nRTZMSjrrvj1WThcE6g6F1rh/S7FwZoaC2ABbfZjs90CX/WXu/OQsjF6
+1JJt2UbocHq733HPyRhqXtazsEeQW9egWUz1yCOR6287fjdGaCPijP965hQE1584
+Io4n5nMCem1RM37QqjkSMMUbDePQUXqwU6OxbMggodJzHOOkIgcpkP52EzZp3GM9
+O6Lc80GpY8ug7XoRwHuSmmHS04CuCuxCalksXBZZK9XKWHwz5sq3G9MNLgNvq+Y5
+OwKNxcVSymzh5gQpys7m7DMPDlTkLJ+Gs/RmVHIM9ZWCR0XNuc0FusRaxlDFoZOU
+EMbEXoyKD44OpYlF6kluj83Hot7J06V9/fclXochIs35gXhP6t4faTPWwqSnII8r
+RpdlJeHROXnngN8X1V9yS08iVW8TfWTAVzX3aZTbjKOo8tvxts/6W1B5IaQyQH77
+Vs9CQg+/mNHZoBfDKUFTXzRBBTxGY8BaHj418CbcX30dFIWEPRKckhGypTpJJudS
+D1DLXJY5+RKOLYYNDWEslznuZWfZgj+Xm74JcAkPKUsUnxiLESWc9PMnqAQr2rF4
+6pSTzuvy6mfucctBuXTK
+=/N4Q
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch b/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch
new file mode 100644
index 000000000000..0f51b19b71f2
--- /dev/null
+++ b/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch
@@ -0,0 +1,57 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index ada3dca..6acd71c 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS        = @CPPFLAGS@
+ DEFS            = @DEFS@
+ RANLIB          = @RANLIB@
+ LN_S            = @LN_S@
+-LDFLAGS	        = @with_db_lib@
++LDFLAGS	        = @with_db_lib@ @LDFLAGS@
+ INC	        = @with_db_inc@
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -55,7 +55,7 @@ all: $(LIBNAME) @build_supports@
+ 
+ $(LIBNAME): $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+-		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
++		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS)
+ 
+ bims:
+ 	(cd supports/bims; $(MAKE))
+diff --git a/src/supports/bims/Makefile.in b/src/supports/bims/Makefile.in
+index dc2534d..0e3041b 100644
+--- a/src/supports/bims/Makefile.in
++++ b/src/supports/bims/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS        = @CPPFLAGS@
+ DEFS            = @DEFS@
+ RANLIB          = @RANLIB@
+ LN_S            = @LN_S@
+-LDFLAGS         = @with_db_lib@
++LDFLAGS         = @with_db_lib@ @LDFLAGS@
+ INC             = -I../..
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -45,7 +45,7 @@ all: $(LIBNAME)
+ 
+ $(LIBNAME): $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+-		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
++		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS)
+ 
+ bims.lo: bims.c bims.h
+ 	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c
+diff --git a/util/Makefile.in b/util/Makefile.in
+index cb82736..16425d1 100644
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -10,7 +10,7 @@ CPPFLAGS        = @CPPFLAGS@
+ DEFS            = @DEFS@
+ RANLIB          = @RANLIB@
+ LN_S            = @LN_S@
+-LDFLAGS         = ../src/libtabe.la @with_db_lib@
++LDFLAGS         = ../src/libtabe.la @with_db_lib@ @LDFLAGS@
+ INC             = -I../src @with_db_inc@
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
index 687adc2170f6..881dbee510cd 100644
--- a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
+++ b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild,v 1.1 2009/06/02 09:38:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild,v 1.2 2012/06/14 06:02:48 naota Exp $
+
+WANT_AUTOMAKE=1.11
 
 inherit eutils libtool autotools multilib versionator
 
@@ -29,6 +31,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${WORKDIR}"/${DEBIAN_PATCH}
 	epatch "${FILESDIR}"/${ORIG_P}-fabs.patch
+	epatch "${FILESDIR}"/${ORIG_P}-ldflags.patch
 
 	ln -s script/configure.in . || die
 	eautoreconf