5 files changed, 53 insertions, 40 deletions
diff --git a/media-gfx/dispcalgui/ChangeLog b/media-gfx/dispcalgui/ChangeLog
index 23ff59508fe5..316ccceb4897 100644
--- a/media-gfx/dispcalgui/ChangeLog
+++ b/media-gfx/dispcalgui/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/dispcalgui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/ChangeLog,v 1.16 2012/09/23 09:55:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/ChangeLog,v 1.17 2012/11/02 22:15:41 hwoarang Exp $
+
+*dispcalgui-1.1.2.1 (02 Nov 2012)
+
+  02 Nov 2012; Markos Chandras <hwoarang@gentoo.org> +dispcalgui-1.1.2.1.ebuild,
+  -dispcalgui-1.0.7.7.ebuild, dispcalgui-0.9.9.1.ebuild,
+  dispcalgui-1.1.0.0.ebuild:
+  Version bump. Fix old ebuilds to not install udev rules in order to avoid
+  collisions with media-gfx/argyllcms. Thanks to Marios Andreopoulos
+  <opensource@andmarios.com>. Bug #440932. Remove old
 
 *dispcalgui-1.1.0.0 (23 Sep 2012)
 
diff --git a/media-gfx/dispcalgui/Manifest b/media-gfx/dispcalgui/Manifest
index 72adea74ba6f..986fb8a1cbdf 100644
--- a/media-gfx/dispcalgui/Manifest
+++ b/media-gfx/dispcalgui/Manifest
@@ -2,27 +2,27 @@
 Hash: SHA256
 
 DIST dispcalGUI-0.9.9.1.tar.gz 3225111 SHA256 17323641e7b54d1b3882a09b0a7ce6b4260e82d9682f38ea0374605cf7f22e5b SHA512 1cfbe2d55171bf71db61bc96e7ab2c5d8e83c7e02ae7e5d0bf6cd698802d9e8212f50996cc3ba8e304a5a2ddffb6da537f0776e02d2bbcbcbb51b6a3dac66bdd WHIRLPOOL 49794a0a36625c99be7f9d007421cb01efed89bffe7a1b9495b8016dcc564ea821c36b2bf675df9dbe225a5ed6f6ae08534e63c9c8fb66020e839ef6d3a8df9c
-DIST dispcalGUI-1.0.7.7.tar.gz 3287559 SHA256 acd94934023cb59f5411fba29d3b881ab106b014c9092329e71b6be58853b5f7 SHA512 a5b1e03f1cccb2fc177b0bc92654c48de3cd4861c1d6be789876a984e0dbee96c20aa4d743a5118afa7e3cce614cce9209eaf6bd76d2e5690e94c8a53c0cdf0d WHIRLPOOL 9b3e9552a1fc36e5f8ddf6a6b30507213bbc1ba1de7444e98330c8be22919e825ebe89df21daaf2c72a9f9b04e089efa88453a7ff1527aaec45f09bacf33014d
 DIST dispcalGUI-1.1.0.0.tar.gz 3274797 SHA256 467f52c62af56149732468cd18131483ceafd8f622b990cd0e6dd3637f170613 SHA512 977b8cf563fa6c59d51ed7400c3cffa9427d9892cc5d7db0392babb4f2f2085e63de2e86c74a816f05c32b503013eee70b1a3cace3d9ddaee8ff2ada9090989e WHIRLPOOL 132204006fbdc92d4997ae303a9dd4e2361dc03c8cf17f8342932f9a1fc208ebf2e39cfe711145d3d4b820d95b0b812823398c2f6d181a0cc481cc66ede164f9
