[gentoo-commits] repo/gentoo:master commit in: media-gfx/argyllcms/files/, media-gfx/argyllcms/

[Bernard Cafarelli]

commit:     22ba876744450eee0689e17155dc8de90a91de60
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 12:06:50 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 12:22:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ba8767

media-gfx/argyllcms: drop old ~arch versions

Package-Manager: portage-2.2.22

 media-gfx/argyllcms/Manifest                       |  3 -
 media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild      | 85 --------------------
 media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild      | 93 ----------------------
 media-gfx/argyllcms/argyllcms-1.5.1.ebuild         | 92 ---------------------
 media-gfx/argyllcms/argyllcms-1.6.2.ebuild         | 91 ---------------------
 media-gfx/argyllcms/argyllcms-1.6.3-r1.ebuild      | 92 ---------------------
 .../files/argyllcms-1.4.0-CVE-2012-4405.patch      | 18 -----
 .../argyllcms/files/argyllcms-1.4.0-jpeg.patch     | 21 -----
 .../argyllcms/files/argyllcms-1.6.3-usb-db.patch   | 12 ---
 9 files changed, 507 deletions(-)

diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 9d94081..27846fc 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,6 +1,3 @@
-DIST Argyll_V1.4.0_src.zip 15242860 SHA256 d33134704d2964db69f9e61eb73188632fe2058cdf57aeaa56e64a264e02b1a8 SHA512 edb9ff1b0a965e79a26c0138afe16472fd18236b55b7262135d70bfc7405001a55d2ada4251111fcbaa0b6f73a3fa2faa2cfe07b3413c8a5ecea04c87e5646ae WHIRLPOOL 7b777f43c9a34966d3fee8ab67010d7253da4054e107749ffe67c4f834c3977a2889c3d0d5035b7e1d186d669c4ead69e2a912682631598630f12056d45acd6b
-DIST Argyll_V1.5.1_src.zip 9693168 SHA256 7c65055e577da5a3344b3949e52c3e66fe6339b8801bf4e0cda687e78f7808a7 SHA512 c21cd676edd6415a866fb2a7b122eac18e7596f265a0f2dc8d1f7ca761f64be9fd64ead1430e36eff8767672e73bd93de61398ff588e94a0e121d848afd8bb96 WHIRLPOOL d827297475755e75abd73d60a725cb3e29eb2afa341295d5e47ee9cbae8803863bf84d2fc11f56f9f98862c126bd3f4fa37060a629c0b24ac3081bd3b2d2c5b6
-DIST Argyll_V1.6.2_src.zip 10291838 SHA256 c21591d5615a584df438ecbfe7858fde571f6066e56da436c541d08ca899ac9f SHA512 98484eb7985482c132532c2aedb24afeb20576a6417c89718d58e5e35e36bd4feb270aa7ea8c86b31dc218c82d99de3500c47346c75159a79de9df57d2019fcd WHIRLPOOL fbc4b766bd45d47b33f56b8662c7681c251aabeeee0c978ff71f3079b83f9eeb8052725b77446035ce91589f11553283f84b43f24602e3b4127bc1b5f37672d3
 DIST Argyll_V1.6.3_src.zip 10338488 SHA256 188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84 SHA512 7c350c73492d7e2e27354814cfcb172bf1e4bb6ee8f3f71f2003a7d44ed4be9890a6c80d6a69228495645be11a327c0f7c2ab68d6f6621dd938744a1cd7ebe95 WHIRLPOOL a854ebcca1950f3e654ae85fff3189bae17c511c26e2f3dd8104d9b55ddb83022659276fae201899f51a2a27b00c1cf98f157261e50d0fd48f1a8044923e11c6
 DIST Argyll_V1.7.0_src.zip 13935712 SHA256 dac51cf5d8f6d04bb02f2f5b119fa0e8b773a010e6377116768b082ef018f663 SHA512 644683c8a73d36583d607b5d51c543dca8f1e3fb3db8138a164f9ed7f994df7739ee7d810b7136a7cf0eba7b54fe53b35ffbdd4e6915ec20b271325119ce369c WHIRLPOOL e08c6e311856716ee6b49e37c583d8d4275629fb746f018e0d7c768d4c907644dc60545ff2c709217988c668b198dfc95396af3fdf0ccd40d320514854b1c087
 DIST Argyll_V1.8.0_src.zip 13931190 SHA256 02440060b224bf8e42bd7eabe0c857e1311546839391d94bb250dda60e4db13b SHA512 959a581aaf3514a130cae3aa133c385591b53d11e5ee6bb11349ee8614f392baa5f5799ede4d10dda8a3c182fc69a186a5a1738070649acdfb9987aa52f83976 WHIRLPOOL 6b43e3ecff4cde12fa1d6fe51f0a9612019ac1f452eed66e32ce8a834f127ee84119fdbb436cf1266e4e586f534acbf74df1102215d311d69a7f4f723d77a286

