media-gfx/argyllcms: Be verbose in build, #445522; Respect CFLAGS, CC, AR, RANLIB

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

3 files changed, 108 insertions, 5 deletions

diff --git a/media-gfx/argyllcms/ChangeLog b/media-gfx/argyllcms/ChangeLog
index 79872aa1e82a..64944ed04762 100644
--- a/media-gfx/argyllcms/ChangeLog
+++ b/media-gfx/argyllcms/ChangeLog
@@ -1,6 +1,11 @@
 # 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.31 2012/12/14 08:31:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.32 2012/12/14 08:54:19 jlec Exp $
+
+*argyllcms-1.4.0-r2 (14 Dec 2012)
+
+  14 Dec 2012; Justin Lecher <jlec@gentoo.org> +argyllcms-1.4.0-r2.ebuild:
+  Be verbose in build, #445522; Respect CFLAGS, CC, AR, RANLIB
 
   14 Dec 2012; Justin Lecher <jlec@gentoo.org> -argyllcms-1.4.0.ebuild,
   metadata.xml:
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index d4330aa8520a..f6dd1e1ac9a0 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -5,12 +5,13 @@ AUX argyllcms-1.4.0-CVE-2012-4405.patch 583 SHA256 1a161b912a192e6a0a2d16d74a173
 AUX argyllcms-1.4.0-jpeg.patch 1111 SHA256 15403ab2480d43f8d2247d0ba6a535e1761c15e286d5eb144470f694b70194e3 SHA512 6f8f55f02f37118e3cec928c8b3d7bdef2b2049a05b217492b9606121f8596a4810f59d7c24ebd97215ad0bc06ab3ada968630772727bc1c02db2a00c3d8aed0 WHIRLPOOL 5a20a27e465a77c2e10303ace389f98bad519ca436c1b661cc96f9ad583547f29c63cb515c2fa7deab7eb056fdf773fbe39c2ba924bdeb02bb71764c6c40e5e5
 DIST Argyll_V1.4.0_src.zip 15242860 SHA256 d33134704d2964db69f9e61eb73188632fe2058cdf57aeaa56e64a264e02b1a8 SHA512 edb9ff1b0a965e79a26c0138afe16472fd18236b55b7262135d70bfc7405001a55d2ada4251111fcbaa0b6f73a3fa2faa2cfe07b3413c8a5ecea04c87e5646ae WHIRLPOOL 7b777f43c9a34966d3fee8ab67010d7253da4054e107749ffe67c4f834c3977a2889c3d0d5035b7e1d186d669c4ead69e2a912682631598630f12056d45acd6b
 EBUILD argyllcms-1.4.0-r1.ebuild 2153 SHA256 c7262ca199a31c372a42a0a9168629136e1de714ef2eb2d98dd0a72ffee8a306 SHA512 e0cc0d5ca2a3ecec6e9622d6dd49607323f1e1ad35d4687b7f75c6bd502976f98dcd9825c7654edf0e9314d5b7f0ab12dca2e11367691624924e7331f5dae1f1 WHIRLPOOL cda8bdc335e3c2fe1cb49e7b6a6e8984328a9c4e848492d5cf147efaba47df432410d8657fbb662d2e2ef7d92496cf514a35ad38ecf8aa2f645a4d8742b2616c
-MISC ChangeLog 5844 SHA256 95f6080c15a056ba037bdf5c68d4659418884900d91c09edfdd77732e4a67fc1 SHA512 a374dfe80d8d845037c124c9a17bcd1a310de21e29be6c60c6298046bd31b5466d9af6e19a1559bcd749c301665696fce5b8923ed27f387c70da08151afd9e58 WHIRLPOOL bdce6f1e29aa99a92676d3ec45a635cd93b98152d1da3bdcda8c6b70918b48b4dc7c7c163c21b513fc2a434afb7fb1e242042d8f699b212f58b244177ee6473c
+EBUILD argyllcms-1.4.0-r2.ebuild 2325 SHA256 0fc258b593eba127c49fb884aff2d2440052f2b9ca05a4871462072e04f7c2aa SHA512 f617fa556afd7c36a3f079a3792080524684abbd62f58625e58dafe27c569193766bf1b3b3b209fc0d444d349841e82de3dead015fa09c536705dff9c09760d2 WHIRLPOOL 53dca49c372601e5bcd88b92a0190769efafe5e4264a020189a4f6aaf47439355ffc0b0b9bd5af68b1858bfdbc9ed7dd4851ef70f9c9750f9a97395dc1ea97a8
+MISC ChangeLog 6018 SHA256 49ac4830d8f8006640059e391293a61f25c98a1eecdbd209af83176a99026ad8 SHA512 93769d14bc0124a01e28c21c879deb29e5e4a54e76baa1adc7ad3e3bce33a4e2f19c2e00ec30cf8a0d55bc28128d74b84bd4931bc029ed85b5e57a8f8356b555 WHIRLPOOL 4412af662705122e70e073d6ecc98ca4cc3cf80096320740cdcc705a656e27783f1ba4c656a9108294571b902c87967d78e096e4b32150aaad7ca2338b4c321f
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDK494ACgkQgAnW8HDreRZcBwCgietciuC6pBhLbaUSOnQskoOl
-I9QAoIxfI2CRvdOyNq7yK9HLmYr/juo7
-=S4JD
+iEYEAREIAAYFAlDK6TwACgkQgAnW8HDreRYSZwCeOO03FZqTo2mDI+VUQQUaGp9V
+/+cAoMVvm2FNf1ri7r2JUZVSKP3nNUPi
+=rEoi
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..1df7d16797a8
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-1.4.0-r2.ebuild
@@ -0,0 +1,97 @@
+# 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.4.0-r2.ebuild,v 1.1 2012/12/14 08:54:19 jlec Exp $
+
+EAPI=5
+
+inherit base flag-o-matic 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
+	virtual/pkgconfig"
+
+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
+
+	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 ${jobnumber} || 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
+}