Remove libtool and static archive if USE="static-libs" is not set wrt #362959 by Stéphane Pagnon.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

1 files changed, 13 insertions, 16 deletions

diff --git a/media-libs/gd/gd-2.0.35-r2.ebuild b/media-libs/gd/gd-2.0.35-r2.ebuild
index 7a0890b5f46b..dff89fba6bf9 100644
--- a/media-libs/gd/gd-2.0.35-r2.ebuild
+++ b/media-libs/gd/gd-2.0.35-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r2.ebuild,v 1.2 2010/07/23 20:55:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r2.ebuild,v 1.3 2011/04/11 14:21:39 ssuominen Exp $
 
-EAPI=1
-inherit autotools
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://libgd.org/"
@@ -12,7 +12,7 @@ SRC_URI="http://libgd.org/releases/${P}.tar.bz2"
 LICENSE="|| ( as-is BSD )"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="fontconfig jpeg png truetype xpm"
+IUSE="fontconfig jpeg png static-libs truetype xpm"
 
 RDEPEND="fontconfig? ( media-libs/fontconfig )
 	jpeg? ( virtual/jpeg )
@@ -22,34 +22,31 @@ RDEPEND="fontconfig? ( media-libs/fontconfig )
 	xpm? ( x11-libs/libXpm x11-libs/libXt )"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-libpng14.patch \
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-libpng14.patch \
 		"${FILESDIR}"/${P}-maxcolors.patch
 
 	# Try libpng14 first, then fallback to plain libpng
-	sed -i \
-		-e 's:png12:png14:' \
-		configure.ac || die
+	sed -i -e 's:png12:png14:' configure.ac || die
 
 	eautoconf
 	find . -type f -print0 | xargs -0 touch -r configure
 }
 
-src_compile() {
+src_configure() {
 	econf \
+		$(use_enable static-libs static) \
 		$(use_with fontconfig) \
 		$(use_with png) \
 		$(use_with truetype freetype) \
 		$(use_with jpeg) \
-		$(use_with xpm) \
-		|| die
-	emake || die
+		$(use_with xpm)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc INSTALL README*
 	dohtml -r ./
+	use static-libs || rm -f "${D}"/usr/lib*/libgd.la
 }