Use virtual/udev instead of sys-fs/udev wrt #444398

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

4 files changed, 23 insertions, 26 deletions

diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index 44f0935a8f21..6453bac35f2d 100644
--- a/dev-libs/cyberjack/ChangeLog
+++ b/dev-libs/cyberjack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/cyberjack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.31 2012/08/12 11:26:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.32 2012/12/03 09:49:09 ssuominen Exp $
+
+  03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  cyberjack-3.99.5_p03.ebuild, cyberjack-3.99.5_p03-r1.ebuild:
+  Use virtual/udev instead of sys-fs/udev wrt #444398
 
 *cyberjack-3.99.5_p03-r1 (12 Aug 2012)
 
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 750ad83dcb57..365489f4d81b 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX cyberjack-3.99.5_p03-gcc47.patch 705 SHA256 f3a19a32fec0ed9b17a4c6e97d08f196a5596d12e5926b5e66d67d6f1a1085a9 SHA512 d05d4af0178003f722c49e06a1fc5027261f36c71f4ca3c9cadef627b6dd5719fed3d65358a6917711b1a5772498b8420e5645e8a51ff5c2f0616c1de361d088 WHIRLPOOL 093d35207833117d5c4b309c12cedebbc03345caa3e666d7929d0091c0763c118716b38e060c5f7201262e83a3631ede96e12786ee05b8920786db9883eef995
 AUX cyberjack.rules 321 SHA256 294d043daeb3b1c321cda80fd2b3b51ce1d29e754e9fadb5a042e08c7781980d SHA512 ca7ece7d34b21055e7a38efa04914dd07dab423041142eef309352924207c4ae25bfde3b1cc171eb6aec32539589006900669e38d5d699f1f942cd344c7a0cda WHIRLPOOL 7e6d4e7adaa99e1e2be96103e1caf60b6a481458a96782ba760855e18f3dd7cc8fdc150d0d20d5e4fab3a3eb3f3e3a4898b72afa51b44a59985cbf2514dcbe74
 DIST pcsc-cyberjack_3.99.5final.SP03.tar.gz 1485952 SHA256 fa5324d8a270d50aec20345cb57362f684ddadd3a50dbd0773ee13d2d87bc0a9 SHA512 a091a09b501d7a7c757f0a458007f44ac281cbeaaf5bc3c2aa89915ee7a39478e6f80b6f24fec77be753c8d77deeda2858b7a806e3c982f54c199bd797288e05 WHIRLPOOL 51429512a9037e6ec4a98cc33576176cafda5fe3a3b33c56b2d928c7a7bc06135ac93e92a713836e4dc20e90f6106f9ca3643de5baed7c25672c26f6fc4a6368
