Fix location for installing udev rules wrt bug #438114

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

3 files changed, 14 insertions, 27 deletions

diff --git a/media-gfx/argyllcms/ChangeLog b/media-gfx/argyllcms/ChangeLog
index 330775f485af..f0630ac6798e 100644
--- a/media-gfx/argyllcms/ChangeLog
+++ b/media-gfx/argyllcms/ChangeLog
@@ -1,6 +1,10 @@
 # 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.24 2012/09/11 10:53:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/ChangeLog,v 1.25 2012/10/13 11:00:14 pinkbyte Exp $
+
+  13 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> argyllcms-1.4.0.ebuild:
+  Fix location for installing udev rules wrt bug #438114. Thanks to poncho for
+  discovering this issue and providing fix for it
 
   11 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org> metadata.xml:
   Drop maintainership
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index ecbaa6f93827..f3fd34d19eae 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,25 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX argyllcms-1.4.0-jpeg.patch 1111 SHA256 15403ab2480d43f8d2247d0ba6a535e1761c15e286d5eb144470f694b70194e3 SHA512 6f8f55f02f37118e3cec928c8b3d7bdef2b2049a05b217492b9606121f8596a4810f59d7c24ebd97215ad0bc06ab3ada968630772727bc1c02db2a00c3d8aed0 WHIRLPOOL 5a20a27e465a77c2e10303ace389f98bad519ca436c1b661cc96f9ad583547f29c63cb515c2fa7deab7eb056fdf773fbe39c2ba924bdeb02bb71764c6c40e5e5
 DIST Argyll_V1.4.0_src.zip 15242860 SHA256 d33134704d2964db69f9e61eb73188632fe2058cdf57aeaa56e64a264e02b1a8
-EBUILD argyllcms-1.4.0.ebuild 2251 SHA256 618bdb9ab582ccb60d0034495d019cb31405bca6ead3b315644d013e64b87dd9 SHA512 8ee65e8ada05af98a3cf82b1054b98391ef7847872aa6a1f011e64b491669bf840ca3c849339dc43fe2ecf0d55a9e6da7e4564e8773de07dd5ec578881dca38c WHIRLPOOL 5a3441c13f33ec53ea41e44e2b41af2a788de6519a7b2152ae505dcf53f4015adc27a474402667bb5454069475633c3c20bf952cfab697dec11a38068f9bbafb
-MISC ChangeLog 4814 SHA256 e62618d27f16f048250d2dad84b89e72cbcbc090bff0fe1fb89a282813b2c76c SHA512 efdeab169d4e403f3dced88e42d52b367ec3afb278a35e605db267b495b149d4d261af2acc8fffa5d191de6de769095973d7415acf433f76e0a7462799370d2f WHIRLPOOL 8a2fff6b08d25f4b6b83b344587cb19c141b0d3041b4310ea2056345c3bad917fbcd169f201ec5b8f88517bf20dcb29149ac09d8b73d4d0bb14f329456215fc2
+EBUILD argyllcms-1.4.0.ebuild 2401 SHA256 8815e2c62a4850acc2d0edf02abba0da4c580be04e45541af16e3a66a8eae993 SHA512 fc6dcb86f68cb170d90525807f2c7bf601887b7cb34c057e5fa8d79802a4c7f8bd8d2cecbf4f05a94bddfe0a35bc2de275a206f995b39ea7fca6e1e6b8eaf663 WHIRLPOOL 35b6f9acfc77b383eb5c0cc5641da49f8bb06cc884d6f5ffb6239e843be2a72883ffb3279f42b6ffafd34a047e2489e846b0ca3a8d8a6ceacb5a216f3ff04e73
+MISC ChangeLog 5017 SHA256 2e2ba455b7cfdbe002d9f630a57a95a95e35d15d861acce6abff8068a761e110 SHA512 b2394561d658e6778a7f9688e930930cf043cac445074e9f1056ec91c421092750ff123c70cc67c17c1ab50d39be045473ea56d2fceb98b09a4ce73a4062ed8f WHIRLPOOL 0639b45009ffc326438fba87aa35ead5ef7e939882f167f7b7c714681b9eacba854a7109f971a78217041bf6d1630a9904170090e33f99ec2b3e4a02f9c758f6
 MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQTxifAAoJEEb+UGWnxTyHKb4QAJB4mBH5r2mMtu3XzPpvN4t2
-ndsXHefpvndPODOzjCMLmz6MuckF1A68k8YR9g/Fn/39wjZxa0M05JAph6Mdnt6M
-HZjLQ0lfPRybN6qU0fRonxQ0X+ZC6St93dicv3xkRUg+KCj1O1o9MZT/SIOaEQLE
-5/6rnZOBVxzQA7ux4k9sYiJo/YowAW+HWoNBHR5tFdsHlF/YVD5pxepAt0tKTmNS
-xPKDkyv72FRmE6TANAWz2o6R6+HuIlGsxvB6HZ3VbTd+A83JesW1dP9DHeYszFIS
-sxtZNBT0FHCTtMp5nbmQg7pTK/3cN+erLM+NHb8l/IWOOpRgfLWBgvVUMb+DK4Z3
-JNGeQdSGrKhwF3qpc8pG+HI/ULZ0zqO/E1nYUG0MZctDA8FdAZij9ibJjiw/IzT6
-awlNkjqa1EsGFMyf7zkdPvLSXc4CmYDTdUKuJmkRvt8pgpiUcUn3aR1hCQZCusHm
-1PcrtZ1pi20PSVJfsMLykJB79w1QJiXeuxlxUsqtAZ2GLaEXl7d0bHOTOsrGa5+k
-bFmY61gEMgswzQkq+lEGYTIlrF9dt6Xfk0F6gsCTDR45V87Y3S6PT66IUZo+LX7l
-HK+9ePS1NzWdwKKyquyWuY/teX9BbAMYq/Q6U6zFhmeffLycCmBDqX/iaLC/Y84T
-+pz6V1jqVMgEZvBf2gK+
-=DwSz
------END PGP SIGNATURE-----
diff --git a/media-gfx/argyllcms/argyllcms-1.4.0.ebuild b/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
index 2f717c547771..4cabc25e5b2a 100644
--- a/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
+++ b/media-gfx/argyllcms/argyllcms-1.4.0.ebuild
@@ -1,10 +1,10 @@
 # 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.ebuild,v 1.3 2012/05/21 21:45:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/argyllcms/argyllcms-1.4.0.ebuild,v 1.4 2012/10/13 11:00:14 pinkbyte Exp $
 
 EAPI=4
 
-inherit base
+inherit base toolchain-funcs
 
 MY_P="Argyll_V${PV}"
 DESCRIPTION="Open source, ICC compatible color management system"
@@ -29,7 +29,8 @@ RDEPEND="media-libs/tiff
 	x11-libs/libXScrnSaver"
 DEPEND="${RDEPEND}
 	app-arch/unzip
-	dev-util/ftjam"
+	dev-util/ftjam
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -70,7 +71,9 @@ src_install() {
 	insinto /usr/share/${PN}/ref
 	doins   ref/*
 
-	insinto /etc/udev/rules.d
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	insinto "${udevdir}"/rules.d
 	doins libusb/55-Argyll.rules
 }