Fix obsolete /lib/udev/usb-db use, patch from Debian, fixes bug #544728. Also add some slot operator deps

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

4 files changed, 132 insertions, 7 deletions

diff --git a/media-gfx/argyllcms/ChangeLog b/media-gfx/argyllcms/ChangeLog
index 11be177c166b..fdd1338995aa 100644
--- a/media-gfx/argyllcms/ChangeLog
+++ b/media-gfx/argyllcms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/argyllcms
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.38 2014/08/14 12:40:00 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.39 2015/03/30 17:24:54 voyageur Exp $
+
+*argyllcms-1.6.3-r1 (30 Mar 2015)
+
+  30 Mar 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  +argyllcms-1.6.3-r1.ebuild, +files/argyllcms-1.6.3-usb-db.patch:
+  Fix obsolete /lib/udev/usb-db use, patch from Debian, fixes bug #544728. Also
+  add some slot operator deps
 
   14 Aug 2014; Jeroen Roovers <jer@gentoo.org> argyllcms-1.6.3.ebuild:
   Stable for HPPA (bug #517804).
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 7c999eecafe8..66549f9bbf9c 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX argyllcms-1.4.0-CVE-2012-4405.patch 583 SHA256 1a161b912a192e6a0a2d16d74a1734b4b61c303b641a3b5c164dab60166be0be SHA512 30c121ce72608d2bf1dedc9fa1e7d13c7c46b756cdc348131f1199873082c37d4c48a3d927596bb6e7c788fe4afbf331d442a56208cf5acf16079a4d15bc8cb3 WHIRLPOOL e975d9e9e3af36478b19fff37bc862d91aeb904626854d2dfec4e7ea1cdad8e143884128058fa599779638ae4505085f4ff05a20bce0ed958652af8e13244147
 AUX argyllcms-1.4.0-jpeg.patch 1111 SHA256 15403ab2480d43f8d2247d0ba6a535e1761c15e286d5eb144470f694b70194e3 SHA512 6f8f55f02f37118e3cec928c8b3d7bdef2b2049a05b217492b9606121f8596a4810f59d7c24ebd97215ad0bc06ab3ada968630772727bc1c02db2a00c3d8aed0 WHIRLPOOL 5a20a27e465a77c2e10303ace389f98bad519ca436c1b661cc96f9ad583547f29c63cb515c2fa7deab7eb056fdf773fbe39c2ba924bdeb02bb71764c6c40e5e5
+AUX argyllcms-1.6.3-usb-db.patch 524 SHA256 4bf131aa05c07c98cfc55450cc3cf7918f5ee7528742b03dfd47d9cc892e9a3e SHA512 5bf35349460efe1f4b3e90485607a319c91c98e2cf9563845a52ddc6621cc3a92c3c299039ac720fa73ef2c19e594ef520499700253e2aae9fd510e95b318385 WHIRLPOOL c99548efff374383ce4a5d0a6b8f353e293743fc35b719f8c718003ba8ea4aed5d85040bf498ae0ef0e32d0aa272db640089cb659457e5a0732effc94af506b5
 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
@@ -11,13 +12,26 @@ EBUILD argyllcms-1.4.0-r1.ebuild 2123 SHA256 1cb7823ca2a5d099d6efd63913047bccdf1
 EBUILD argyllcms-1.4.0-r2.ebuild 2199 SHA256 3641eca5bd7533905b1c86a9144f7588252e34c62d7bb81fa6bdd00c8b2a9b5d SHA512 5bbe1a57deb0060717251a1e4131010f01e4f47095d187ef7c3a3537ce646dca89c5b40f964cdd2dca37b52a90ed261618889b56b9d7c32c1fb4c41bfd5ed668 WHIRLPOOL 25ed047a01bdc49c1b1912db407ca0ef3df6e7152391ac116291fdb34baceea2eef28c858fb7c71b38cabd711c53c638a206a3abd4e9e70685aabbafcad613c5
 EBUILD argyllcms-1.5.1.ebuild 2158 SHA256 dc2af219b521ea359b2930ad34a72770714844027735d9510693d3256faa5526 SHA512 fabb5dae71818194d0a30177d1968cfaa84078da19781df1cb9abfed402e965e05468220e108f7b06586207be1f77c41aa9b0cc42975d600b0288f65851bf410 WHIRLPOOL 983bf339fe5227d3d211bfb9102b8052171240f4fbb53d68032f83f4b806db2ed42686d7b1753705cbf7111ccf8c043e281f3b849d87ec9c17e76cfbacda39f6
 EBUILD argyllcms-1.6.2.ebuild 2108 SHA256 65961e58ccaeb576cbf8abaddb4c0a76cbae3a498904e29e261a2eb19b509713 SHA512 602e802dddd8d78e372e5bc0063712ff2aa52cb1ed5e5c7163b19d1a7a3282a83d2087baaa53f0ace8bf6dd7c9e168eb60b21d133e1fe985a88e2be50ed26f92 WHIRLPOOL 42a40a46b8643d82bb76b5d865cc252d08f2dfb65be86aecc5a12b46b1ddbb49ef907af9718d5ed539151e891ac3e688e3c99137a825a9b418bf2f34d878c57c
+EBUILD argyllcms-1.6.3-r1.ebuild 2154 SHA256 aa186b9f895ec4fbcd1eb4377d6324956427ad8ca0217753c1c91f8c6d123a3e SHA512 e35b66d7254c5fa95c20e663653db676289f5d2450e26842fae1dc54cfd43035a44169dbd543787f8e92aee731c726317c4f96ec2bce2baef3d3ace7c4153a5d WHIRLPOOL d23ae35a9484d5c71016f2120ae6f649861dcde00f949c79af7c68e3a15274ec9e072b186c501ba1c40851857fa7018fc08d37efab44c1bc8ae5e6377ebdef4a
 EBUILD argyllcms-1.6.3.ebuild 2108 SHA256 943abeb54ce330118f4b38d5aafd4c7fece218917d0d77add692f791954771fd SHA512 37acca5d3a6bfa26484807be45c23a346d6c2411ecd448cff9f111ed20b940e480c8deada76d1692f69769e934b204d5e3cf49935b25936c289c8f6a7c40e35e WHIRLPOOL 8416dae57e2c08407b9c4b2e28e77c5cb4dfa633e03c9510e41f8e1d77c9b597de82ceb6f90f71e1288dc80bcfa630f14ce48b282dc6044300d04786085e8cc1
-MISC ChangeLog 6953 SHA256 a46635d22aff8a9a6a0c66bc7409877b00fe0160edb89b87697cd4176ca32554 SHA512 89ae9ef9d84e8e5374f4b9b9635a2538dd332843f72777baf55234f5b95098e004846d61248c27516bc59975a65cdf11b6ee3f88a69135c2dafdacfe8a51aa9a WHIRLPOOL 91eb02931b773e2c83d92e0bdbbc7441837665114564773d5362ff68820000e7ff3ff6a18b0608a41e4186048cbccd7341cdc9228eaf7b0a807b0269c7a6bf4a
+MISC ChangeLog 7226 SHA256 ddfaeff75da58a904ea02b12cdeadd5fe965dbc3bdea6bb7eb270606d76da3dc SHA512 905d8fd6d2be8260f30a82fa2378d53e4e48d84d9e6c8ef25b094c70c3fbf455160ecbc9ddf4ef15e4e0da0f72dd99d1c6b5930283dfbbb3622b88355e05a6b1 WHIRLPOOL 2fc1ea76efa164b3e0eb390e41e7480ef9ea49c5a9dbef602995139dcb208d99aeb416a4a668ae5dd9eab9bc48f87aaddd0a4389119e966ab4dbc409170406ed
 MISC metadata.xml 238 SHA256 325bc955f2a5e5f2ed4b013fb6ec3ab8308fa98e84ce1c503f6a78bf42f3234e SHA512 14453949e63d402e99c24dfede43ebcac8bf3fc5c731114141bed639d0e0b0e71ffce033ab268595c155dee0b58e04e1bbe4023554f7fd54031c2f90f607cde4 WHIRLPOOL c31742cff7c49498de00d096d5dbeb0177bccbdea3f5713baab174d9e1ec782b781f8eb7c87e0e52aa4968c2f2601d1a914dfb6e5e2e59b9a1ca1615a0a9d172
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPsriEACgkQVWmRsqeSphPstwCfQKX0NBj1MQGOor4gIjYV5MNu
-eWsAn1WKjns4LPz40/3yWkExbptiaQU0
-=YyyA
+iQJ8BAEBCABmBQJVGYbqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/W7AQAJzgaMIqGcEC8nwFgkr5oJG1
+Q+K/7hCHItm4JRxFvP2yyZbsYkZ+qczsu0rF9dgOrF6rklI5jqhGLQTwYi9harZq
+XNVUByg0J/V8tbcgiA2XNcx5QpSjms+ZA/j2+qAHMBbU4mZxBbcIy8ycNlZv2lsf
+9yQ4B4Ar2uM9cLwDZpNKU7YGJlIRdvX/Uwk8aBpS2L0LRWXcDBxHs/IBsiHzAfpM
+e2PFNqkfsK6hkdXr/GcrNVCil6baUkkt3Rg1NL+jK8Kn7TzvBT+0gEjwnpNGZSr8
+ViyQNRK+ZG2akuSialD0YQgJcpg5OXB6BDaon3CA2wYfmMzT4EfCgrMr297i1GB6
++dEK/N0eG/aPNErrqxA8UDCa0bReT4mqeBKY8PWC4X12hQbWWtAynTdTaPOYAy9w
+Jle0NMUEkv05qzJbibK7bOIe3yV7ktNYwskEt2+gq5bJKnjIKKUNXjNrDv3swANw
+1NL2zwWC7V7hRgL3ZW7gMgVmvVuir/Iv2EE8ntpHp972q4WGrY66LsFs3rag74ph
+e4/+u7/vRh8SAgs1AQl/6uYiX+PrnV5LUyHFBXVTCx2K6JgaMvfa17HnxSCdpK4E
+OAwZOhH5CaHxtoAzKiN5im3YxM0x7FwHT7t1/uRPDsKc2M5DgEkZ0IIqc4nw9DvD
+ePU1C8JwjhATz2dHX4Hd
+=JmmG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/argyllcms/argyllcms-1.6.3-r1.ebuild b/media-gfx/argyllcms/argyllcms-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..00404cf61565
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-1.6.3-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.6.3-r1.ebuild,v 1.1 2015/03/30 17:24:54 voyageur Exp $
+
+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.6.3-usb-db.patch b/media-gfx/argyllcms/files/argyllcms-1.6.3-usb-db.patch
new file mode 100644
index 000000000000..04f3367f6332
--- /dev/null
+++ b/media-gfx/argyllcms/files/argyllcms-1.6.3-usb-db.patch
@@ -0,0 +1,12 @@
+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"