Do not install static-libs unless requested and remove not-required .la files.

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

4 files changed, 44 insertions, 13 deletions

diff --git a/dev-games/ggz-client-libs/ChangeLog b/dev-games/ggz-client-libs/ChangeLog
index 3851715b6f2d..d30ed63bde80 100644
--- a/dev-games/ggz-client-libs/ChangeLog
+++ b/dev-games/ggz-client-libs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/ggz-client-libs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ChangeLog,v 1.34 2010/01/22 22:11:22 abcd Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ChangeLog,v 1.35 2012/02/19 13:38:00 scarabeus Exp $
+
+  19 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  ggz-client-libs-0.0.14.1.ebuild:
+  Do not install static-libs unless requested and remove not-required .la
+  files.
 
   22 Jan 2010; Jonathan Callen <abcd@gentoo.org>
   ggz-client-libs-0.0.14.1.ebuild:
diff --git a/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild b/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
index b8e6f08a404c..3464c45e046f 100644
--- a/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
+++ b/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild,v 1.15 2010/01/22 22:11:22 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ggz-client-libs/ggz-client-libs-0.0.14.1.ebuild,v 1.16 2012/02/19 13:38:00 scarabeus Exp $
+
+EAPI=4
 
 inherit games-ggz
 
@@ -10,11 +12,22 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 
-IUSE="debug"
+IUSE="debug static-libs"
 
 RDEPEND="~dev-games/libggz-${PV}
 	dev-libs/expat
 	virtual/libintl"
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
+
 PATCHES=( "${FILESDIR}"/${P}-destdir.patch )
+
+src_configure() {
+	games-ggz_src_configure \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	games-ggz_src_install
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-games/libggz/ChangeLog b/dev-games/libggz/ChangeLog
index 317d4453991a..f6bc80b8d0dd 100644
--- a/dev-games/libggz/ChangeLog
+++ b/dev-games/libggz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/libggz
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/ChangeLog,v 1.31 2010/01/22 22:10:44 abcd Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/ChangeLog,v 1.32 2012/02/19 13:37:57 scarabeus Exp $
+
+  19 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> libggz-0.0.14.1.ebuild:
+  Do not install static-libs unless requested and remove not-required .la
+  files.
 
   22 Jan 2010; Jonathan Callen <abcd@gentoo.org> libggz-0.0.14.1.ebuild:
   Keyword ~amd64-linux/~x86-linux
diff --git a/dev-games/libggz/libggz-0.0.14.1.ebuild b/dev-games/libggz/libggz-0.0.14.1.ebuild
index 90c2f547ea93..d4edc6aad4b6 100644
--- a/dev-games/libggz/libggz-0.0.14.1.ebuild
+++ b/dev-games/libggz/libggz-0.0.14.1.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-games/libggz/libggz-0.0.14.1.ebuild,v 1.13 2010/01/22 22:10:44 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/libggz/libggz-0.0.14.1.ebuild,v 1.14 2012/02/19 13:37:57 scarabeus Exp $
+
+EAPI=4
 
 inherit games-ggz
 
@@ -9,14 +11,21 @@ DESCRIPTION="The GGZ library, used by GGZ Gaming Zone"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug gnutls"
+IUSE="debug gnutls static-libs"
 
 DEPEND="dev-libs/libgcrypt
 	gnutls? ( net-libs/gnutls )
 	!gnutls? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
 
-src_compile() {
-	games-ggz_src_compile \
+src_configure() {
+	games-ggz_src_configure \
 		--with-gcrypt \
-		--with-tls=$(use gnutls && echo GnuTLS || echo OpenSSL)
+		--with-tls=$(use gnutls && echo GnuTLS || echo OpenSSL) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	games-ggz_src_install
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 }