gentoo resync : 22.01.2021

4 files changed, 18 insertions, 43 deletions

diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest
index 8a6870e4e15f..31c382127865 100644
--- a/sys-apps/biosdevname/Manifest
+++ b/sys-apps/biosdevname/Manifest
@@ -1,5 +1,3 @@
-DIST biosdevname-0.7.2.tar.gz 193926 BLAKE2B b9242c11b082d1c4d52c2976031d680159cfb7c0a6140fe83ecd4abfc23dda89b7c59788f026a169a843a7451e70a7f0f19171e619a3994006eeea1da5cf3f4d SHA512 2b71d33b3c7ab6c19f6129763a4c044f9cb4cbc43aec0e0d2a83177d8edb1440c17ffc4ab2eae448ae997dcb4b52315f8266c2e4010367f9690e4552cba89502
 DIST biosdevname-0.7.3.tar.gz 96231 BLAKE2B d572b15f86ba1ddaba191f859afcfbd39fa0fe397ee6968ab794e217d37b875b9f9d20c219cb44f62fc5d3fede7aa487963f54423ca20086c75c15b17d755c8e SHA512 9cd2b7d115d6ee487f4aafa21b00025a3917d3c89489fe70ab3de8aa979158477a1d0b5287101b7cec7200fef0d2f6894a0e6389a174d6f8670dcd7530dc445d
-EBUILD biosdevname-0.7.2.ebuild 610 BLAKE2B 0d3962d28703d92cfc4546ed94cb2dbdb18e7e9a49fa4d0c5b7bbafd96f1e9f921f39883fb3380127c9a45142ac92ff0956b1e4c5bf10c1e741871637d908fb7 SHA512 48a3dfb359d1b76f23ebed71d169da6f8eb0712cd5a7f60feb8effe296779b61a176b62ae32ae8d926c6b56171ee0f8847459861d35d24d4d5605e2e1634c909
-EBUILD biosdevname-0.7.3.ebuild 670 BLAKE2B cb4da8a608f4539f7cf5c001c6b01e47c0f4137d8d8b6bdd64bf77ac2fac774657bf59eef7b7baff767bb39972f6d4f484251f983cdfd1280ba9edc10b5eca56 SHA512 3f8c3fe3b8a9dfb032045b3421c660aa92ebbf0835e445134a561febadfabacc30d1377ca126d31aab007f0b3218af004db858ad954ea6f5ee1b78e3259d7c32
-MISC metadata.xml 514 BLAKE2B 6b9e377a0ee3b17e72e4128bad01d5281296531e69d53a33b515a885cc86e38e39b4e25b454230f657bde2750437d8c0e5b1d6667e18bd4910f698c2e073ba36 SHA512 df492ed01d6dd66bdbdabc281b6e802b67247d4bcaa0b1ccd9530891256228b90f677855ef6bab9a2d958f30765e24b878cca884ac2945f68139f19922c36cf9
+EBUILD biosdevname-0.7.3.ebuild 626 BLAKE2B e1b95694af9223e0ed37998155a1ef21dacc216f8192d1fce9a8dd6d57a9c6620cc49027d0ed052cf1288c4b88f7816778abba58a91923812cef620671c09934 SHA512 b9447820c7d320bcdfe1f08a3c5f06755cb2fa29e1894181f4ffefec208f03ec622c82154e35ff3e6c09b4cb95abd35bfaac94893da49c50067e190dca40f0d1
+MISC metadata.xml 602 BLAKE2B e0fa700aa7a51e128b703d455b60d9d425b7d6cbb9edf922a95fb8120969669ca19702cc4435e930d463573bc9406d8e9a000b2f36363e9ae1ca53a2806a28cd SHA512 d66452a9435c837dec1bb9b1580efeebd2f49f556094d49dd16c8c0cac28cf7538cce583694f108745bcb3ac979ae9afd9d8595941c4e300c13617c6ecadcd44
diff --git a/sys-apps/biosdevname/biosdevname-0.7.2.ebuild b/sys-apps/biosdevname/biosdevname-0.7.2.ebuild
deleted file mode 100644
index bfccd3161ba9..000000000000
--- a/sys-apps/biosdevname/biosdevname-0.7.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit udev
-
-DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
-HOMEPAGE="http://linux.dell.com/biosdevname/"
-SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="virtual/udev"
-DEPEND="${CDEPEND}
-	sys-apps/pciutils"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
-	sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure{,.ac} || die
-}
diff --git a/sys-apps/biosdevname/biosdevname-0.7.3.ebuild b/sys-apps/biosdevname/biosdevname-0.7.3.ebuild
index 3382b9289a96..08955d3cbcfd 100644
--- a/sys-apps/biosdevname/biosdevname-0.7.3.ebuild
+++ b/sys-apps/biosdevname/biosdevname-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit udev
+inherit autotools udev
 
 DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
 HOMEPAGE="http://linux.dell.com/biosdevname/"
@@ -11,13 +11,11 @@ SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
-CDEPEND="virtual/udev"
-DEPEND="${CDEPEND}
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
 	sys-apps/pciutils"
-RDEPEND="${CDEPEND}"
 
 src_prepare() {
 	default
@@ -25,5 +23,5 @@ src_prepare() {
 	sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
 	sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure.ac || die
 
-	./autogen.sh --no-configure || die
+	eautoreconf
 }
diff --git a/sys-apps/biosdevname/metadata.xml b/sys-apps/biosdevname/metadata.xml
index ac6d117c6c65..afc179ff42c0 100644
--- a/sys-apps/biosdevname/metadata.xml
+++ b/sys-apps/biosdevname/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-biosdevname in its simplest form takes a kernel device name as an argument, and
-returns the BIOS-given name it "should" be.  This is necessary on systems where
-the BIOS name for a given device (e.g. the label on the chassis is "Gb1")
-doesn't map directly and obviously to the kernel name (e.g. eth0).
-</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+	biosdevname in its simplest form takes a kernel device name as an argument, and
+	returns the BIOS-given name it "should" be.  This is necessary on systems where
+	the BIOS name for a given device (e.g. the label on the chassis is "Gb1")
+	doesn't map directly and obviously to the kernel name (e.g. eth0).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">dell/biosdevname</remote-id>
+	</upstream>
 </pkgmetadata>