USE="static-libs" and punt .la files.

(Portage version: 2.2_rc87/cvs/Linux x86_64)

3 files changed, 18 insertions, 12 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 9738abe340f2..b92475d59fa0 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.121 2010/09/04 14:51:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.122 2010/09/28 16:19:42 ssuominen Exp $
+
+  28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> lcms-1.19.ebuild:
+  USE="static-libs" and punt .la files.
 
   04 Sep 2010; Raúl Porcel <armin76@gentoo.org> lcms-2.0a.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #328795
diff --git a/media-libs/lcms/lcms-1.19.ebuild b/media-libs/lcms/lcms-1.19.ebuild
index 5f7d9c28ed55..0a35abb79f4e 100644
--- a/media-libs/lcms/lcms-1.19.ebuild
+++ b/media-libs/lcms/lcms-1.19.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19.ebuild,v 1.8 2010/07/23 20:40:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.19.ebuild,v 1.9 2010/09/28 16:19:42 ssuominen Exp $
 
-EAPI="2"
-
-inherit libtool eutils multilib
+EAPI=2
+inherit libtool multilib
 
 DESCRIPTION="A lightweight, speed optimized color management engine"
 HOMEPAGE="http://www.littlecms.com/"
@@ -13,7 +12,7 @@ SRC_URI="http://www.littlecms.com/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="tiff jpeg zlib python"
+IUSE="jpeg python static-libs tiff zlib"
 
 RDEPEND="tiff? ( media-libs/tiff )
 	jpeg? ( virtual/jpeg )
@@ -24,14 +23,15 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# run swig to regenerate lcms_wrap.cxx and lcms.py (bug #148728)
 	if use python; then
-		cd "${S}"/python
-		./swig_lcms || die "swig_lcms failed"
+		cd python
+		./swig_lcms || die
 	fi
 }
 
 src_configure() {
 	econf \
 		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
 		$(use_with jpeg) \
 		$(use_with python) \
 		$(use_with tiff) \
@@ -43,10 +43,12 @@ src_install() {
 		DESTDIR="${D}" \
 		BINDIR="${D}"/usr/bin \
 		libdir=/usr/$(get_libdir) \
-		install || die "make install failed"
+		install || die
 
 	insinto /usr/share/lcms/profiles
 	doins testbed/*.icm
 
 	dodoc AUTHORS README* INSTALL NEWS doc/*
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }
diff --git a/media-libs/lcms/lcms-2.0a.ebuild b/media-libs/lcms/lcms-2.0a.ebuild
index aaedd0a296bb..423b30fe4fb9 100644
--- a/media-libs/lcms/lcms-2.0a.ebuild
+++ b/media-libs/lcms/lcms-2.0a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.0a.ebuild,v 1.11 2010/09/26 23:10:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.0a.ebuild,v 1.12 2010/09/28 16:19:42 ssuominen Exp $
 
 EAPI=2
 inherit libtool
@@ -14,9 +14,10 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="jpeg static-libs tiff zlib"
 
-DEPEND="jpeg? ( virtual/jpeg )
+RDEPEND="jpeg? ( virtual/jpeg )
 	tiff? ( media-libs/tiff )
 	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
 
 RESTRICT="test" # Segment maxima GBD test fails randomly
 
@@ -46,5 +47,5 @@ src_install() {
 	insinto /usr/share/doc/${PF}/pdf
 	doins doc/*.pdf || die
 
-	find "${D}" -name '*.la' -delete
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }