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

Package-Manager: portage-2.2_rc87/cvs/Linux x86_64

4 files changed, 21 insertions, 15 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/Manifest b/media-libs/lcms/Manifest
index 204d78b9ef0d..7debab1055de 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,6 +1,6 @@
 DIST lcms-1.19.tar.gz 927752 RMD160 530615c061dccdcb64d75c6fab148dd565bb6c91 SHA1 d5b075ccffc0068015f74f78e4bc39138bcfe2d4 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
 DIST lcms2-2.0a.tar.gz 3449841 RMD160 610e7f92556757e963a3769e166b5a68cdd8629e SHA1 b9d3939764e3b3f33cb9b9f7cffd43520227db9e SHA256 6deaf78611f5978ff58aa85efc37cf070b6ffb7106486b894914c4fc548d054f
-EBUILD lcms-1.19.ebuild 1260 RMD160 021cb6296d6af7114dfb961bab8b1e78561aea57 SHA1 c416ea0438e4c1c5867813e671152a79b50081db SHA256 ca207de6b58baecae7145bbda0e275d6fd97d83e544616314384f54b9aa436b3
-EBUILD lcms-2.0a.ebuild 1162 RMD160 1c6af56967a7785632952d71f93d70726fc65536 SHA1 c919928f521b4d7a0a8e2fc5e32056f66c826bd0 SHA256 00b0def02c112f836712ea257518708fa5af314f478a5614f8c75fd31cb42419
-MISC ChangeLog 14414 RMD160 3b7c2a37e88ab60d5fd81be7bc6e0567ce21fe68 SHA1 996f115219e2f1203708428b80271fc39c66b606 SHA256 e2924971905056599f6f5b33eb17d4d4353e3440372340314e7faa4a71f9bab9
+EBUILD lcms-1.19.ebuild 1297 RMD160 1433ed033afda303b07fe73bc17279d5a6c46878 SHA1 4015e307cab00003f9f9faedb267896f97c3f887 SHA256 4c871d747365aae6f94fba7a6d8f40d598d64d3a101ebbdd00bbf12a52afc869
+EBUILD lcms-2.0a.ebuild 1194 RMD160 c07a5ed81c422dba35c9d369be211b86481b592a SHA1 364be800dac277bb0a3427997b4fc158e57ed0ef SHA256 37b82e4c2e334175253e6a397f6ff1ecac593d71cfc62f6be6d10c0e30b386a1
+MISC ChangeLog 14529 RMD160 163c23d5caea4af51ef9ffe96f2973a775e7f626 SHA1 4d49d87ca4a0308a34b6f22e90ebbb7c528c108d SHA256 b43d3e1160a1ea967ab355f62782484ccfa9a0d0dd48e698095fa040194f8727
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
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 '{}' +
 }