-EBUILD cyberjack-3.99.5_p03-r1.ebuild 1922 SHA256 1d8dd8e405d747f8f3e6cbbf71b4963a0ce711d9e7088c66ee32bf2d8585bd8f SHA512 8dc8976ff314c5d7907e584e8bd1ea26f6c0452318b12f60c8ef80c2019cbd512ebdbaa80c1cb8acbbc335b4da2d20fa5876818435b6bd3859ed74c9d16755cd WHIRLPOOL 74801475fd280c2d9dc054308529e7aa55bf05c2aee39bd21f2f1ee2094bdc96a360624ce3b3cfb30293a4f36434bb31f171788f63ca27af9fc55110c7f60c38
-EBUILD cyberjack-3.99.5_p03.ebuild 1753 SHA256 37b49a426fb03a94865d1267695f92f43487ad1060ab4c4a2c34ce9e0114af12 SHA512 dad8cfaf7516f67232c0ef9911663cb747aa4262d04c4cbfd074cef4c3d78d7d62992a4eb17c043c3e27d70e66ddb35108c490e24b893c99fbb726631f81d59f WHIRLPOOL 54aed05e38c41699010b3c79673565eeaef1ff75d0efef51cdbe1f6c769df2197ac02c23b2b93dfc78301ed4b6aab273b3a7a66d166940c582709d2164122a30
-MISC ChangeLog 5592 SHA256 7f85d7552e0b6dedea0835bc4b1f7c434b81b6dd6c933722b077ab4689dc0b08 SHA512 4ba48ce6a98facd21310964e7028571d9266d7d804aa89c6251d239dcc09f986cfec5f02b716203c9bed52e46f309953210bd555e3e37ac4349ae9943de8bf3d WHIRLPOOL bac120d1b36ae8f8ee7a2826624e39e6472b79449f5ab013b0d612d8c470c314172061f8da854d3324ecd084ca33081711f2387bfd0c0ac8c58d75075bb18ae3
+EBUILD cyberjack-3.99.5_p03-r1.ebuild 1751 SHA256 6ea004cda00ea5ead96e8eee3ec9df2a78af7edbca59a4189ee0db8a9b1831a3 SHA512 3cd2e5d1db40ae58d2c5044daf5478a7e1793caa649dd2ebd912f1c92944550435c2a3f16f4d6c1baeb15cbbe4adc22c86cd13204745a3b0b81bbdd38d777dff WHIRLPOOL a964b579e8dd5dc65894edea0c13d0c9aa0ab4f7b229215a5e4a698dfde8364531a6191c963bef43185f4a47f056825e8f97c63f3e407e82d5b1406a9deeecee
+EBUILD cyberjack-3.99.5_p03.ebuild 1757 SHA256 d84aeb3d7661a5b632c31e49ed0cca50ae5153abab887479c3cb2e4a99601ed7 SHA512 c46307cfba09433fca49e83f42b7c3bf88b2c8b414e9e6069fbb6ba832aa3206d7d1bf7e1d19399dc0aac75f68b036d55d5045cbe833db563f3036985bb8a633 WHIRLPOOL fa3dbb71cd181ea19fd4beac525c52925fb9101971ffc10032625810a6e7853461f6ba5980e90de0b4eb777d82fc1de9afd9618b162450b9adf5266a8522e4bf
+MISC ChangeLog 5764 SHA256 753a579ebe4b8c1d8011a02d77a24b3bac348ac24e7917c239471fdd94b9ed61 SHA512 724534cea0ff716bde4d3cba7e433c8446ec34e7fbaccfc9cdd75997118b38c15eb407620a3a5f43c113d6c6463a9cbc17c69478c0cd7f78a49601e224414a67 WHIRLPOOL 067949a77eee2f62b1c6d9dd0f6e244906bf83e96f361b3dcc9990fb697562f52103cc1dcc00fa6a783bca64801a01208e566d480cf60b7ed1a794c1d20b3135
 MISC metadata.xml 343 SHA256 5b84dff3e34449a1b94d25284d8e003105c27403dcc279fb418642caa5939ae0 SHA512 098b59284018d50c701bff61d457699bdf2cf4012cf96bdc2a448429ce1f5de3f4bd33fbeb30cf6ffc6759d3c998bdccb1fff3eddb2af91404efa4a2f52234e5 WHIRLPOOL 2e4c9033ef3745c076432614b7d01dbf97612de6f69c44815b8bf18bec73bc8c4591c70ec29f0813c6636c7a23073b5c717f29415d1b6678bd3006f25d972955
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQJ5LAAAoJEEdUh39IaPFNXSAH/1swbHd/yFkc7rspivGY1XrN
-H+gYLWgLUfmC7HKlFv/RrQYNj/+67VVGssfSxFuLrOaAHwNBmjsJcxag4C5u6SXo
-otnqinz/OmvDHVVtklSNCEUjl1RkCnLECY1WICnYyPhVPj211vkzDQzHN7Z7sLpN
-KK8v6gecl2cr5efd7huBEiZLndyy225fkFQb2/sAk92NZUl/CfVT2HZHEx26xYh1
-LhfENHtcw0l/eITk9IdF74n3cvzIUYYV8O3oSS+znMgl1mCFr8dsTJhzhxh0+0Oo
-hS3W/WvOad78x4sK67TOda58QDKTJ9qLbOpa96HygW+AKN6LRcEVgqQBzEHg1z8=
-=8Mx2
+iQEcBAEBCAAGBQJQvHWWAAoJEEdUh39IaPFNeJkH/2fTIzD0yK3Jlg6lXyu4wi5O
+Nus/99OqcTQwMJuNtFrkfFlS4uJkNSplHfSBRxd+gdAyEBPg51esAMtL7xmYkzGX
+LI+RLKmZU9o7QUkAGHcPCwHbCNP06yq8XPNp9U5/bpVign+yHAFpTN5c6P+kG5AO
+hBhI0+qzobOVw8p48fyPXAamZWTTnvGtfZth48bpMVoaZFICA3jjWO/9XwnwlROF
+TA0iqMoS/o+PUeiqlMcuTKE9H1BVOfCNcAyuwZ3LIZRXi9p4aC8ta1uzNWDTifGM
+Og+LISHgZcVIv72RPw6fFOSGiqR/+s76gajMt6Vpf1VTZwcOsha9vkwygLB7Trs=
+=ue+q
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
index 75adf843ca1c..8eb5689c9b1f 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild,v 1.1 2012/08/12 11:26:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild,v 1.2 2012/12/03 09:49:08 ssuominen Exp $
 
-EAPI=4
-inherit eutils linux-info toolchain-funcs
+EAPI=5
+inherit eutils linux-info toolchain-funcs udev
 
 MY_P=pcsc-${PN}_${PV/_p/final.SP}
 
@@ -21,7 +21,7 @@ COMMON_DEPEND="sys-apps/pcsc-lite
 	fox? ( >=x11-libs/fox-1.6 )
 	xml? ( dev-libs/libxml2 )"
 RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-fs/udev )"
+	kernel_linux? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
@@ -54,17 +54,10 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED}"usr/lib*/cyberjack/pcscd_init.diff
-
+	rm -f "${ED}"/usr/lib*/${PN}/pcscd_init.diff
 	prune_libtool_files --all
 
-	# http://bugs.gentoo.org/388329
-	if use kernel_linux; then
-		local udevdir=/lib/udev
-		has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-		insinto "${udevdir}"/rules.d
-		newins "${FILESDIR}"/${PN}.rules 92-${PN}.rules
-	fi
+	use kernel_linux && udev_newrules "${FILESDIR}"/${PN}.rules 92-${PN}.rules #388329
 }
 
 pkg_postinst() {
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild
index 2fccc998b83b..38f1b5facd00 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p03.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/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild,v 1.5 2012/05/04 18:35:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p03.ebuild,v 1.6 2012/12/03 09:49:08 ssuominen Exp $
 
 EAPI=4
 inherit linux-info toolchain-funcs
@@ -21,7 +21,7 @@ COMMON_DEPEND="sys-apps/pcsc-lite
 	fox? ( >=x11-libs/fox-1.6 )
 	xml? ( dev-libs/libxml2 )"
 RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-fs/udev )"
+	kernel_linux? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"