version bump, bug #62504; fixed rdepend, bug #61180; add gnuconfig, bug #61179

7 files changed, 33 insertions, 72 deletions

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 3616cb868379..4b6f185b85b8 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/lcms
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.28 2004/06/24 23:05:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.29 2004/09/22 12:45:27 lanius Exp $
+
+*lcms-1.13 (22 Sep 2004)
+
+  22 Sep 2004; Heinrich Wendel <lanius@gentoo.org> -lcms-1.09.ebuild,
+  -lcms-1.11.1.ebuild, +lcms-1.13.ebuild:
+  version bump, bug #62504; fixed rdepend, bug #61180; add gnuconfig, bug #61179
 
   03 Jun 2004; Stephen P. Becker <geoman@gentoo.org> lcms-1.12.ebuild:
   Stable on mips.
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index bc2425428cdc..008a8ef5ccff 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,10 +1,8 @@
-MD5 36bae489022127b64d592c545a2473d7 lcms-1.09.ebuild 1236
+MD5 42441c298ec0030ec5980c0f35197d8e lcms-1.13.ebuild 1393
 MD5 7f118abfda6e04c33f66a6c0d7baf19f lcms-1.12.ebuild 1232
-MD5 5dd0de7eedc3c21acc67c0abc6441bdb lcms-1.11.1.ebuild 1164
 MD5 40007b7efe584339c249e1e4c0191f61 lcms-1.11.ebuild 1115
-MD5 64a3f4ecab362102747d189e7afd5d5f ChangeLog 3105
+MD5 1ac580d3287492ed2854e5741fe97ef1 ChangeLog 3323
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 23e0936e0959383e6925b18983b7f445 files/digest-lcms-1.11.1 63
-MD5 1146ce39fd2134ce3378c4ec350912c2 files/digest-lcms-1.09 61
 MD5 ec46b226970ad1597b5be73ec187ef6e files/digest-lcms-1.11 61
 MD5 a2d2635e95a30adc03a018d80e7697cf files/digest-lcms-1.12 61
+MD5 58a0f36993082241e2b970733b79087b files/digest-lcms-1.13 61
diff --git a/media-libs/lcms/files/digest-lcms-1.09 b/media-libs/lcms/files/digest-lcms-1.09
deleted file mode 100644
index 5adc28ad18e5..000000000000
--- a/media-libs/lcms/files/digest-lcms-1.09
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e8e2303351f3c7de335f02196820a4e lcms-1.09.tar.gz 192593
diff --git a/media-libs/lcms/files/digest-lcms-1.11.1 b/media-libs/lcms/files/digest-lcms-1.11.1
deleted file mode 100644
index 4f809d9dfa40..000000000000
--- a/media-libs/lcms/files/digest-lcms-1.11.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b21a563eeb240e08d3371cb1426b2bc6 lcms-1.11.1.tar.gz 559624
diff --git a/media-libs/lcms/files/digest-lcms-1.13 b/media-libs/lcms/files/digest-lcms-1.13
new file mode 100644
index 000000000000..f3caf273cd4e
--- /dev/null
+++ b/media-libs/lcms/files/digest-lcms-1.13
@@ -0,0 +1 @@
+MD5 e627f43bbbd238895502402d942a6cfd lcms-1.13.tar.gz 585735
diff --git a/media-libs/lcms/lcms-1.09.ebuild b/media-libs/lcms/lcms-1.09.ebuild
deleted file mode 100644
index f04a1e408c55..000000000000
--- a/media-libs/lcms/lcms-1.09.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.09.ebuild,v 1.15 2004/07/14 19:58:05 agriffis Exp $
-
-DESCRIPTION="A lightweight, speed optimized color management engine"
-SRC_URI="http://www.littlecms.com/${P}.tar.gz"
-HOMEPAGE="http://www.littlecms.com/"
-
-DEPEND="media-libs/tiff
-	media-libs/jpeg
-	sys-libs/zlib"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-IUSE="jpeg tiff"
-
-src_compile() {
-	mv ${S}/src/makefile ${S}/src/makefile.orig
-	sed -e 's/-Wall/-Wall -fPIC/' ${S}/src/makefile.orig > ${S}/src/makefile
-	make || die
-
-}
-
-src_install () {
-
-	make \
-		DESTDIR=${D} \
-		BINDIR=${D}/usr/bin \
-		install || die
-
-	( use tiff && use jpeg ) && ( \
-	make \
-		DESTDIR=${D} \
-		utils || die
-	)
-
-	cd ${D}/usr/include
-	cp lcms.h lcms.orig
-	sed -e "s:#define VERSION.*::" \
-		-e "s:#define PACKAGE.*::" \
-		lcms.orig > lcms.h
-	rm lcms.orig
-
-	dodir /usr/include/lcms
-	mv ${D}/usr/include/*.h ${D}/usr/include/lcms
-
-	cd ${S}/testbed
-	dodir /usr/share/lcms/profiles
-	cp *.icm ${D}/usr/share/lcms/profiles
-	cd ${S}
-
-	dodoc AUTHORS COPYING ChangeLog README* INSTALL NEWS README
-	docinto txt
-	dodoc doc/*
-
-}
diff --git a/media-libs/lcms/lcms-1.11.1.ebuild b/media-libs/lcms/lcms-1.13.ebuild
index e8f410e7e667..a86cf848caa0 100644
--- a/media-libs/lcms/lcms-1.11.1.ebuild
+++ b/media-libs/lcms/lcms-1.13.ebuild
@@ -1,24 +1,39 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.11.1.ebuild,v 1.5 2004/06/24 23:05:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-1.13.ebuild,v 1.1 2004/09/22 12:45:27 lanius Exp $
+
+inherit libtool gnuconfig
 
 DESCRIPTION="A lightweight, speed optimized color management engine"
 HOMEPAGE="http://www.littlecms.com/"
 SRC_URI="http://www.littlecms.com/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+IUSE="tiff jpeg zlib python"
 
 DEPEND="tiff? ( media-libs/tiff )
 	jpeg? ( media-libs/jpeg )
 	zlib? ( sys-libs/zlib )
 	python? ( >=dev-lang/python-1.5.2 )"
 
-IUSE="tiff jpeg zlib python"
+RDEPEND="jpeg? ( media-libs/jpeg )
+	python? ( >=dev-lang/python-1.5.2 )"
 
-MY_PV=1.11
-S=${WORKDIR}/${PN}-${MY_PV}
+src_unpack() {
+	unpack ${A}
+
+	# an updated config.sub for the uclibc env
+	gnuconfig_update || die
+
+	# fix build on amd64
+	cd ${S}
+	einfo "Running autoreconf..."
+	autoreconf
+	einfo "Running libtoolize..."
+	elibtoolize
+}
 
 src_compile() {
 	econf \
@@ -38,7 +53,7 @@ src_install() {
 		install                              || die "make install failed"
 
 	insinto /usr/share/lcms/profiles
-	doins testbed/*.icm                      || die "doins failed"
+	doins testbed/*.icm
 
-	dodoc AUTHORS README* INSTALL NEWS doc/* || die "dodoc failed"
+	dodoc AUTHORS README* INSTALL NEWS doc/*
 }