Rename binaries to avoid file collisions (bug 350016)

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

3 files changed, 106 insertions, 16 deletions

diff --git a/media-gfx/argyllcms/ChangeLog b/media-gfx/argyllcms/ChangeLog
index e5749646c741..540b99666175 100644
--- a/media-gfx/argyllcms/ChangeLog
+++ b/media-gfx/argyllcms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/argyllcms
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.7 2010/11/08 21:26:21 dilfridge Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.8 2011/02/09 23:40:26 dilfridge Exp $
+
+*argyllcms-1.3.2-r1 (09 Feb 2011)
+
+  09 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +argyllcms-1.3.2-r1.ebuild:
+  Rename binaries to avoid file collisions (bug 350016)
 
   08 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   argyllcms-1.3.2.ebuild:
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 33471b0fe97b..2a50968f5e07 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -4,23 +4,24 @@ Hash: SHA1
 DIST Argyll_V1.3.0_src.zip 12567905 RMD160 24b5a18b06e37047949fd4c241d76419a6269c38 SHA1 ae0467e0f20bcefe45141fc19039e3a0b7172887 SHA256 88d167eacacae5e81221c41a759c00fad9d5c0181e77dfdc9ac8aeee792810db
 DIST Argyll_V1.3.2_src.zip 12634493 RMD160 a447041d7fb05078c627aeeeca6837f908991c76 SHA1 51af2f880fa209dbc658cedf19c11abadbdc43e6 SHA256 dc6f0d0df56d1d1f40cfb204257f24da7958d17dbd1c59702b34e3a053e2a679
 EBUILD argyllcms-1.3.0.ebuild 1939 RMD160 9835f38c4f58c0eafe76e55591d85ca89a497420 SHA1 186a08821991baf6cdd76cc663449af86fba08ba SHA256 b82a5530831e9e45e96f15986d79c3667416e55a1280ae1f6fe1838cbc771ebc
+EBUILD argyllcms-1.3.2-r1.ebuild 2207 RMD160 54d77eea941f90ea4e5aa04b3ae36905edabafcd SHA1 324c7349cdca1e02402eb6264e1979e1320b276d SHA256 75fdb46895a4da21283fae53dd723a983c88ab4cd2555aea5e43c889e6402904
 EBUILD argyllcms-1.3.2.ebuild 1939 RMD160 dd10c5c7441c1f63cb7d059674c994075780fc48 SHA1 f956ccf9eb24e424f2ee4260160c6aa0fc036237 SHA256 5226e98499ce8a2137ecbcdf62fdc9c4308636583f99b324beeb4596a1e96b68
-MISC ChangeLog 2334 RMD160 8032b13a1594f95cd1f5f541a752c2f3f7163e28 SHA1 549acaa4e57e8ebcdfd9f19664e90212e77ade51 SHA256 2ad24a6e31acde0d9a61f1c950df2da9947bce202fbada58dcd288641a203675
+MISC ChangeLog 2513 RMD160 6deed7fdd446c7a2f5cbb745f74e320fced3413a SHA1 c3c08b121013f33d2beb97587d15f2881edf9a3d SHA256 06803a855398a18c329ce1289f7a7c7e93d19896836dad7e0165648af18bf19d
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM2GqjAAoJENwGBM22xffeY1MP/0pknHn+4V9R+Vq+OhNLEXTQ
-uV1fkhPruqkvXshPr5FLV9y5S6HieKmJs9YJ1fyNsaLpBtdzmJ5/D6KyV2FoiC/L
-1k4QjkSOKy2OONtH5lmJ/7PBo0P61OSn5haHQ040rN9FE3BCL+UCeReKxv9P8611
-m645dJv/LXw3I3UaR3LzFO6/JfsxjOWrpYpDPAhI3FTK3Ijmq4pOoY7u/UcxzZuL
-+H+bOOYlAAShIAOTYlSQw52J6xtIAVMAOJ0bugPK6fotTomI8dySV8MQMvAyQaaX
-07EqPCf02uaCIth04jqq8H0yvALX9WuWavJpA3A9mPlA3QNRdgsCrKU6mIqrQXyW
-hngybjKe9rTw3SNSsNDU7eMkDDmMS1lazSyN4w1Rwvxw/Whk02+zC3+3jIN2+zXy
-pgSSLjJ9WuAYj6qFYH9bRHuZhPH+h8COyyDiYakBxhlW2MEdAmxusBuK6T6qn7i4
-3Z836n5qlgzt/LwaNEMJX2UQCUJlODHOuh9WCYsiswNNOmG6waGIKCVTsOPdINhT
-SFERzKrYDh03U7LlSR11OluK2X5FqnPNDVt9+WEVVl/UdpZU018Q+eNbxZDZgxV9
-ZSDhRa7xWKGmNLO9N7C5RZAOtDOmxpEvAmWTtWmE7fd+jsQuBclIwG/EBwntT82Q
-v6F/p/8tH49Q/9mYTSaa
-=XOaC
+iQIcBAEBAgAGBQJNUyWuAAoJENwGBM22xffe8WIP/j3+Xelt8kG4SuqktUq11PxX
++C14aE2LmCuSWZ5wZEyaBT67TNbMs7cyikGEet5eIcKqXz9JYswDnQm5uIXShJxD
+eIzjyZa6Lm7gApqlzCIWq+4JI174ngPKV9EgR2wiD+DZUByfhJ/wzIRWIHfywLJR
+rjGrjyPLZUo2vIfSxn1cF4dofPuzUWsFBhIKhU+Nfw/zwEDmRv5BS/Y5KbL3gYWy
+U9yO99ylytakDMsfRv41pnvh3IcR5D8lKDrHYCglLp/+i+yz0lAINxHawXR43qLy
+3FelG3YBybv1NSu9KcI1Qv2+cHqruVLG4DpvHwS9Gr5Q2BOswt6Td/t9qBgZZqsK
+pJnGByVe92HXZBsZdsLTXGcbdZsA6HC8/E9j6g+c6oVXYTnZj9/sKATVs4+HsKAL
+6Zu/rBbw3sX2Ake+nRfHy90G+mdoXetKYbF31pGWCyW91mRYhFBMhGR581wyLHXS
+91h7mqlTVTncA7QgSBheYi9Ehb7rkGaWxiVfbjOGsHiIhgBs8WUNZv6TlK+2VmBH
+eQpH7cd20eaiCqHb4AUon1XB4I8Cv9xpciHboKV/rGt1zy2DKSpaKaLh1zv7Vv+t
+RLhBlk7PXpEjTDrqNDtAt6618b0fkyo5nTlR2BEkGWgOpVjdHwjk9o8uvO+6+3CJ
+crnDu/tAG2XIx9VyoY6V
+=a2Px
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/argyllcms/argyllcms-1.3.2-r1.ebuild b/media-gfx/argyllcms/argyllcms-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..c2acb183ac29
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-1.3.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.3.2-r1.ebuild,v 1.1 2011/02/09 23:40:26 dilfridge Exp $
+
+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_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 spyder2_setup.exe (ColorVision CD)"
+	elog "and store it as /usr/bin/spyd2PLD.bin"
+	elog
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	elog
+}