-EBUILD dispcalgui-0.9.9.1.ebuild 2135 SHA256 04508c966aed2a16420235be0cdc5c7338ea23e4ab6de44615bb936715ab1d21 SHA512 863d60e2ac1b80220ffee0afb09bf425893ed7d16e0dde4677a0eeb4d2de6f4b21a0b9e13789eea4a32e8de5842b2b4b495b26a473b6e19b269e11b436fb699e WHIRLPOOL 1e3759abab616726967ba6bea89f6acc3610609b5edae1f8f611e219eb99e8a6cc09a992ae665dc7f226f31e743961106566e54cb328f545ff194dde9d71264b
-EBUILD dispcalgui-1.0.7.7.ebuild 2137 SHA256 b2b9258d7f4cd5796fc343142cf16c2f78fead9d899a9e09511bc3283f01c602 SHA512 be1c0032e039428e5cf0f7f49b48a04e870d80155b00ec846e95cc5e22a4120bd33dd80eb93180d9544ad849ae1b9d25b683faa3215862d4c9634285fdc59b14 WHIRLPOOL 1b59fc33cad98322f864fcb76dfc2273d9803eff5ddf13a30faa6e0d5d5f82adc595288308bf8732dbb9862ba8cea80708e3f4e73e07463509d9bcb7e47ed214
-EBUILD dispcalgui-1.1.0.0.ebuild 2428 SHA256 9037231f1658e8f98b0b5e7283953bc7fcc5ac9af0b232c66752cb6f7a4bdd06 SHA512 8dde53c1a021243855da754fb8b7a3f87803cfb4cd6155ee6b41275488466ae2e86bb009a934a2dddd686fd68b34b5a6506485937c913e54a0a25128e635f105 WHIRLPOOL 9c2bedf0ff3f5f961748afe4bddb0b93e52c88080866c55115838b1c9a888947632848ca264455be39c64f678ec281f70800bf6e15acd1104e543a575b14de90
-MISC ChangeLog 3108 SHA256 5d480fb3d31717928d8900d483d4b97a69b4bdfbbb70f6f9cd4232c4586589c7 SHA512 5ef1d921bb999c93ffcbe2457607fc0666d9f78ad12984e7be114b680549eaa32a6e42a1eb188e0ba62edbf5533be4266dadd9e8378b1eaf3fcd56be73536338 WHIRLPOOL e66fa35f12d96fec56bad17adc83fadd4ce984dc5650e810c18f0eef1711a2910570123c050962cb009f150130764aa23cfe04dc87a97b2a8243091b236cdb8d
+DIST dispcalGUI-1.1.2.1.tar.gz 3278240 SHA256 24f58f10396e3e7fc2a39f273d8e7f208cc3c2bead9bfcb5294b2f07bf5e577c SHA512 76e5613cc06f218cef424b1ebfad6afce67cc5969016e920e09e15788ac2495e75b6fd508a4e344049cb988a3ed9ce9643c61e49010097390c090e7d2e249e2e WHIRLPOOL b78fb117ac37d6fb5c8587be22d72570e7fb1e6c1f409aa0cb6bc63d0bdf391d6cfeb076f797c7ea18a441125782f8e0f3658a0393a447c5a77dc67598f29754
+EBUILD dispcalgui-0.9.9.1.ebuild 1944 SHA256 909053adb74b7a04f183af7b772943cf2e6d68a6ed695403ccda0792943e853f SHA512 19a89fd6940d50af3c7b064984e664996881aec8f81cc5f696682251ede404cd83ab91bff42c080fd063d43bf6758f447fbf045bb9bf62b5950c16c70be73552 WHIRLPOOL d0c42cc7b3b19df29c1ff34bf7c95215fb3dfee16052e20800e7051e84d7a32da264b6f672968fe18c3486de15a9e133ed9838f0627546c37aede0cc450fa7c9
+EBUILD dispcalgui-1.1.0.0.ebuild 2237 SHA256 9d4fe693ef97d95a452abc0f3a94ae54fcaf98603f581d497656180df85c1ecb SHA512 780b3340c153fec913b347e19055c36e7cfc03e888d584c0b011be6e8de20edb841b5e8e7f45819da49e02de28c5464008f34675974fb09972f437061e0adb12 WHIRLPOOL 6bd5887a520fc3f050a193b300d18f5088d1b5fff4f36bbb71c6d08ca0fc8d9487cdbc5e7a1249a5133636fcc167578c14a311cedfa66d137bfb93b8007a73d8
+EBUILD dispcalgui-1.1.2.1.ebuild 2237 SHA256 5e9ae71518118a2ad6d85d73fafccef53cb60023eb705fd9b8aaa85d3181029f SHA512 ae452c58224085ff53167ccc6aa70cffc486aaff4087c77811222f8fb20325de2362e9f6f0602d9338a360443b49bfdca6a916030c17e2ce9ff46c4f5cbc86e0 WHIRLPOOL 54509bd1e8867beedd7b0851896fad230bc8ddeeae1217da06cacf05caf5d2627d74d17fac8b4272fb08cfd91a2f38c4cc85b755d8cb79954cbc3a0eececc6f0
+MISC ChangeLog 3510 SHA256 d856c7648f032bc059e15ccfec72899d32e4ed0a03cfb1cb50107b5341952303 SHA512 e991787d3637fe804ee8ca497510951d50cb093b7c90b9106eaa28fc2a13639852cc7d9738700eaf677197eb6b2e126c06347769e8a7214c92f661ae22ef9308 WHIRLPOOL 70beb184d500cba0f53ca9e85fac514c8adc3d1bdd9e9a35371c626e1f786bf7d4edac7fb2287e8532bb1e4b73e16b22c5ddc9b499e9a97215f962d37a80e910
 MISC metadata.xml 493 SHA256 c710af4bdbe1f2047bd1255af9eeee56ab4125010220422412f291fd49e6af49 SHA512 6e9ab526e2cf9581b16c8fd2eeddaefaca073e11f94a0a594c6037adb25984a2b5891c2e45bb279cd33857def20774ce5168c122ee71c792fd6aec31bbcc21ed WHIRLPOOL b928c0621dc79267373bcd606a29d05dfea43f44f17b81b75b27120701393a44525298461dc169e497537ae25a2bf6dd51c728605c259ecc89c9063e7c7455bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQXtyyAAoJEPqDWhW0r/LCm9MP/jdJvC5vWeld5uhabi2arsNk
