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

6 files changed, 44 insertions, 23 deletions

diff --git a/sys-apps/biosdevname/ChangeLog b/sys-apps/biosdevname/ChangeLog
index 1d8e82aa6a8b..919c6a89a9fb 100644
--- a/sys-apps/biosdevname/ChangeLog
+++ b/sys-apps/biosdevname/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/biosdevname
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/ChangeLog,v 1.16 2012/12/11 09:56:05 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/ChangeLog,v 1.17 2014/07/30 19:40:43 ssuominen Exp $
+
+  30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> biosdevname-0.4.1.ebuild:
+  Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir()
+  version.
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
   biosdevname-0.3.11-r1.ebuild, biosdevname-0.4.0.ebuild,
@@ -73,4 +77,3 @@
   26 Mar 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
   +biosdevname-0.3.8.ebuild, +metadata.xml:
   Initial ebuild.
-
diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest
index 40ffa124e87d..e531c1dc5af0 100644
--- a/sys-apps/biosdevname/Manifest
+++ b/sys-apps/biosdevname/Manifest
@@ -6,17 +6,17 @@ DIST biosdevname-0.4.0.tar.gz 187775 SHA256 7d567ea8081bc83c6fe17fa32bf8e2b85263
 DIST biosdevname-0.4.1.tar.gz 187782 SHA256 230e5bffd17f46b6d820faa46ea79ace3eecaf919852ee7ff231e73f6b9f8fe7 SHA512 1c7534dd31acbba7121fc4f904d828b6bfc035248cde3366a58f4596f601c81618b44a96d67b99d4a17cf8d985c971be41196134f6d43ae63b4f8cd4308bed22 WHIRLPOOL 33917ad8ed6493b3fd6b5880e592031fc028e975e428cc9b2b5b16b299f5be647baac6a601c70b9422931a1cf6f98133944e18e9355afe2a0453d456e4697407
 EBUILD biosdevname-0.3.11-r1.ebuild 1283 SHA256 b22b59391923989e1bbad56d2c0b00552470cd71403a9bc527db211053cab407 SHA512 dcdfefb3cf52b7723d998265c6f8498f53fc2454350894c2474af8aa6d3e78c00674edc9719cae7437826d45ba934a6c48ca86c3d55298ab149f97e81dfdb111 WHIRLPOOL 50887b04ea40baac282cff99dfb158644b5e04fcac1b6d436b93b087da3cdbf4242face1495d56e06c688a025c1b04fcfcf1709d7fdf32a026c9979c29fd9a76
 EBUILD biosdevname-0.4.0.ebuild 1279 SHA256 eedb4aaac192a7a49f1553d13fbfe62dd7f8837494a714f93e00156595533281 SHA512 27b814db17a0af3912b01562b86adeeeb6b0d2aedb270391a720d935940b7ae08a38958b4b41b5b4d703ef6b68981e5e5ea51f9f9f6960216855f10e6798f09a WHIRLPOOL 8b30ea4a2e6732bd9a5762bd7c4a167f8e6d2e9872af980d03925ad066f5d96fffc828be90b9411ed570f59c6a37ff77b87751f6c28ee2159320d060996d50c4
-EBUILD biosdevname-0.4.1.ebuild 1371 SHA256 c478be3d26638e666a59df07967c8cf41c9c0f9c77103598bd538a211566684a SHA512 cafcf98777695bbd8edee66e117fe43c6b9ad295d8db921a37ad44820879d3e08190df82118b07da01039a9c8e1cec9943730bab00551fd636962a66f77f929f WHIRLPOOL 3d761a1ce7dc3cc7efa70fdf009c56efd6a460f613c2a830913a4797dd3962eda93878f434dcf21063590cacf3f818bd8075f5aff499f0cf7ff5a4e6bd6c5a64
-MISC ChangeLog 2462 SHA256 1adffbc41d197b51a1d0bcc4a20842532259ff8f539a8f0f3591f2ce6ee9a20b SHA512 76d38b510a49934fabbae66af66cd5a50054cdfce8daa6cf5a2ed3c8945b8bd892feed37f430c92f6c250f46effcaba9fc91618dfd42b21d04016c0157e258d8 WHIRLPOOL 9395b9c48b6004272a5bc8d7a18825cb3fa754b3400be0f6e78c47f7e062e3dd39ae4f55c9fc6be90899d448bf27fb992eeba129ac8ed62984b5c0622602470d
+EBUILD biosdevname-0.4.1.ebuild 1366 SHA256 82ef9abccea246cc4c4f644e56c1e8e16d9d84a338e3eb065e0269f468de06a3 SHA512 6b5096e23a0353cb6ee0b164bbdab393116c1cbe6420a60e742a45cf97d81832c535a64ed7fa5282343b4d2da04cf88b714d3a0104e93f0db8d8adb0d5685116 WHIRLPOOL 7ddb3cf8cadca761c5dced844adf63a036d9fca9461adddbcbca176bf02c4bdcdd018c0195b4062966a961c0d62327ee02b5cc5fbda50e0c3d9b3299af355f63
+MISC ChangeLog 2633 SHA256 6d04af220e618643656272e66f3cf46ed4308cd157a03c472344b38dfe3c02ae SHA512 594d68e50b6bf40b5fddc58d800499776cdb6a83cb3d3af4d8ea78f115049cd209cbc1d2abde67a000a6a0d76a48e138a4fa3703dfa11f68b1ceb47d00b4df7f WHIRLPOOL 73bb45f20351e2b6884798b4e159eac8d6104a7ca37d6a89eac2d85fa41b451fc9910872d4c7613c15b46507107fa7530298363a41e4201cd1759455da8d5de3
 MISC metadata.xml 586 SHA256 b75cc1229f20c5b966053021f98c6e4ae0eab46bcf4fb9fec6e64deffa0b1d0d SHA512 69a740a573eedc9e7ee4feb5fb873100574b6acda579783f8a69dd501e53a0d084e38ed53ebf485b75fd3a965f5b39cf5b6d3256a9b3b192b07a2fd8239f1fac WHIRLPOOL 09cfea78c829416449356e31ff8012829537ccd8b1e5b20f4638ffdb61d9ce8c01f8202a036c238e1d926dbf8ccbbdd5a0cde99108d5849bcb26149598ece7eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQxwM3AAoJEEdUh39IaPFN9DcH/3GP6dRk6nsL8yTJ2u/pcGjW
