Install static libraries only if desired and remove libtool archive as we have pc file.

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

3 files changed, 34 insertions, 15 deletions

diff --git a/media-libs/ftgl/ChangeLog b/media-libs/ftgl/ChangeLog
index d112fc3bd167..2a779a2e40d8 100644
--- a/media-libs/ftgl/ChangeLog
+++ b/media-libs/ftgl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ftgl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ChangeLog,v 1.35 2011/05/20 09:24:18 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ChangeLog,v 1.36 2012/03/15 18:18:25 scarabeus Exp $
+
+  15 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> ftgl-2.1.3_rc5.ebuild:
+  Install static libraries only if desired and remove libtool archive as we have
+  pc file.
 
   20 May 2011; Tupone Alfredo <tupone@gentoo.org> ftgl-2.1.3_rc5.ebuild,
   +files/ftgl-2.1.3_rc5-underlink.patch:
diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index 59991781dce1..47d33f627d42 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -4,13 +4,23 @@ Hash: SHA1
 AUX ftgl-2.1.3_rc5-gentoo.patch 1399 RMD160 6d84e1969ffc3fdbea3bf2e462091bfcc0663b9b SHA1 48c85d76ae5d812b70310d0cd365d838b502dad6 SHA256 1c5d8e3e0d37db1174bc00e9876c306fbda1491ec6216c5bd3f3e2856d629f58
 AUX ftgl-2.1.3_rc5-underlink.patch 349 RMD160 8de0c8abf7f945220241830f92c8a337e2c86fbb SHA1 c23b435506295a1c123974cfd13bf0994a1ab3cc SHA256 9a3540ff4705476f22718a5614aa3a7f64b8e748839e92d1bcbc8a29364ca590
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 RMD160 4b66577f1864509982561f447de5bc15045da3d5 SHA1 8508f26c84001d7bc949246affa03744fa1fd22e SHA256 521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59
-EBUILD ftgl-2.1.3_rc5.ebuild 1142 RMD160 86e713b15ad99478a894e11e60ca32ad8eb7847f SHA1 93bbae356436652bd20607d00231b0c30b48165c SHA256 11a516d015c4dc0e446ba0097268990841efb17d06c3cc8800305bd5fb31b70d
-MISC ChangeLog 4406 RMD160 2791c93fdc73e2051ca66cbbd8f914d89d069c4c SHA1 61742c07264cb2bdd18e63849ebf6c15e911fe96 SHA256 c20c2de38ef12524c25accc84e6a6af343bca3862ed9d4027946ba4dfcd657ba
+EBUILD ftgl-2.1.3_rc5.ebuild 1205 RMD160 7ea43e3176b881bcb1eb0296883c0382c8cd6797 SHA1 b7def2198a18abd0dc17e310895d68b0a648920b SHA256 d97e5ab14970b74995ee794ab8db2ff8f894d0cd293fbab1d31e456b4d994c3b
+MISC ChangeLog 4580 RMD160 bfe10589c3831e6883699153894a76d8648feac6 SHA1 72e003c5c0ea13d56ef89113ea5b663acab26034 SHA256 497b13798a24cae867fa11164c4a913e6762c191aed8dbbf4c0cd79944674b61
 MISC metadata.xml 159 RMD160 9ce79fb2f245a86f0fd9896ef34c65b6dc2a97bf SHA1 e8d4e28f664e8bd524cb04b5077852adc2f57d90 SHA256 a222ada7640e6dfb21d27151813829e91a72a6878d809dfddaa41581455f6b69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3WM00ACgkQIY77eQFFFC3wBQCfYcD4sJu6HMmtej9oru8LO/iM
-7xIAoITeyjPXl7gT82on0JLrPGnrgCQ6
-=xXpr
+iQIcBAEBAgAGBQJPYjJ3AAoJEOSiRoyO7jvo6A4P/infnyxYRKVeHNsef+nsxiaL
+HXEGE0vp9RNsUUJv64v2Whqc2ynI6rIJLns+MaX7Jpn3cjgyw0bVwFV3sqBSHeF7
++VRE2vskQ1L8sywHImqSxpToD9W2TuHtqKwZ+7mL/feEGgaHAQScaDIT0peLTNMq
+NxzlVoQF9wiiO+yJmz4Ux7rN4Kcyb+pn7Fbg1TrNLL51pARIiZpnKiT9klRcX92R
+gFhW6raGGLXvP332KZ2CDIPOBWiNw0BbpEg8CcobZ72Xsmlb4eyjJhgA2AvdJ81N
+8FCuoOSqZ0iLXHBPBOWOq49hygesldHS/dKJN0BJMXFHg/8qUhCf2z4S9/tK8pVz
+rfCDKGuyjkR972126EtVTRKk3QjtMmqTesErFOf/q1urhGEwx5khuCheX5LHGfiO
+g/X3auCPKs8j5Bk7tw3GDGOlUZU+Wd8dl9PjL8Nq0vx+OjM+0rkJzzNhaAuvJPBr
+5NJ3AE5pgE/98yBJSs/h3K5K3RZ7ZXF44I0za9eGlT/B6GPAoNVF3DxRxAvqfqR1
+udYpvjo61fo+5NqdVhTD29Dyz0cv7cEABiGH8efBAoXZxbDWlo2P3rTWCRkhrNub
+LoB6f40SgnwcQ96uD/yjyeUbuBTrqqECvVQKCB14f/FlRYcb2NDarj8seS/ZJKhE
+f6J4yMmiy9smdqqTBFg3
+=mri8
 -----END PGP SIGNATURE-----
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 8c1e6af5f126..18b126ba9ee7 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild,v 1.15 2011/05/20 09:24:18 tupone Exp $
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild,v 1.16 2012/03/15 18:18:25 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils flag-o-matic autotools
 
@@ -17,15 +18,18 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
+IUSE="static-libs"
 
 DEPEND=">=media-libs/freetype-2.0.9
 	virtual/opengl
 	virtual/glu
 	media-libs/freeglut"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P2}
 
+DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README TODO docs/projects_using_ftgl.txt"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.patch \
 		"${FILESDIR}"/${P}-underlink.patch
@@ -35,12 +39,13 @@ src_prepare() {
 
 src_configure() {
 	strip-flags # ftgl is sensitive - bug #112820
-	econf
+	econf \
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	rm -rf "${D}"/usr/share/doc/ftgl
-	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README TODO \
-		docs/projects_using_ftgl.txt
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }