gentoo resync : 25.08.2020

5 files changed, 81 insertions, 40 deletions

diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest
index 498859c71b05..f1f613d7f49d 100644
--- a/net-misc/batctl/Manifest
+++ b/net-misc/batctl/Manifest
@@ -1,3 +1,5 @@
-DIST batctl-2017.4.tar.gz 85865 BLAKE2B 9d8786956b69407d46d1b024a40c3db2a80bbcce7c02e8e7d98234d06aaa3cd4fe86dd9331806699a7310ac41b7a758c324bcb6c3daf378da0db0a8858f814df SHA512 a3ce3f32ed1eaa65aee4a9ac56d8e235b861b3844a13fe050cfc0e707bbdf382fd2e6e4ecb35b7777f79020cb241e063f473d28f1b2e312f865e6dce304b4b9f
-EBUILD batctl-2017.4.ebuild 871 BLAKE2B c603114dc6beebd8c2c7eba2763efc58849fc14c30e78038e4fb47c0c0404e91ab542c9736780c572219d0eb20d40b0393291bb1258cf62a1bb554d338bb46ac SHA512 956f530d28d143a49dcb4d546555b6dc1085e2ee6bf98dec5910c485ef896e659e1791b5713342cc14d951c3526a083978676c4f4969d04e3b94780c5e3b516b
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST batctl-2020.1.tar.gz 112004 BLAKE2B fdf99b97edfb1b65df3b6cfd3b99148e21a6fc201c5a6b2d2bfeedddfa18e22903b33811d8b9adf6d4a2b53ab9ca35602fdb90b48f97fb40e4edf9643264609e SHA512 b6f4b98a3a8450badf7d8dda2c23e0f91a1f3e0c6d9db96d220451ee4f2f5ea703206a888d504cc3b8594c4255a6ccea851e4da6d1c7869842a62ee0bac6ce8b
+DIST batctl-2020.2.tar.gz 112155 BLAKE2B 9d36baf4f728163b12d63bf2b690b75633119ebc22a734668aaaae97d9c0a37ac1906dec40f62987d7c9db2ca6b0c7867164c989f3f3f5834bbc5c562b842852 SHA512 4990eece371320107cd522f5dc6ff4ecd2867d8b77ddb8a09b8c8fc81c6cf2a88df6635f026b16a2c59fc05532a82ecafae206fb1581ac7e1f863043eb3afa93
+EBUILD batctl-2020.1.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693
+EBUILD batctl-2020.2.ebuild 776 BLAKE2B c4f8c8d552d170acdf25f7df69c2adcb9a4b503dca10b181bd91049f5ad19e852826c7b79db801347359d8e4be059d884986e3c2a28f2f10c2fdf7eb6f21b5d9 SHA512 e304e3cd4430036f204cbe55db9a4ecb8d0c59e7f62db45afd419f40658314df92a00c1aa7defa1f2c92e443ec336301dba826809730805b04a6688c73256693
+MISC metadata.xml 375 BLAKE2B 63ed1708614d32491216fb627a3f16a07a9de5d8d4925e2676a61744c5ec3a6d398ee838c8bbea0b5d50101d27383c9484c508dc2f6a9f4d953b67d8d2d93235 SHA512 6a83a787d099e17f964e466cfbeed9ae40ba657d21c9881c289ddd318572e292fb3202e95f413e2e3807f9f35201f40458dd0da74adf5af790dd44a0242bb8b0
diff --git a/net-misc/batctl/batctl-2017.4.ebuild b/net-misc/batctl/batctl-2017.4.ebuild
deleted file mode 100644
index 1a86c94be2ba..000000000000
--- a/net-misc/batctl/batctl-2017.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="BATMAN advanced control and management tool"
-HOMEPAGE="https://www.open-mesh.org/"
-SRC_URI="https://downloads.open-mesh.org/batman/releases/batman-adv-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libnl:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if ( linux_config_exists && linux_chkconfig_present BATMAN_ADV ) \
-		|| ! has_version net-misc/batman-adv ; then
-		ewarn "You need the batman-adv kernel module,"
-		ewarn "either from the kernel tree or via net-misc/batman-adv"
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" V=1 REVISION=gentoo-"${PVR}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-	dodoc README.rst
-}
diff --git a/net-misc/batctl/batctl-2020.1.ebuild b/net-misc/batctl/batctl-2020.1.ebuild
new file mode 100644
index 000000000000..dc9f33ff9204
--- /dev/null
+++ b/net-misc/batctl/batctl-2020.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="BATMAN advanced control and management tool"
+HOMEPAGE="https://www.open-mesh.org/"
+SRC_URI="https://downloads.open-mesh.org/batman/releases/batman-adv-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="dev-libs/libnl:3"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if ! linux_config_exists || ! linux_chkconfig_present BATMAN_ADV; then
+		ewarn "batctl requires batman-adv kernel support"
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" V=1 REVISION="gentoo-${PVR}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc README.rst
+}
diff --git a/net-misc/batctl/batctl-2020.2.ebuild b/net-misc/batctl/batctl-2020.2.ebuild
new file mode 100644
index 000000000000..dc9f33ff9204
--- /dev/null
+++ b/net-misc/batctl/batctl-2020.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="BATMAN advanced control and management tool"
+HOMEPAGE="https://www.open-mesh.org/"
+SRC_URI="https://downloads.open-mesh.org/batman/releases/batman-adv-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="dev-libs/libnl:3"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if ! linux_config_exists || ! linux_chkconfig_present BATMAN_ADV; then
+		ewarn "batctl requires batman-adv kernel support"
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" V=1 REVISION="gentoo-${PVR}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc README.rst
+}
diff --git a/net-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml
index 6f49eba8f496..fb16ff9c1889 100644
--- a/net-misc/batctl/metadata.xml
+++ b/net-misc/batctl/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>info@harrysmallbones.co.uk</email>
+		<name>Harry Smallbones</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>