diff --git a/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild
deleted file mode 100644
index 5183759..0000000
--- a/media-gfx/argyllcms/argyllcms-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base udev
-
-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}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.0-jpeg.patch"
-	"${FILESDIR}/${PN}-1.4.0-CVE-2012-4405.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 -ljpeg ;" >> 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}
-	done
-	cd .. || die
-
-	if use doc; then
-		dohtml doc/*
-	fi
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-
-	insinto /usr/share/${PN}/ref
-	doins   ref/*
-
-	udev_dorules libusb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	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.4.0-r2.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
deleted file mode 100644
index 775327f..0000000
--- a/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base flag-o-matic multiprocessing toolchain-funcs udev
-
-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
-	sys-libs/zlib
-	virtual/jpeg
-	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}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.0-jpeg.patch"
-	"${FILESDIR}/${PN}-1.4.0-CVE-2012-4405.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 -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	use doc && dohtml doc/*
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules libusb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	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"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}

diff --git a/media-gfx/argyllcms/argyllcms-1.5.1.ebuild b/media-gfx/argyllcms/argyllcms-1.5.1.ebuild
deleted file mode 100644
index be3082e..0000000
--- a/media-gfx/argyllcms/argyllcms-1.5.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base flag-o-matic multiprocessing toolchain-funcs udev
-
-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
-	sys-libs/zlib
-	virtual/jpeg
-	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}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.0-CVE-2012-4405.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 -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	use doc && dohtml -r doc/*
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	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"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}

diff --git a/media-gfx/argyllcms/argyllcms-1.6.2.ebuild b/media-gfx/argyllcms/argyllcms-1.6.2.ebuild
deleted file mode 100644
index 64f0754..0000000
--- a/media-gfx/argyllcms/argyllcms-1.6.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base flag-o-matic multiprocessing toolchain-funcs udev
-
-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
-	sys-libs/zlib
-	virtual/jpeg
-	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}"
-
-PATCHES=(
-	)
-
-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 -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	use doc && dohtml doc/*
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	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"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}

diff --git a/media-gfx/argyllcms/argyllcms-1.6.3-r1.ebuild b/media-gfx/argyllcms/argyllcms-1.6.3-r1.ebuild
deleted file mode 100644
index f02ccc1..0000000
--- a/media-gfx/argyllcms/argyllcms-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit base flag-o-matic multiprocessing toolchain-funcs udev
-
-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 ~hppa ~x86"
-IUSE="doc"
-
-RDEPEND="
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	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}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-usb-db.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 -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	use doc && dohtml doc/*
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	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"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}

diff --git a/media-gfx/argyllcms/files/argyllcms-1.4.0-CVE-2012-4405.patch b/media-gfx/argyllcms/files/argyllcms-1.4.0-CVE-2012-4405.patch
deleted file mode 100644
index 8808fe1..0000000
--- a/media-gfx/argyllcms/files/argyllcms-1.4.0-CVE-2012-4405.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-https://bugzilla.redhat.com/show_bug.cgi?id=854227
-https://bugzilla.redhat.com/attachment.cgi?id=609986
-
---- icc/icc.c	2012-04-19 09:36:49.000000000 +0200
-+++ icc/icc.c.oden	2012-09-12 12:35:49.252519528 +0200
-@@ -6065,6 +6065,11 @@ static int icmLut_read(
- 	p->clutPoints = read_UInt8Number(bp+10);
- 
- 	/* Sanity check */
-+        if (p->inputChan < 1) {
-+		sprintf(icp->err,"icmLut_read: No input channels!");
-+		return icp->errc = 1;
-+	}
-+
- 	if (p->inputChan > MAX_CHAN) {
- 		sprintf(icp->err,"icmLut_read: Can't handle > %d input channels\n",MAX_CHAN);
- 		return icp->errc = 1;

diff --git a/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch b/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch
deleted file mode 100644
index d523481..0000000
--- a/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 ;
- 		}
- 	}

diff --git a/media-gfx/argyllcms/files/argyllcms-1.6.3-usb-db.patch b/media-gfx/argyllcms/files/argyllcms-1.6.3-usb-db.patch
deleted file mode 100644
index 04f3367..0000000
--- a/media-gfx/argyllcms/files/argyllcms-1.6.3-usb-db.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: trunk/usb/55-Argyll.rules
-===================================================================
---- trunk.orig/usb/55-Argyll.rules	2014-09-25 11:10:12.000000000 +0200
-+++ trunk/usb/55-Argyll.rules	2014-09-26 14:08:21.067295380 +0200
-@@ -85,6 +85,6 @@
- ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev"
- 
- # Set ID_VENDOR and ID_MODEL acording to VID and PID
--TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p"
-+IMPORT{builtin}="hwdb --subsystem=usb"
- 
- LABEL="argyll_rules_end"