-8CG0b8IwZQu9Y7L0pzH6tRIGYg7H+VZy4/sXtKKLw9+ZBKKEPpqKz+xPXCGWE/zw
-bw9RI0oKo68h0Of1RuaHLBt4Au3ffoXkK5FMHKTWqnUA9Kes+1VDjO6VhaDR+G6o
-OGJHzJn5LRe7p299LxrDFtqX4vBQo1YEw+Z3t1GDEAlC9qFY5ZwYVrz21+behyoI
-u8+n7A3vmDwo839+5+l6cDpfJRmn9+Bh9nyyYxQq6W0m5v0gs9MXnDHZjP/w0z6e
-1ZIJdI+kiL9H6ezp9J1rpgEe2/98diSGwvHqAN2nsokpcpj7Bt6SCtIP5CWQO+/k
-uxdNWN2RHe3S90rFx/3/HceLp8NIPnUDGk0TTk3BzjjUhCgyDpqgqQmZ94DvLKnQ
-IwkJbMom3i4PXfUDX66jyyVTorop6k5meu24MmYcYD6jDZZbKt3VtAXKOl6srni9
-7KlXYth2zPmpPD5jAgZv0aVpPpCtD+7Zm11PTqeryARMuEVyQUxHFcztdSDc+7Qm
-DZ9kUBLebsp5Iu+to2JQpI3HTwOIrzxZUnzWUFgdkhyR2R/iySZRaVFBE2KacWd5
-iqIvqvhdhbS0xFK3XJCjq4K+FpmNLFyFfFf0PbhyQRcEZ3waT8HU8DD2Dt58XWKe
-3dX9Xns4hzGVMeFVlkfM
-=vhLR
+iQIcBAEBCAAGBQJQlEYNAAoJEPqDWhW0r/LCKl4P/RPK2/x+F7Aq0jb7rYgZTIvk
+OiCCoZ/ZC33N66foPhcH3gVhREkMkFjGMR1bDkmVBeO0zFAdI9c8ZX19TkHPxZ+a
+j4Oenm+6evQYzO87VIC1GL71bJlTZq7+xWHLJ9paMSVfSGm8gOjFIbRpA8Tgbtn7
+Rek9tW3YhNvXrzoPDB1SSXPKsgWxPDzpS11rECnUTAGbUpE+2t97g8l2nxWH0kOj
++K+foECkzyNudxjJUps/h5OBUD9CKAxHKmeri8A6SDRT51apzalpgHXah0Limuq4
+WH55vGo/iu8A23MdzD5Zr2VP+0FRN1c6dqLoWF8KTaCf8WoibbsnUL+uWeYdL3ES
+vQ1DgxcJRdsdbwZG6vMsEgfPFfV7y7n0xEr4UbCXwWKdvWFTN+p7BVOFFd3eUQQv
+9D7+YL+zmX1Tzk06qh/LEGEhjFloBoE8JBKOspLvYX2ceabHJe8f8BBuuq4gnCJ6
+TReiN1iazUblX1ctEyy1w7sLBvSKJWtNONYD7stL1gC0z5Y7dFrg4ZmFY3qHIOyx
+zIwUw4PXZsB29imt6NR1imHs1tb/82VK4vuON2VjYwt1SKbKWO+BPQ3RkpexBdT8
+4lBSdJfClxrbr87PjHuch+eKjxDtnuQCIw+/7LdASB6ThS9c3o+1hojS5DQmaD35
+Aq1eVZIR55obr2qGkORH
+=WU7a
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild b/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild
index 1ff651e352ca..beb0aa13e5bf 100644
--- a/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild,v 1.3 2012/08/02 21:20:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild,v 1.4 2012/11/02 22:15:41 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -45,16 +45,15 @@ src_prepare() {
 	-e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
 	-i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
 
-#	Set udev rules to install at /lib/udev/rules.d
-	cd "${S}" || die "Cannot cd to work directory."
-	for offendingFile in $(grep -r -l "/etc/udev/rules.d" *); do
-		sed -e 's|/etc/udev/rules\.d|/lib/udev/rules\.d|g' -i "${offendingFile}" || \
-		die "setting udev rules' destination directory failed"
-	done
-
 	distutils_src_prepare
 }
 