-A9VlVq88woY0nSeXF5jBA0yig+P1OY3dU63nMOTUiJ1XaEZuNGIMDttQMqMhd/Z1
-IA8uHzkeqU4qKHCHxrzBG75xgmEg1IHShHjQheqJtUdXILx/kIs8SUt6K+ITcB4d
-LJLZxIrqQvpavETcuAmytnvgh1M2m5hOuufRJMZcnZdVgt3rby1DhzKSXXasJPh0
-ub4L1g1HsIqS87IuD7eabYr5hnd2cikl81JT72+YTwht6y40n/4AFpydmOy7+aZv
-R5VxOMZ8maurxJz6586ReWSAm470f0zt7XX2A+785Yrm9XmPq0GM+rBo/ZCeI8Y=
-=CQ4c
+iQEcBAEBCAAGBQJT2Uo5AAoJEEdUh39IaPFNzp0H/R5nPoOerzxf9bBR22uHTI/V
+h5/X8FpIWfab8ONuO/K04MYzW9L1nJ4Ts3R6a/vQmgxTZsmm7bBrhPocYc1FQrgv
+LZXwTqFPVKh+MmsdHue499+csv8S4hgc6ZEV4y5ZeoDD0cVzaL3pj3xPrzhj+5+U
+8HpDQkWkZKoBoOtcB4I1cblYpm5MpExSdLX2wj/BS1iqzXSQfnEVttSPA++x4XUy
+UqEzrfGkvQy24rlF03xj51r3hJf0zl0rSLMkkmdsETNWUQDJ8JueJqNFEa/n76uy
+nhiFEWdiqiWoji/yhhi+GW62WP0YnhCWzy8S6zEeM8bhqpU4Rhb60C7CoiOAeow=
+=9eQe
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/biosdevname/biosdevname-0.4.1.ebuild b/sys-apps/biosdevname/biosdevname-0.4.1.ebuild
index 1f1735e97d93..f8d8a7df8993 100644
--- a/sys-apps/biosdevname/biosdevname-0.4.1.ebuild
+++ b/sys-apps/biosdevname/biosdevname-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.4.1.ebuild,v 1.4 2012/12/11 09:56:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/biosdevname/biosdevname-0.4.1.ebuild,v 1.5 2014/07/30 19:40:43 ssuominen Exp $
 
 EAPI=4
 inherit udev
