gentoo resync : 20.01.2020

4 files changed, 49 insertions, 12 deletions

diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 68c288f5fcbf..28cbf1201a15 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -2,6 +2,8 @@ AUX linux-4.15-2.patch 3248 BLAKE2B 376d3ba01865ed6cfcedc7900e4a034881abb0ff5a98
 AUX linux-5.4.patch 531 BLAKE2B e928e157f0e77da1857715cc2c5d8ecc37e968dd4c2d2f4bf754b0f3c40abba148f8e2da33e1df9e2265022de2618a9aa9c1a45a3fe9ebd72f83fa5da35d0531 SHA512 8f200510dca69ca2ab3e856b4b0f43e5ca62035c1295d66562c88c596aa9aab3e361ec3090106cdc4fa489aa416b92f2417bf1e9847953d50822bb7d85325641
 DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563
 DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6
+DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a
 EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629
-EBUILD r8168-8.047.05.ebuild 964 BLAKE2B 9f22ada0e96b4c2eb3694d3f3a701126a63d83aa604b4bc54c07dec87643a082f667eba18d3fac61da233dbec632b19e11b97e6e11ddda577ae7832d49752f9c SHA512 19b08b997d683619659e27291db7ec96bc21fcfc373cf917fb7231745c27f7e2bc8d921a07510309381cb6c5f036b3e4d84cb6cb1c48e514f7e011bac03eb4ae
-MISC metadata.xml 402 BLAKE2B 85f808730ecf18c69caa2f0299d881ad0e23956515ff7bfa6941a9abf0b89d5c994e452fd9b6e0e10bec8786cb056d83072fed4dd990de4403317a97c26f3ea8 SHA512 ae3047ed24b4b998463b7d155671ddb1e960af5fd50da7f0f6ac2f831628936f3c4917bbf5622688fc4ee19f9faf7c91b7990b37eb29711bb1ca11ca5ee0878f
+EBUILD r8168-8.047.05.ebuild 976 BLAKE2B a754f02e6ed4aee01ad1804ba28dc7d31673bbde968176726a562f3cf54b170593a65eb1bd42bb945442412474fdd20272012af999987635c62af3e887c62d89 SHA512 71881b738190bfaec377232b469aaa8bf4cf701eaed4650a7983e643f90caa042c09a6cbaf0b3b269f39ff20f1ec3e6d630184a0f3f087a0277d352bf2355b43
+EBUILD r8168-8.048.00.ebuild 925 BLAKE2B 987ba8d46e4e68a176fe782df425e6be2c085d842853187cdb4aae9af0431e8a362af4329bdc99d5f892583138b0c78f84eed229738c26da216e2ecc8eb93876 SHA512 d49c5452662c5a59ebd0af45b87005e5f2931b65611dedd85984b69ab9c15e44dcf1848157ce4a5b6e8a705571dde34f3fcff4086aac30b8427cebe0ba09c818
+MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f
diff --git a/net-misc/r8168/metadata.xml b/net-misc/r8168/metadata.xml
index cc09120dcec1..1b220df09674 100644
--- a/net-misc/r8168/metadata.xml
+++ b/net-misc/r8168/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
 	<longdescription>Official Realtek r8168 linux driver. The following cards are currently supported:
 RTL8111B RTL8168B RTL8111 RTL8168 RTL8111C RTL8111CP RTL8111D(L) RTL8168C
 RTL8111DP RTL8111E RTL8168E RTL8111F RTL8411</longdescription>
diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild
index 152d2ec6ffca..99f290f5063f 100644
--- a/net-misc/r8168/r8168-8.047.05.ebuild
+++ b/net-misc/r8168/r8168-8.047.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,15 @@ inherit linux-info linux-mod eutils
 
 DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
 HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
-SRC_URI="${P}.tar.bz2"
+
+# "GBE Ethernet LINUX driver r8168 for kernel up to 4.15" from above link,
+# we need to mirror it to avoid users from needing to fill a captcha to
+# download
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch"
 
 MODULE_NAMES="r8168(net:${S}/src)"
 BUILD_TARGETS="modules"
@@ -23,12 +27,6 @@ PATCHES=(
 	"${FILESDIR}"/linux-5.4.patch
 )
 
-pkg_nofetch() {
-	einfo "Please download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "using the \"GBE Ethernet LINUX driver r8168 for kernel up to 4.15\" link."
-}
-
 pkg_setup() {
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
diff --git a/net-misc/r8168/r8168-8.048.00.ebuild b/net-misc/r8168/r8168-8.048.00.ebuild
new file mode 100644
index 000000000000..0ef2e5c2951e
--- /dev/null
+++ b/net-misc/r8168/r8168-8.048.00.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info linux-mod
+
+DESCRIPTION="r8168 driver for Realtek 8111/8168 PCI-E NICs"
+HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
+
+# "GBE Ethernet LINUX driver r8168 for kernel up to 4.15" from above link,
+# we need to mirror it to avoid users from needing to fill a captcha to
+# download
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MODULE_NAMES="r8168(net:${S}/src)"
+BUILD_TARGETS="modules"
+
+CONFIG_CHECK="!R8169"
+ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+	einstalldocs
+}