use use_with, emake, insinto, doins; add more IUSE; more error checking/messages; tidy

3 files changed, 27 insertions, 28 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index aa7e74ee5c4b..d9df19f10167 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/lcms
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.12 2003/09/22 14:11:10 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.13 2003/11/09 13:55:53 mr_bones_ Exp $
+
+  09 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> lcms-1.11.ebuild:
+  use use_with, emake, insinto, doins; add more IUSE; more error
+  checking/messages; tidy
 
   22 Sep 2003; Heinrich Wendel <lanius@gentoo.org> lcms-1.11.ebuild:
   bug #29309
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 0352204f2937..3393a752ba57 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,5 +1,5 @@
+MD5 24bcf2bb7bbb158c4e78e3040e3bdf8a ChangeLog 1760
 MD5 a0a5f71922298554bca59bd76bcf08ee lcms-1.09.ebuild 1244
+MD5 81ec7fb7a8475f497303379ef1af2684 lcms-1.11.ebuild 1128
 MD5 1146ce39fd2134ce3378c4ec350912c2 files/digest-lcms-1.09 61
 MD5 ec46b226970ad1597b5be73ec187ef6e files/digest-lcms-1.11 61
-MD5 f81036affd87c8692c40c94e9890350d lcms-1.11.ebuild 1304
-MD5 b7c1633219dafb0a4f1fee892b5bf5ca ChangeLog 1592
diff --git a/media-libs/lcms/lcms-1.11.ebuild b/media-libs/lcms/lcms-1.11.ebuild
index 7216ec2f1f15..46a9c7011213 100644
--- a/media-libs/lcms/lcms-1.11.ebuild
+++ b/media-libs/lcms/lcms-1.11.ebuild
@@ -1,29 +1,30 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.11.ebuild,v 1.2 2003/09/22 14:11:10 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.11.ebuild,v 1.3 2003/11/09 13:55:53 mr_bones_ Exp $
 
 DESCRIPTION="A lightweight, speed optimized color management engine"
-SRC_URI="http://www.littlecms.com/${P}.tar.gz"
 HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="http://www.littlecms.com/${P}.tar.gz"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+LICENSE="LGPL-2.1"
+SLOT="0"
 
 DEPEND="tiff? ( media-libs/tiff )
 	jpeg? ( media-libs/jpeg )
 	zlib? ( sys-libs/zlib )
-	python? ( dev-lang/python )"
+	python? ( >=dev-lang/python-1.5.2 )"
 
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-IUSE="tiff jpeg"
+IUSE="tiff jpeg zlib python"
 
 src_compile() {
-	use jpeg && myconf="${myconf} --with-jpeg" || myconf="${myconf} --without-jpeg"
-	use tiff && myconf="${myconf} --with-tiff" || myconf="${myconf} --without-tiff"
-	use zlib && myconf="${myconf} --with-zlib" || myconf="${myconf} --without-zlib"
-	use python && myconf="${myconf} --with-python" || myconf="${myconf} --without-python"
-
-	econf ${myconf} || die
-	make || die
+	econf \
+		--disable-dependency-tracking \
+		`use_with jpeg` \
+		`use_with tiff` \
+		`use_with zlib` \
+		`use_with python` || die
+	emake || die "emake failed"
 }
 
 src_install () {
@@ -31,17 +32,11 @@ src_install () {
 	make \
 		DESTDIR=${D} \
 		BINDIR=${D}/usr/bin \
-		install || die
-
-	dodir /usr/include/lcms
-	mv ${D}/usr/include/*.h ${D}/usr/include/lcms
+		includedir="/usr/include/${PN}" \
+		install                              || die "make install failed"
 
-	cd ${S}/testbed
-	dodir /usr/share/lcms/profiles
-	cp *.icm ${D}/usr/share/lcms/profiles
-	cd ${S}
+	insinto /usr/share/lcms/profiles
+	doins testbed/*.icm                      || die "doins failed"
 
-	dodoc AUTHORS COPYING README* INSTALL NEWS
-	docinto txt
-	dodoc doc/*
+	dodoc AUTHORS README* INSTALL NEWS doc/* || die "dodoc failed"
 }