Version bump; remove old

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 68 insertions, 105 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/Manifest b/media-gfx/argyllcms/Manifest
index f41c811f5310..3c196d30ca40 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,8 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 0001-Add-an-experimental-ColorHug-sensor-driver.patch 27692 RMD160 1d0254051c6e57b08d065f671793deabf73c45ee SHA1 2bef5b2c820f8e29689aa77aea8b079e9e47f595 SHA256 c968945bc91ead45f2cf73edcc438bd18aa21ff04ee25cb114785ca7017d9709
-DIST Argyll_V1.3.4_src.zip 12881636 RMD160 877920a693c0bbe02a474870ba7199955e7bb111 SHA1 3e38248d544fd301c014bd77049b6f7e6f0dbc44 SHA256 b226059a16a5ed8c5c280d1d67d329ff93c53fdc5f172ec767e9c68e7efa7468
+AUX argyllcms-1.4.0-jpeg.patch 1111 RMD160 234be93d1c404b6173395472e971cc96d79896fd SHA1 a8bc9f992653d0d2a1f0d75e6165e38c29c79bfd SHA256 15403ab2480d43f8d2247d0ba6a535e1761c15e286d5eb144470f694b70194e3
 DIST Argyll_V1.3.5_src.zip 12892085 RMD160 caaab54fb98d000acfa655eacbb0b5fa59fd988a SHA1 131ed45d47163aebfc8ac1bf1a4287f18271a061 SHA256 905dc6b5493e02eee76ef7384d619d1135704650a14d27b13c549002a1d9908c
-EBUILD argyllcms-1.3.4.ebuild 2219 RMD160 120ccabb6503882f3ad2a71536b6be93f08431a1 SHA1 01d3e02d45d6ee98faf85240b790afd64ba67b39 SHA256 e122ac0c607f23ac0134a07825c88a5fe7032ba3a319af413e0860ffc293194a
-EBUILD argyllcms-1.3.5-r1.ebuild 2354 RMD160 15f7e49c8d63a9411d143bfd445a9307a0062b63 SHA1 230b66bf907bfccd6b2c525cf1f7db67d90cb3b9 SHA256 bfb3eb0cc5d33dea916db34e3001697f5d4b0630143e24db00445f8483330b38
+DIST Argyll_V1.4.0_src.zip 15242860 RMD160 fca27ecd99a525de148cf80de54ae934a5da9462 SHA1 1c10d9072db80e004bb87120a9bc75c1cdef4c72 SHA256 d33134704d2964db69f9e61eb73188632fe2058cdf57aeaa56e64a264e02b1a8
 EBUILD argyllcms-1.3.5.ebuild 2219 RMD160 f880a2cfb2dabfc0dbca671c0f663d94f3ba64a7 SHA1 7e10021ee741aed78ba7233ed38f73f38d956146 SHA256 7c18e915605eb6e8a12b9d7429dc644ecf957ae7d5f1722bba26c18149ff2c61
-MISC ChangeLog 4109 RMD160 4b44a8f110863a74fe1fb4ae38fa5fcdac28f138 SHA1 c190f5b45fb95920ffede0b2d7adfdfda12e4a21 SHA256 4390ff4f100f5898a0e8268b2d81467b01d1d1218076bcc2d3b4c7bda31cafb4
+EBUILD argyllcms-1.4.0.ebuild 2256 RMD160 e8007ab75d8e132aeb794cb44fd43fbc537c1bb9 SHA1 6fdd0c1d74a89b25f268f3b94673d7d5d9e6ff00 SHA256 cfb2d71246479f8fc275eacbd20251bc9d625a098508d94cee338c61acfd53eb
+MISC ChangeLog 4346 RMD160 0df3928f75faf1f69881530fd84145577f2759a1 SHA1 027c88a9927f53d1f1181bc17c4517630f687f1c SHA256 5ca7f4c5977c218cd818050531794971ee843a7cfe3ed920835114aadf5c3e90
 MISC metadata.xml 240 RMD160 df56d1c390e1beabf1737dce5d25d70f3985bf7e SHA1 d36ef1405e7e41455763d59862689b1c9face592 SHA256 ec9b410ee8cf3a1c2c3c615af2676e3894e70d92493f5ec128417e6439748277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIbBAEBCgAGBQJPpxYJAAoJENwGBM22xffe+zQP+PSP+cexd+u+ivARRHROREhs
+Jc8DJFnctytSO5YIVbjZyDV4V8cdIb8koJkA4KYzroHJFI50YsPleKztvbwntMZg
+vuP/Qlsemohj+JIXDjSWUttkgFn9dvvWVxjJ0nlRMzxMwY2WSLFWPqgjymDQXOwV
+VEw7gN5k60Uo+ubiC7NdqN7pX7wtSAvsMkbs4uVKJp0yGSXl29DSK9aRJ5p0EH0b
+tJSFoipUn9L76DR52thriN0iJxmU446GHeXaWdVhxuJQHUEQr/j9WoYXdLcntNT7
+JiQN3jvNVzsO33iaOPLzsoB4WD/6cxJrKLPnj8VK8mmpf0Z/6qeDODhaZT0KMIuN
+nN+RklgH/PbOmdeLXrBeNx5VBevJnCe16d9BtTZgtQnQH/mcBLAJjdufhK6sXSuI
+XNG7EYMd5YIxb+XnCg+nobRbqe1H0IEDwDwOcgN9yuwqAhAODNwZ5hxI6HOImr2/
+33R6119+cNMwuaqn4UYfHY18h5Fsdpgi55LWveuT1ptCJNs3aMOYZ8RfzQGZ24FK
+4A0LmTPnZLy50zmgLJcRQBKv0T0SoDxYlM9k7XXlZtn6hNBa4Lpt2gbkh5OK+xTs
+aecNb56xrLJnMwb+uqq2AY9IIIeziSPuWHkods9ljNLoaK6ruWOJ7vFAHHNYqt2b
+17EwNeSsPkAL4xOcBTM=
+=o7ee
+-----END PGP SIGNATURE-----
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 ;
+ 		}
+ 	}