Disable static libraries, punt the .la files.

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

3 files changed, 37 insertions, 10 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index cb6a4afb4c9c..d7fdbe7663da 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.140 2011/06/20 05:04:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.141 2011/09/09 12:14:51 scarabeus Exp $
+
+  09 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  fontforge-20110222.ebuild:
+  Disable static libraries, punt the .la files.
 
   20 Jun 2011; Peter Volkov <pva@gentoo.org> fontforge-20100501.ebuild,
   fontforge-20110222.ebuild:
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 8c618de45ed3..f38038ccba3f 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fontforge-20110222-lxkbui.patch 545 RMD160 5f2138356b8f475a633176e0ecebd778241f0ed8 SHA1 251cea6906610bcc5d5d86e106ee56b8041d28e8 SHA256 192d3606dcf8f925a9cc5f79e7430979d0eb1a0f209a4447682f135f79d33828
 AUX fontforge-desktop.patch 662 RMD160 2242c71cbb88941e398fe0bb28798df941b05cd6 SHA1 c170824b25ad698d0ef8d3a59e16312c418c1fd8 SHA256 b2308b21b7db3c1ad0f8e2880678a0866f401e3ce57903e98ed68472f1e187e8
 AUX fontforge-py27.diff 387 RMD160 633fbf1f53495d0bb87975f657e00f452d7cae9b SHA1 406b97dbd894a97f1f1a66376a1ab41c7a6081f2 SHA256 18d71c28258a00459621113a0126b525b08cfd0a2dfb406fc90c6bed3d3790ed
@@ -7,6 +10,23 @@ DIST fontforge_full-20110222.tar.bz2 5126031 RMD160 7f276e9e3ef673b78355bb7be50f
 DIST fontforge_htdocs-20100429.tar.bz2 3115782 RMD160 f1dedf39898d12398ffe463c06ebcb5d88fb575b SHA1 eeda060ad5e83392d1a27f6c9c1eac2a9c780c09 SHA256 842a5e675341578aacdd2614ec416719eba51826749d73b2044731335d1a1883
 DIST fontforge_htdocs-20110221.tar.bz2 3129839 RMD160 ac92a01aafbb39ccbecff2953f3b6f49c3721f71 SHA1 e966fea60a2f7f022af71669f67e15e258948e0e SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec
 EBUILD fontforge-20100501.ebuild 3530 RMD160 3a71105e6270f449767242c92b72803bc55d4489 SHA1 2f8f35fde5cb890e246c2005fa0b8ed712c42258 SHA256 cb9cc8fbe6ee58eaa12ceaf718160faddfe7de7780e24f73f4e6e09c5c24a5e7
-EBUILD fontforge-20110222.ebuild 3619 RMD160 6ff8602e33e3f38513f5135790a03a83ebf52ab6 SHA1 56802d6fe4e05ef3f499ba2530a7d238d13da926 SHA256 bff1923fcc590ae8298fc699f63b88181f445c743c06d55995e8bca7c98dd38e
-MISC ChangeLog 20725 RMD160 4772f5b642c381354774b4611091f9694f44b40a SHA1 307739dad3712a0dbe0f7b5b565e2a32a9d9284d SHA256 275ee4cafcc552017e58cffd015debbe06a0fd5bde1e1778e385808ef39144e0
+EBUILD fontforge-20110222.ebuild 3733 RMD160 b276315c701505831e0abf0cd7d58fa95d0ae683 SHA1 56f2450dc93f703a083c1843fe3c1db79d0216f7 SHA256 e26534f1866da52fdaf89e89c8cd81e8b327cc328d673b0c9c7129cf2ab33efd
+MISC ChangeLog 20864 RMD160 a160c826b13a0a4b3415daa235d04b59a8548bc4 SHA1 669ddaa79c37b52637e0685a667053e682de9130 SHA256 2605404bd6389b8b634d6780d7569cc5ed92557401e5b66628d8dc9b37b54c60
 MISC metadata.xml 1457 RMD160 1d4951de15b18f544ad32bed8b23c86d9c062f99 SHA1 8cdb030e20d35deb3a7491fa2c622b67a4d9e0e7 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOagNNAAoJEOSiRoyO7jvoHTQP/0opaHcOucVdeJwM3M2fmsCG
