Version bump; remove old

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

4 files changed, 44 insertions, 101 deletions

diff --git a/media-gfx/argyllcms/ChangeLog b/media-gfx/argyllcms/ChangeLog
index 896fda48e38b..ceb35ec4aadc 100644
--- a/media-gfx/argyllcms/ChangeLog
+++ b/media-gfx/argyllcms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/argyllcms
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.19 2012/03/10 00:08:36 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.20 2012/05/07 00:22:56 dilfridge Exp $
+
+*argyllcms-1.4.0 (07 May 2012)
+
+  07 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -argyllcms-1.3.4.ebuild, -argyllcms-1.3.5-r1.ebuild, +argyllcms-1.4.0.ebuild,
+  +files/argyllcms-1.4.0-jpeg.patch:
+  Version bump; remove old
 
 *argyllcms-1.3.5-r1 (10 Mar 2012)
 
diff --git a/media-gfx/argyllcms/argyllcms-1.3.5-r1.ebuild b/media-gfx/argyllcms/argyllcms-1.3.5-r1.ebuild
deleted file mode 100644
index e0c89a883c71..000000000000
--- a/media-gfx/argyllcms/argyllcms-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.3.5-r1.ebuild,v 1.1 2012/03/10 00:08:36 gregkh Exp $
-
-inherit eutils
-
-MY_P="Argyll_V${PV}"
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="media-libs/tiff
-	virtual/jpeg
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/0001-Add-an-experimental-ColorHug-sensor-driver.patch"
-}
-
-src_compile() {
-	# Make it respect LDFLAGS
-	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
-	# Evil hack to get --as-needed working. The build system unfortunately lists all
-	# the shared libraries by default on the command line _before_ the object to be built...
-	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff ;" >> Jamtop
-
-	local jobnumber=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
-	[ ${jobnumber} ] || jobnumber=-j1
-
-	jam -q -fJambase ${jobnumber} || die
-}
-
-src_install() {
-	jam -q -fJambase install || die
-
-	rm bin/License.txt || die
-
-	cd bin || die
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname} || die
-	done
-	cd .. || die
-
-	if use doc; then
-		dohtml doc/* || die
-	fi
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt || die
-
-	insinto /usr/share/${PN}/ref
-	doins   ref/*  || die
-
-	insinto /etc/udev/rules.d
-	doins libusb/55-Argyll.rules || die
-}
-
-pkg_postinst() {
-	elog "To avoid file collisions, all binary names have been prefixed"
-	elog "with \"argyll-\". E.g., the \"refine\" program is now called"
-	elog "\"argyll-refine\"."
-	elog
-	elog "If you have a Spyder2 you need to extract the firmware"
-	elog "from the CVSpyder.dll of the windows driver package"
-	elog "and store it as /usr/share/color/spyd2PLD.bin"
-	elog
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	elog
-}
diff --git a/media-gfx/argyllcms/argyllcms-1.3.4.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
index 53377f193196..c53fb7f722c5 100644
--- a/media-gfx/argyllcms/argyllcms-1.3.4.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.3.4.ebuild,v 1.4 2011/11/17 18:50:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0.ebuild,v 1.1 2012/05/07 00:22:56 dilfridge Exp $
+
+EAPI=4
+
+inherit base
 
 MY_P="Argyll_V${PV}"
 DESCRIPTION="Open source, ICC compatible color management system"
@@ -9,7 +13,7 @@ SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND="media-libs/tiff
@@ -29,13 +33,15 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}/${P}-jpeg.patch" )
+
 src_compile() {
 	# Make it respect LDFLAGS
 	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
 
 	# Evil hack to get --as-needed working. The build system unfortunately lists all
 	# the shared libraries by default on the command line _before_ the object to be built...
-	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff ;" >> Jamtop
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
 
 	local jobnumber=$(echo "${MAKEOPTS}" | sed -ne "/-j/ { s/.*\(-j[[:space:]]*[0-9]\+\).*/\1/; p }")
 	[ ${jobnumber} ] || jobnumber=-j1
@@ -51,21 +57,21 @@ src_install() {
 	cd bin || die
 	local binname
 	for binname in * ; do
-		newbin ${binname} argyll-${binname} || die
+		newbin ${binname} argyll-${binname}
 	done
 	cd .. || die
 
 	if use doc; then
-		dohtml doc/* || die
+		dohtml doc/*
 	fi
 
-	dodoc log.txt Readme.txt ttbd.txt notes.txt || die
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
 
 	insinto /usr/share/${PN}/ref
-	doins   ref/*  || die
+	doins   ref/*
 
 	insinto /etc/udev/rules.d
-	doins libusb/55-Argyll.rules || die
+	doins libusb/55-Argyll.rules
 }
 
 pkg_postinst() {
diff --git a/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch b/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch
new file mode 100644
index 000000000000..d523481e3326
--- /dev/null
+++ b/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch
@@ -0,0 +1,21 @@
+diff -ruN Argyll_V1.4.0.orig/Jamtop Argyll_V1.4.0/Jamtop
+--- Argyll_V1.4.0.orig/Jamtop	2012-04-19 09:50:31.000000000 +0200
++++ Argyll_V1.4.0/Jamtop	2012-05-07 02:18:37.000000000 +0200
+@@ -113,13 +113,13 @@
+ # See if we have a system JPEG library.
+ if ! $(BUILTIN_JPEG) && $(UNIX) {
+ 	if [ GLOB /usr/include : jpeglib.h ]  {
+-		if  ! $(HOST64) && ( [ GLOB /usr/lib : libjpg.so ] || [ GLOB /usr/lib : libjpg.a ] )
+-		 ||   $(HOST64) && ( [ GLOB /usr/lib64 : libjpg.so ] || [ GLOB /usr/lib64 : libjpg.a ] )
+-		 ||   $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.a ] ) {
++		if  ! $(HOST64) && ( [ GLOB /usr/lib : libjpeg.so ] || [ GLOB /usr/lib : libjpeg.a ] )
++		 ||   $(HOST64) && ( [ GLOB /usr/lib64 : libjpeg.so ] || [ GLOB /usr/lib64 : libjpeg.a ] )
++		 ||   $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] ) {
+ 			echo "Using system JPEG library" ;
+ 			JPEGLIB = ;
+ 			JPEGINC = ;
+-			LINKFLAGS += $(LINKFLAG)tiff ;
++			LINKFLAGS += $(LINKFLAG)jpeg ;
+ 			HAVE_JPEG = true ;
+ 		}
+ 	}