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

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)

3 files changed, 113 insertions, 2 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/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"