gentoo auto-resync : 24:12:2022 - 14:02:21

6 files changed, 88 insertions, 6 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index dd0477cc36a0..55e872fd1cf2 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/mingetty/Manifest b/net-dialup/mingetty/Manifest
index 9547a5d6ae63..d1363012e95d 100644
--- a/net-dialup/mingetty/Manifest
+++ b/net-dialup/mingetty/Manifest
@@ -1,5 +1,5 @@
 AUX mingetty-1.08-check_chroot_chdir_nice.patch 1148 BLAKE2B 80695e0444f51dea56543e4bc1e3afaaea33796e3556c32ab37e0679189076e04ddf031745de698edf3f47235c277921fa0e187540c3aee6d3b9188733c90f61 SHA512 b296b8618218014bbe02b0d449d7e478a098d23e224ded632ea2e2f9ee95252930f31657adecb971e9e5d984491f6763295a0d269f3d6d59926e1f86ed49e0b2
 AUX mingetty-1.08-utf8.patch 4203 BLAKE2B d15273a937405c6c562ac69c7a399b2d9e11f134c1ae4d78ba19d5b3fcb784c809b1756cae652ffd1bce07dfae42a92a28c6f50ceda93e846ac920469529eabe SHA512 157ee0f38ad2175a3a5c1fd40a419e963c7310c2e1e7d8e8879ee17cca1283f2ea7ba39a0a67381347e75d5b691becf56f92c9ae2e5f65ca400687cb565ca31a
 DIST mingetty-1.08.tar.gz 13476 BLAKE2B a6a1e2fd84cc3c1b7a26919989d79268818cf0ee50b544f92d700e31e42bd527ec8caf97df8aa04486190a8e6c3ac379ec0507ce1488c1a1ffb4a53359233727 SHA512 d2c050a412af81d4635cbaa5610dfa2cf2addce0d3116fa53f73eb15cd6b53d476165a0509ae630a151de07a5bdc82cba1b5da0ab78d0313b200adece3c8872b
-EBUILD mingetty-1.08-r1.ebuild 758 BLAKE2B 0afdbb0b2bdb0a59075210347bfd998771dbf00eb2ec8852cbd60aa452152a1640228446f3ad0ad0fc0845f92534bbb4966067fc5b49044c77430ac6a8e062b3 SHA512 2bbebfd514e8751b58af8f43632e4a47335ab1abecb8096e2ab15b4a173b36f365aed65322cc3991c8308ae922a8c30ce96eb45f851218edb2083c65c1e936a3
+EBUILD mingetty-1.08-r3.ebuild 758 BLAKE2B 915f80755c1e7b0442ca2ab6e644bd08d68e64022692eb4e6ee5d6d354ee1ac4de6feba4222d8d5bc79c6405678cc9e7ecf5533a72d4f420e33dcd0fb87232d9 SHA512 12977fd6c54782bbb9ceff7baccbbf631aaa24a708f436c419b75973be32334353dee34961b2e8ea77bdfc598a875791f3bd0458e916c0552a71537b907f78ac
 MISC metadata.xml 563 BLAKE2B 63113c94a02341c1fc7cc149b0cfd1d9e0b1d2a20b22cffd3be12abe14070680a72c5b43942a3b978b5c686fd58e2d202855dc135b591d7ea8278b6857ff7fd5 SHA512 05abcd9556005d34d542a2149c7495ee37702000270320467e500cd680d3cfa9b4502c2eae85afd4251350005d0ecfe8b55919c37c4956f1fae78da5d41684de
diff --git a/net-dialup/mingetty/mingetty-1.08-r1.ebuild b/net-dialup/mingetty/mingetty-1.08-r3.ebuild
index 593677e9238a..74f1b8f75842 100644
--- a/net-dialup/mingetty/mingetty-1.08-r1.ebuild
+++ b/net-dialup/mingetty/mingetty-1.08-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 4c030e0c582f..b24638ceb6a3 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -4,4 +4,5 @@ AUX rp-pppoe-3.15-no_max_interfaces.patch 2821 BLAKE2B 3ad091bb9fbab181a223c92c1
 DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
 DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
 EBUILD rp-pppoe-3.15-r2.ebuild 2230 BLAKE2B be315b4922acb03eec11ec8890fb01af537f23ed72e8cbc88a298a58bce00b2b14aaebf8a9f122a5bb9b93579b1458335259014518a8ab758c00b50a0974bf3f SHA512 0d5e7fc65c624b91601b5e7d011b49cd4245c87fcec2955f52e3969be4e0b628b786622c1618b34d63b689378e648c2066f32818c13e4e2075e202a3144a7b39
-MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
+EBUILD rp-pppoe-9999.ebuild 1905 BLAKE2B 0a518b94bcad23a390e917ddde470a3d8ebe09adb3b28bd8a5d36241389d5379829e2f19491cc82ddd3057f666fe0603828623ec55d0c6a3080a1efadee05793 SHA512 07d06673b3f1f4c22ad75e0b00312b1e07afa194a6c8cae8fb843bb6157558579ad35d5ef0dc13b520468f624ff16e9e6c15c6878e90efbe39e75ce65bbcdbfe
+MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml
index b0d83aa2e489..6aebbc46f559 100644
--- a/net-dialup/rp-pppoe/metadata.xml
+++ b/net-dialup/rp-pppoe/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>base-system@gentoo.org</email>
-		<name>Gentoo Base System</name>
+	<maintainer type="person" proxied="yes">
+		<email>jaco@uls.co.za</email>
+		<name>Jaco Kroon</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
new file mode 100644
index 000000000000..f296b23837e1
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
+HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/"
+if [[ $PV = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=https://github.com/dfskoll/rp-pppoe.git
+else
+	SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCHSET}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="tk"
+
+S="${S}/src"
+
+RDEPEND="
+	net-dialup/ppp:=
+	sys-apps/iproute2
+	tk? ( dev-lang/tk:= )
+"
+DEPEND=">=sys-kernel/linux-headers-2.6.25
+	elibc_musl? ( net-libs/ppp-defs )
+	${RDEPEND}"
+
+DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
+
+pkg_setup() {
+	# This is needed in multiple phases
+	PPPD_VER="$(best_version net-dialup/ppp)"
+	PPPD_VER="${PPPD_VER#*/*-}" #reduce it to ${PV}-${PR}
+	PPPD_VER="${PPPD_VER%%-*}" #reduce it to ${PV}
+
+	PPPD_PLUGIN_DIR="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+}
+
+src_configure() {
+	addpredict /dev/ppp
+
+	econf --enable-plugin=/usr/include/pppd
+}
+
+src_compile() {
+	emake PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}"
+
+	if use tk ; then
+		emake -C "${S}/../gui"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" PLUGIN_DIR="${PPPD_PLUGIN_DIR}" install
+
+	# We don't need this README file here.
+	rm "${ED}${PPPD_PLUGIN_DIR}/README" || die "Error removing ${PPPD_PLUGIN_DIR}/README from installation"
+
+	if use tk ; then
+		emake -C "${S}/../gui" \
+			DESTDIR="${D}" \
+			datadir=/usr/share/doc/${PF}/ \
+			install
+		dosym doc/${PF}/tkpppoe /usr/share/tkpppoe
+	fi
+
+	newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server
+	newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server
+
+	readme.gentoo_create_doc
+}