@@ -22,7 +22,7 @@ RDEPEND="${CDEPEND}"
 src_prepare() {
 	default
 	sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
-	sed -i -e "/RULEDEST/s:/lib/udev:$(udev_get_udevdir):" configure{,.ac} || die
+	sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure{,.ac} || die
 }
 
 pkg_postinst() {
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 64ce694c5c53..a5663fde4834 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pcmciautils
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.49 2013/01/05 14:43:23 kensington Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.50 2014/07/30 19:41:09 ssuominen Exp $
+
+  30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> pcmciautils-018_p8.ebuild:
+  Use shorter get_udevdir() instead of the longer deprecated udev_get_udevdir()
+  version.
 
   05 Jan 2013; Michael Palimaka <kensington@gentoo.org>
   -files/014-udev-rules.patch, -pcmciautils-014-r1.ebuild:
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index 24f2b603f809..113d5273b02e 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST pcmciautils_018-8.debian.tar.gz 11213 SHA256 597879403120c4c258e5c064a2f695aad133529503d66aac0973a02e80756f36 SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9 WHIRLPOOL 32083f28e4adbf0034df13bfde6936f885b54b22295e2603dc4992188d2ef9366dfc77358766d9cfb8eb31501c8949f1ba043e079d858f6822ac5cc7ad673296
 DIST pcmciautils_018.orig.tar.gz 48516 SHA256 b94b71347fa11b7c0eb8dae034b5f7f649b135ffacb80cf60572a5bcb118f095 SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d WHIRLPOOL c74aa10632748bbd28af892c767c59486ddf1cfa3e1c418e3c727a4867d8905af1770696b2ed9bd15c967fc911aad3b4494d923b42e768bd8c87a364e1aa0e77
-EBUILD pcmciautils-018_p8.ebuild 1639 SHA256 ff1456e76cd5a3bcd1eb9fcb197de538812fd4fc03d1f93eaf705234eede0bc7 SHA512 74d2eb49a8d7fdab42333219f4cee63ce39a83452974ea8bf5a4937e8f34a6c9580253029f8f8b96b09c8272bd40aa815460f7eb3d7a290b8eab2a7806fc372e WHIRLPOOL d5adc23af9fd3cca6111d5e4bbf36196150b7642ce70fd6b21ca3aac946ab4d73a6cc5e763d32e394325320aab9f90b1e4cf07ccebfadd409e12b452e83d8f1e
-MISC ChangeLog 7221 SHA256 a5ed19d49c67c85b7e840babca6ddc212c45789f57f8d583f9858c013087eff7 SHA512 8e9afdaaa77b7ec48e5b566a4a329303ce3b2f3f6d6410252946178d8d43412a9d846d75ac621707bc6bc3a8b9cbdd4b5c56d16a122dbb1576f4e267dbacae00 WHIRLPOOL 8bf5eec312695b2c50a6d38e67bdec8db8914eb5817e30729639bd062e3bcd22cfea99a2696bedb91ba091dde32c508ba70b60dc9376979168477c940faf76b3
+EBUILD pcmciautils-018_p8.ebuild 1636 SHA256 7a3cd46e0597ba2a61a4437cfa8648fda2559eca097063b5cd8ff145a693ccff SHA512 5fdf1fd54d51364f052d1d5559b60ea666ac3d3e9142e2193134025d51c81b2d88530ea38f1e13ac04902ee3460279e0809670abc501cbffbd244e705ab1c798 WHIRLPOOL 2de26ab807c9f3e2326c209263d6ef80fbc1fc21886e29f8b9ae7f019c64efd65a28ed45dc5f5b8b27383f7c185141720be3463bc0e656ae83fa1fe9adca3520
+MISC ChangeLog 7393 SHA256 fe10bb76c4197c7ae7fdfee72f27857f5e6ab4558f28ec167805338014aa14a5 SHA512 6345f64392bb77948c08302f11c22a93cc5a4f26ab649df3069fcd372075525df3615bd707f69ca07ddd7380a902caf779339eb42acd2fc0c11027c69e2c6595 WHIRLPOOL 52c9f916f138ba8d4f266f327914c7c513c80c9dd2a62b0f6dbc29e1bece3625cbd7fa91ca30d376617eff30927bc3c89da92f5a404f8f6e526e53945acab259
 MISC metadata.xml 286 SHA256 92bbbe13c7f83e3121d1cda137a46d9091152089e0547f64f6b05088e3abe784 SHA512 3e39c1f69baf4d58cdd00e8204dd9993240098bc7c137bbcd21392d107d5ad43c31259be301e081d092f476582c748f0d891572104b8350247b6615834885b01 WHIRLPOOL e970ffef53eaa4a5e0e72f59bc9c08cdb7fd37028add3f02bac4f02c4979552f0feaa53502b451eeec55b289a7db03dc275dbfb245afbd38ad99b687c9f24838
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJT2UpUAAoJEEdUh39IaPFN6GMH/j/i8/1jzsv75ogLsXUqVjfn
+Zzz0wKye+DaMHrkfTtY1pmiRIhc3ik23OpZh7u/2DGLMjSPx5cygUUR/k00cbPH+
+yq5cAcUYj4hFvSKoFYghZHRAl1+tGH2rjA+2SlrV7iGO6e8MFMf0IHtZI6J03tir
+2FmCTfmls6tiH3t61W3t/SaTx7iNdTIk9bM9pRvwLUJnnsWLyBegNfMhOmgMZcSB
+GnET61hIgBrbUihxxQTt+ZRHht4WpNmqgEG9TiziTWZahZmFN4BkNRAbxyV3Ypj6
+509LaMyGnku8dMxKu6OqQzr9pWCq48+suvIZnS1I5hLyUJuih2+iJ3j50dtPHqo=
+=raQg
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild
index f768710436fb..b96230165c6f 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild,v 1.7 2013/01/05 12:33:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-018_p8.ebuild,v 1.8 2014/07/30 19:41:09 ssuominen Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info toolchain-funcs udev
@@ -38,7 +38,7 @@ pkg_setup() {
 		DEBUG=false
 		STATIC=false
 		V=true
-		udevdir="$(udev_get_udevdir)"
+		udevdir="$(get_udevdir)"
 		CC="$(tc-getCC)"
 		LD="$(tc-getCC)"
 		AR="$(tc-getAR)"