Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir() version.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 20 insertions, 15 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index f476add14359..07149cace707 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.80 2014/07/30 04:04:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.81 2014/07/30 19:22:57 ssuominen Exp $
+
+  30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> colord-1.0.3.ebuild,
+  colord-1.2.1-r1.ebuild:
+  Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir()
+  version.
 
   30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -colord-1.2.0.ebuild,
   -colord-1.2.1.ebuild, -files/colord-0.1.26-fix-automagic-systemd.patch:
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index e48f3f8383c2..109cfae64d35 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 DIST colord-1.0.3.tar.xz 1082868 SHA256 b4292ad5640135a2a1b773bffe0d94bc83abccc72c7fc8cf6407e7e7b25286d7 SHA512 9f187897411a67760738817414be028e4b188e102d3cd5a11c2082b92bb8b45b5875d3c385a9bdc954853406e431dafc0d7f8af184656ad934e3e7f650f9aa2e WHIRLPOOL dcee5d0bd63bee191bc9cc384f3fc0979009ee765a3c5bb8e1c1e43bc763ef8a55dc9eb6248e91b9f5d2857aa0db1aa3cd0f59bf38e76671ffd60c3ef32b3fc1
 DIST colord-1.2.1.tar.xz 1164544 SHA256 2db8c7002f7c859dce71a988de7c39f8370a6ab99a62b1037488208b43829bea SHA512 a0f6756f1f30a671ab723286cab445394c90013c5da6689786d91e28b6b272fa3cbb6afccf55af3b643890092187fc9ef0500a469ece8c16f7afc1b2b018ca03 WHIRLPOOL c3e00b89f4b8b720f2997e3b530b7b2db932c1cbeba98ce453c48e84f9768cade09f73a7fe9a8b1dbef0ed3f35362b652a535b09846b8b1eef53985e05467e5e