+src_install() {
+	distutils_src_install
+	#remove udev files
+	rm "${D}"/etc/udev/rules.d/55-Argyll.rules || die
+}
+
 pkg_postinst() {
 #	Run xdg-* programs the Gentoo way since we removed this functionality from the original package
 	fdo-mime_mime_database_update
diff --git a/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild b/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild
index 5d752b87de19..f0b00afb67a3 100644
--- a/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild,v 1.1 2012/09/23 09:55:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild,v 1.2 2012/11/02 22:15:41 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -45,13 +45,6 @@ src_prepare() {
 	-e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
 	-i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
 
-#	Set udev rules to install at /lib/udev/rules.d
-	cd "${S}" || die "Cannot cd to work directory."
-	for offendingFile in $(grep -r -l "/etc/udev/rules.d" .); do
-		sed -e 's|/etc/udev/rules\.d|/lib/udev/rules\.d|g' -i "${offendingFile}" || \
-		die "setting udev rules' destination directory failed"
-	done
-
 #	Remove deprecated Encoding key from .desktop file
 	cd "${S}" || die "Cannot cd to work directory."
 	for offendingFile in $(grep -r -l "Encoding=UTF-8" .); do
@@ -62,6 +55,12 @@ src_prepare() {
 	distutils_src_prepare
 }
 
+src_install() {
+	distutils_src_install
+	#remove udev files
+	rm "${D}"/etc/udev/rules.d/55-Argyll.rules || die
+}
+
 pkg_postinst() {
 #	Run xdg-* programs the Gentoo way since we removed this functionality from the original package
 	fdo-mime_mime_database_update
diff --git a/media-gfx/dispcalgui/dispcalgui-1.0.7.7.ebuild b/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild
index 5ed7328d84a2..cd8b46b74ba0 100644
--- a/media-gfx/dispcalgui/dispcalgui-1.0.7.7.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.0.7.7.ebuild,v 1.1 2012/07/26 22:24:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild,v 1.1 2012/11/02 22:15:41 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -45,16 +45,22 @@ src_prepare() {
 	-e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
 	-i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
 
-#	Set udev rules to install at /lib/udev/rules.d
+#	Remove deprecated Encoding key from .desktop file
 	cd "${S}" || die "Cannot cd to work directory."
-	for offendingFile in $(grep -r -l "/etc/udev/rules.d" *); do
-		sed -e 's|/etc/udev/rules\.d|/lib/udev/rules\.d|g' -i "${offendingFile}" || \
-		die "setting udev rules' destination directory failed"
+	for offendingFile in $(grep -r -l "Encoding=UTF-8" .); do
+		sed -e '/Encoding=UTF-8/d' -i "${offendingFile}" || \
+		die "removing deprecated Encoding key from .desktop files failed"
 	done
 
 	distutils_src_prepare
 }
 
+src_install() {
+	distutils_src_install
+	#remove udev files
+	rm "${D}"/etc/udev/rules.d/55-Argyll.rules || die
+}
+
 pkg_postinst() {
 #	Run xdg-* programs the Gentoo way since we removed this functionality from the original package
 	fdo-mime_mime_database_update