+WtOFxSqVNYE28u2uAetvQsmeQ4sjBksN5nH8s68eg0O7X/GDanDxu+rFIlm7V8Hs
+Y1WjhHCSIKQtYV9xLvXwqFPwnxj4mpku80LNsQ4l6Ool8wpE6yQECj0GsggcdykG
+FOUSh8FSZzyahWy2zD3pVQJLaHaj4zJtqhk0ls/MQYtRdL1RuByFyXQfixJdroUb
+pO0lkUtMsv8J0FW/XVKOm7+9OLMINXxFz+CGVXv9PxUgdoWNEAD7HkJOsDdQIMfC
+5Fj9krqmLajf3QWaWNuC5mtUuASSaRmiDhK1F44oS8JHKYM/mk+NHsv9oFqZ7Tuf
+OtK8HO31GnfRBUvfUHSi2Phmp0xcU+UUhgW/6qTBWu79+O4AGtuaM0jAc0YctCUe
+BuMRFoYruPt9zqZw4O8W9WDDURJyMjU6F/u/1TburMunXZ09kAxAF8bZRGBcCqtp
+6pdEJ1zJ9/KNDfmBObuNb7RFX0IDNihd4MY2sf4enY9r0B4DrmEcFc0Esh5+O1kC
+l8LnaXI4ue62SlkhQV5DifS+R9nPw2kdBr0DwlfyWOI+6fwzlmy6N3kJbONvao3D
+6JcTFHgrpk6tM4lGy9Pd1ardlYoCMkst8RiabYiZyXL6zOaG020qDkj1AH6VEvH5
+HXBjlYsGr1/TjhsSrzl6
+=COb2
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fontforge/fontforge-20110222.ebuild b/media-gfx/fontforge/fontforge-20110222.ebuild
index f6520a39fca7..2d3d05606c87 100644
--- a/media-gfx/fontforge/fontforge-20110222.ebuild
+++ b/media-gfx/fontforge/fontforge-20110222.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222.ebuild,v 1.6 2011/06/20 05:04:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222.ebuild,v 1.7 2011/09/09 12:14:51 scarabeus Exp $
 
 # Some notes for maintainers this package:
 # 1. README-unix: freetype headers are required to make use of truetype debugger
@@ -76,6 +76,7 @@ src_configure() {
 	# no real way of disabling gettext/nls ...
 	use nls || export ac_cv_header_libintl_h=no
 	econf \
+		--disable-static \
 		$(use_with truetype-debugger freetype-src "/usr/include/freetype2/internal4fontforge/") \
 		$(use_enable type3) \
 		$(use_with python) \
@@ -91,23 +92,25 @@ src_configure() {
 
 src_install() {
 	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS README*
+	dodoc AUTHORS README* || die
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 
 	if use cjk; then #129518
 		insinto /usr/share/fontforge
-		doins "${WORKDIR}"/*.cidmap
+		doins "${WORKDIR}"/*.cidmap || die
 	fi
 
-	doicon Packaging/fontforge.png
+	doicon Packaging/fontforge.png || die
 	insinto /usr/share/applications
-	doins Packaging/fontforge.desktop
+	doins Packaging/fontforge.desktop || die
 	insinto /usr/share/mime/application
-	doins Packaging/fontforge.xml
+	doins Packaging/fontforge.xml || die
 
 	if use doc; then
 		insinto /usr/share/doc/${PN}
 		cd "${WORKDIR}/html/"
-		doins -r *
+		doins -r * || die
 	fi
 }