-EBUILD colord-1.0.3.ebuild 3158 SHA256 6fac794def792fa2132cdde93b21cd72e163b2d389a0049f00e78f6ff4ba66a2 SHA512 41873ffd63bebfb82115a3a2226156b2a0db8b366f1e567fbdb0046bb18d4bd7fe556a9547f710212fb4c5b5da43942d51b5234f5d7b187f34a0b9c8d74e8973 WHIRLPOOL 5b759a34407d9e272581ea4c7e456e55a8dddd9a4e76a21e8fa159e953b3b3abe7d76be9b7adb1ca37c2a53431263bee73564749e0b49e0db694d5df488180bb
-EBUILD colord-1.2.1-r1.ebuild 3289 SHA256 dc68940c770b3747763a18c5d9615c30bd876b5a304b8998a3090385213fea92 SHA512 b442e4c3028b52d96cb401921024482ee433c6ce7ff92ea725fe55f0a51f9ceccc326c5af5c47227d26869dab7cf2f0cc94a52403a4120b61975c2a2e25d5a24 WHIRLPOOL ecde6dc7f00a12e3668f54b2b7b4bfd370f18abbe54f87fc277c5c68f8379adfff744ef98dc9e0061f99082e05278c0c4fd9288ec4b4ea58baa9db0d06510098
-MISC ChangeLog 13262 SHA256 d219848f26391cab7880a1dadc7d8858240894003c2cc13f7be1da7e8dad2b34 SHA512 a1422b866a498db90bd40fd077111f830538708f5bafc8ac3d0d20126eb699b06f7281ce7d4c5c40564f60c8db95446f17520b11ac60a176da09bd22bb5fbcd4 WHIRLPOOL 0aca4d3ee88f5bd09cbdad7d57cc0dbb2af7bdd7f87ba211c9b43ab5463ccb7c7bf8dfedb060023afe331f4c91d01f28b6375cb76e5d1f92ccd5bd29d5118065
+EBUILD colord-1.0.3.ebuild 3154 SHA256 605257955e2b45270c3f8e7197089aab26d0d65b07b79cb737f84103f07cda9e SHA512 7ac5d115545f2d887acc91fc283efdcaa6d7eb0665c093a6eb790f52980f27f82a6800b7cbb7692803fcf17ec8648a4139ed2559732f809eee68b81b5d312373 WHIRLPOOL 2f481e2f6487d81e33768e31df288a7ea28bfae5737d337d8258ffe8099bb1884a234a34d7d6c41f6a3a49ebe66b69380d2fafde6fb07491bd5c0f6046adf4ea
+EBUILD colord-1.2.1-r1.ebuild 3284 SHA256 1af69663874750ad8a170aa894ebeecb86517f9650358bc988e85c15864529e6 SHA512 78c7ed5713bab6b0a8bac5bf3f6ae552bf2db37b4adcdcd41f6ab386c9c1f628a7ecf12a3da76174e47890dbdc7b603e573dedd0b8ffc59539d5a8629b966dfc WHIRLPOOL 411cf2421a881db4046c645c1b7df2670d1ca23f86292e569f1c0df6bc083ebf51108960186496fa082f0108cb4c361b72c77b62a12a67cf2662010d13588f09
+MISC ChangeLog 13455 SHA256 26fe3ae1d333cbac2ebf837139254e17879c68bf7dec7b0a7a549c0cc1504db0 SHA512 fdef1a83cfef5359538fc187dcc7de543764d695764f9819e47a11fecd6a68985797c2be10df32a49e276f3a4b84e5de3334f3bf694fcc663ace397e85a249b7 WHIRLPOOL 5bf8ea03a5649854b0fd521e4cfc5b380ed931098634d5d9789795b8977b3fee17e315bc2643930942a40a0b1b0e687259e5ac61292ed1be4452defab8fb6635
 MISC metadata.xml 487 SHA256 a41c8821174801eb158a9d90f34b6a2d08d772212fc8cfc6146cebc3fc4edc4d SHA512 4b2303ad01c0267f9b405b6f04d0369169c3bd281fadc1b1b57a17b8bbddbbd0c05653b19ea5057c0b53b8f7ebee4711430c6391c8d42e3137693c39681ed8b1 WHIRLPOOL 34e544fc69831ff0527cbf4852552aa39da386ae6ab5f45465cbef65de6b6bfb6c775a08646547021b403d66e0394a8cbd5335177fa213c1c657619b26b33413
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT2G7IAAoJEEdUh39IaPFNBBIH/2SjoaDAxHIw4JeMN08UemPh
-V6KM/CYyspA4rlIU+rTDicTwwcr36X+OErGbzjbmFoBIklCPVIedbksHZop+B2Xk
-ka5UGdOcHXIoB9UxYAq7C8tBB0A3qGwCvf2wzo2b3AAcOIdTOmGSrtogLmt9WMpO
-8jx4sshW2RTkc5CumWPaVlHl/fnPZ7wJ5TljNpJHs1wk5uJ3Xde/L86ij1FfczCK
-p0xf/e3wdrsVY3M4qxXE3ttBE90Bj50fVQt2NmZCSfo4km8HluHa5OU8VuJGhEYK
-EP2ekVhz7FkV4z1mmq79rwCBfEIH7M9Mq8hog2futB8hBmSrmhHqh6f09z6QVK0=
-=r04M
+iQEcBAEBCAAGBQJT2UYQAAoJEEdUh39IaPFNRxYH/3vHLCAi5OYvATa+4A0/LLDO
+WI5PlnhuJf8rMZvRjvPu+PS3mjieT2va3LtGaMxDcDuq2XbsyvEnP5aABXGIW6xI
+xjIe+nh5n3Ypla/YTgRH3Pr4eqcbwiH5T1BniGQq9c8tbnlLzJe6PM8VRPkt2IQb
+IZi4n/gzi9Lk0D0gAd3jAVBumQEJ/oHpxjbBCd5WfMgXhan+iXhi69jo5mX20e/K
+dHone6AsC/vWwgFotARZ8x6n+Qu+cPg63w7D/UMOUSh4h59OnHL1ymJBzRhwEi6w
+gd+O5FAdhHEjlYMAE1NBP7oFhHaWKov0gQRnurNzfvrZjU1sghJmb0ZlTpoa2Zw=
+=KodU
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/colord/colord-1.0.3.ebuild b/x11-misc/colord/colord-1.0.3.ebuild
index d2770e38cfe7..c6316fbda038 100644
--- a/x11-misc/colord/colord-1.0.3.ebuild
+++ b/x11-misc/colord/colord-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.0.3.ebuild,v 1.9 2014/07/24 16:58:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.0.3.ebuild,v 1.10 2014/07/30 19:22:57 ssuominen Exp $
 
 EAPI="5"
 VALA_MIN_API_VERSION="0.18"
@@ -87,7 +87,7 @@ src_configure() {
 		$(use_enable scanner sane) \
 		$(use_enable systemd systemd-login) \
 		$(use_enable udev gudev) \
-		--with-udevrulesdir="$(udev_get_udevdir)"/rules.d \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d \
 		$(use_enable vala) \
 		"$(systemd_with_unitdir)"
 }
diff --git a/x11-misc/colord/colord-1.2.1-r1.ebuild b/x11-misc/colord/colord-1.2.1-r1.ebuild
index 14bf2acddfe7..b6d4a68910d5 100644
--- a/x11-misc/colord/colord-1.2.1-r1.ebuild
+++ b/x11-misc/colord/colord-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.1-r1.ebuild,v 1.1 2014/07/30 04:03:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-1.2.1-r1.ebuild,v 1.2 2014/07/30 19:22:57 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -95,7 +95,7 @@ src_configure() {
 		$(use_enable scanner sane) \
 		$(use_enable systemd systemd-login) \
 		$(use_enable udev) \
-		--with-udevrulesdir="$(udev_get_udevdir)"/rules.d \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d \
 		$(use_enable vala) \
 		"$(systemd_with_unitdir)"
 }