Add patch by Christopher Brannon to respect LDFLAGS (bug #334031). Fix -rpath directory (bug #405339). Remove static libraries in case LIBDIR is not /usr/lib/.

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

4 files changed, 40 insertions, 7 deletions

diff --git a/app-accessibility/flite/ChangeLog b/app-accessibility/flite/ChangeLog
index 1083a2de5e18..ef2c38c727b2 100644
--- a/app-accessibility/flite/ChangeLog
+++ b/app-accessibility/flite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/flite
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.38 2010/02/28 23:14:49 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/ChangeLog,v 1.39 2012/02/22 21:26:03 jer Exp $
+
+  22 Feb 2012; Jeroen Roovers <jer@gentoo.org> flite-1.4-r1.ebuild,
+  +files/flite-1.4-ldflags.patch:
+  Add patch by Christopher Brannon to respect LDFLAGS (bug #334031). Fix -rpath
+  directory (bug #405339). Remove static libraries in case LIBDIR is not
+  /usr/lib/.
 
   28 Feb 2010; Jeroen Roovers <jer@gentoo.org> flite-1.3.ebuild:
   Segfaults on HPPA, keywording -hppa (bug #307241).
diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index 8c6bd060e1dc..8263189bf584 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX const.patch 466 RMD160 1e904127dbd32b3de46c224022330b9406dd79b5 SHA1 91d4f78f1a08e952e9f3890b6a0f851ee342a05b SHA256 31df1356f8ada98927f786903c3f69ca45c46d810cb6c1971a029296ccbff4f3
 AUX flite-1.3-alsa-support.patch 11007 RMD160 bfa1bcc6c9ff713f289944ff7b5400cd1ef07ff3 SHA1 a8a90225fb9f5cfded5943c8ab22a92208b0b07f SHA256 f43266bc5c70c12512be6a8e1980d5d5551d7624bd27a678431d53df695cf01d
 AUX flite-1.3-shared-libs.patch 7663 RMD160 d5b73272ed794b3b8b1a83d041eb6c3d9f81178c SHA1 b07a01729607805dea2c13c3990adc31be866600 SHA256 b7cc0a8fe5f4e71a8bc83dd6e4442d641fb909fd812826dc66e9c3749c65027b
 AUX flite-1.4-fix-parallel-builds.patch 599 RMD160 81e74758731d7aaf9f820b232c56206bcb8af235 SHA1 0607706f5d88e94a28e7e02f2a49437c6b229cde SHA256 bfd51888ea533bb9ee74cadb68b2e507cb715ab5043aa679b7f42ab52336a7a1
+AUX flite-1.4-ldflags.patch 883 RMD160 6e91c79d5d1e1c3990df6388566cabf8df07a7b3 SHA1 79fa2d2c5c82c1ae1501247b54b833d2ec587fc3 SHA256 3728341769129bec9152516646de56192d65512d634170d0d02f44fae300883b
 AUX flite-1.4-respect-destdir.patch 1902 RMD160 01ff0c79ff294f4108432c56cbf205f5103e82c7 SHA1 a146918a4cafc95b8b881beb6c1a79ce0380868f SHA256 093538c3a7cd2b9b9edd1f0956a34c4261c3ccdd4feb55e8ecedc338562495f3
 DIST flite-1.2-release.tar.bz2 7817919 RMD160 e261cda8212590d1c3edb66826d404e5ad0f4c2f SHA1 ed80430a2098f780b0fd145555ce8f437d7415b2 SHA256 10ff42ce08a628c7fd84d26b5228d549e9eecb1eb03cb158e87d8be66bc58ae2
 DIST flite-1.3-release.tar.gz 10663835 RMD160 a908acfd196754783ee4665ac84ea860d54bcf80 SHA1 233144a772de72741ae1aa2292f672c30224afb3 SHA256 922225f7001e57a0fbace8833b0a48790a68f6c7b491f2d47c78ad537ab78a8b
@@ -9,6 +13,13 @@ DIST flite-1.4-release.tar.bz2 15163897 RMD160 d821c45aa8d0c4ce8fef28c7bcead70b5
 DIST flite_lexfix.tar.gz 2857920 RMD160 fea1ad471b22d47f802951824f28b79baa6b16fd SHA1 8647b3925b1d2340394f15c712fb28576934f4ff SHA256 caa81ffa962b31dbbc0211bc20506a2bb02c707695b286f072c8ec264e32252c
 EBUILD flite-1.2-r1.ebuild 1727 RMD160 9f558bcda554e565b00dd4c942b9dd02f281cda6 SHA1 5ccfe230de572bcc42991ab7192c10174752dcce SHA256 225d508baab31c9a22baf02e9f59758d0bda6458ed94ade0f503004d67ca115b
 EBUILD flite-1.3.ebuild 1572 RMD160 e99e3a700b97187f78da33a794642fd94b8df9cc SHA1 2e518ad4d587048775d3433bd885b271439defb0 SHA256 46067b744eeb6d9e4d55bdbf9f166df5687b6d3fcac624ff41b7d076cfe3174c
-EBUILD flite-1.4-r1.ebuild 1496 RMD160 1811db7a00e56e245ed6870d727b9a6f39498830 SHA1 62c484358f5a748863d8e36cfc84b688f910cbc6 SHA256 c3a637703e014fcdc81ca07ff41afd0fa214ac5996d1dee6db4b327e4bc214b6
-MISC ChangeLog 4893 RMD160 561d8c20012abfa8369654b72050994de9da702a SHA1 cde7c9996b265d4a6084fd067e848dc55773ce1d SHA256 7851fa79e6cf349f2ee05a094f3c120624dd1f12482dc04ad64c56ad8ba91dc4
+EBUILD flite-1.4-r1.ebuild 1614 RMD160 3c992a8523e574d33b0d564a503c0dee2bf13dec SHA1 09cbcba000625d40eeb40a567823a9b20f924711 SHA256 d8a12378cee2967b719dc133e68fe0a7cb6ca71fa7461cb67ef2af9acd4f8299
+MISC ChangeLog 5162 RMD160 5ba780186b439f06c76c6ed50ed31386676c1fcc SHA1 aeb29457a637031885b43a42efe3638c0e422d41 SHA256 1e0abcc5f86255ea52da9d734c3b459a4645e328e06c0580e2603512543fe706
 MISC metadata.xml 185 RMD160 75382db82e4c69d70f2d53f63363adec302720e5 SHA1 90563c269eff265fbd369095c606bc383cc07232 SHA256 b6de40518e01d3ef5447352b3f476c1f5b8e6ae53d5e654a2fb9e4ee7fdbe135
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk9FXXQACgkQVWmRsqeSphPnKQCfXlXWsSixaHWnrWZ6YYozSZXu
+09MAn0KCiTEmsCMfnsFrwQxPjzPdkNSc
+=qZfl
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch
new file mode 100644
index 000000000000..f805f57508c1
--- /dev/null
+++ b/app-accessibility/flite/files/flite-1.4-ldflags.patch
@@ -0,0 +1,12 @@
+diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/config/common_make_rules
+--- flite-1.4-release/config/common_make_rules	2009-07-30 14:52:56.000000000 +0000
++++ flite-1.4-release.new/config/common_make_rules	2011-03-26 20:22:59.000000000 +0000
+@@ -123,7 +123,7 @@
+ 	@ rm -rf shared_os && mkdir shared_os
+ 	@ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} 
+ 	@ (cd shared_os && ar x ../$<)
+-	@ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
++	@ (cd shared_os && $(CC) $(LDFLAGS) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
+ 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
+ 	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
+ 	@ rm -rf shared_os
diff --git a/app-accessibility/flite/flite-1.4-r1.ebuild b/app-accessibility/flite/flite-1.4-r1.ebuild
index a0a2c741b0d1..c344f0550de6 100644
--- a/app-accessibility/flite/flite-1.4-r1.ebuild
+++ b/app-accessibility/flite/flite-1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.1 2010/01/01 22:30:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.4-r1.ebuild,v 1.2 2012/02/22 21:26:03 jer Exp $
 
 EAPI="2"
 
@@ -30,6 +30,10 @@ get_audio() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch
 	epatch "${FILESDIR}"/${P}-respect-destdir.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -i main/Makefile \
+		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
+		|| die
 }
 
 src_configure() {
@@ -49,7 +53,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die "installation failed"
 	dodoc ACKNOWLEDGEMENTS README || die "Documentation installation failed"
 	if ! use static-libs; then
-		rm -rf "${D}"/usr/lib/*.a
+		rm -rf "${D}"/usr/lib*/*.a
 	fi
 }