gentoo auto-resync : 13:05:2023 - 05:50:34

5 files changed, 87 insertions, 33 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 1c0a71dbc378..da925430308f 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index dba7b229b0c5..eec18f61f585 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,10 +1,11 @@
 AUX pppoe-server.confd 428 BLAKE2B 83e91157082122ff084ed5b36031fa37950d154f22bed9630ca09f5e9ba00b65cbeb6769693f039b649b30b9c5f49051d6177e108bae2d23c58af7412363d5f6 SHA512 2216e972469d1b544d1dc5729a5c8e2520006f8fd1d07e4d2152a1fd6dd00f52cb97a984398058006f7830fbeae8ee1e8088d5d9ea7648acf50510cc19372b16
 AUX pppoe-server.initd 456 BLAKE2B 1dd9e1dbfe7e18c4f20d9e7a6eb99f942742516273053375e31e802df5297ad61645439ad76ec28a16b6da672862831de627273dd056021b76e1a37beac1fdbf SHA512 44df1122ae36f56c044c47e94c5dd70d00c060c23d0590f233f6cb6024241c1d1c83832d167c12a45ef4464e94f7d5f5e2ddf04c413ea929e1d398feafa0ec0a
 AUX rp-pppoe-3.15-no_max_interfaces.patch 2821 BLAKE2B 3ad091bb9fbab181a223c92c143ff860e0541856cc2e4296700eff08db81f42562f365da9bb836d8180f8ce8c08042e5fa4fc2466a0864678e46f14df619e324 SHA512 16567d42c4691fa0bee04bcca5dc200385c8749c97e147c4134f4290064ab00fad4e1ad8847aaa0be975d7bc2dea024307adcc91f47d54ae20bb42ae0e8dc18c
+AUX rp-pppoe-4.0-ar_environment.patch 2026 BLAKE2B 73d75afd1cb5b0b59982b7aeabf1997a2e280269e83fbbeabe78ce6a2b193ff4454f63dcc99dbc77ab302ecf900792c7ed3b91d580af553ef74f4fabc08a6e24 SHA512 7c3d6ffbbb9e4c15f62e861874b8a557652911aa89ec3a4769304f7db1ccf1329ffcb24dc8ce75139f15f038e7663caae61ece18dfc177a061576307e4bb444e
 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
 DIST rp-pppoe-4.0.tar.gz 139539 BLAKE2B ba9f11e547dafdacf6fc4d525488a4ac0279b06d545e0c116e568c92a45eb8ab558ca9112f1debecacde5401cb5974eacdf972b1b4cd813711589b8181e918de SHA512 faebe543988b1ffacd4d9bf55a3ec21f3a541f9232ba6c7b6fa0e8103d6c2b7b1c358e7f7bc8f99bebb24b2f7bdcc2f46ba1ef4c23e6dd34062f8f28114e7aea
 EBUILD rp-pppoe-3.15-r2.ebuild 2276 BLAKE2B 1cfb507bd01fd01ca806e595152bc5ef71f1a0b967f1b00b73aa3a5fec50c21ec21b1ccc9cd563fc89cfe1e2d03373d9586f2597f9ab2ea9b9f1a1293921ab0b SHA512 d941aa471c4947021fdb01c2178315848ea0f7ea46d53549a3ad7def23cc017984684c7df0c1b648796f68485adb08e87ff56aa36eaf6e591a7587e693a4e099
-EBUILD rp-pppoe-4.0.ebuild 1882 BLAKE2B 1ee790ccdf5f65be82ee4e87225ba147723e405f78efe08c088a8beb0fcfbb412fb9fa676269bde307298021d2919a2f6a1a04a135f682527c9532a52ab28c35 SHA512 448b010a51738d22417f846b0784588b07c71e47c150ed72dacb7d095fae0ad7972425d3c01a90662ff9fcb5085a9fe04c1cf39afbf68d22bbe748b00efaaf66
-EBUILD rp-pppoe-9999.ebuild 1882 BLAKE2B 1ee790ccdf5f65be82ee4e87225ba147723e405f78efe08c088a8beb0fcfbb412fb9fa676269bde307298021d2919a2f6a1a04a135f682527c9532a52ab28c35 SHA512 448b010a51738d22417f846b0784588b07c71e47c150ed72dacb7d095fae0ad7972425d3c01a90662ff9fcb5085a9fe04c1cf39afbf68d22bbe748b00efaaf66
+EBUILD rp-pppoe-4.0.ebuild 1634 BLAKE2B 962920c7e6ac6fe881be0a9a5f9393a3c03d845b501b921626870a9ca2af57804bb190866f01fbdfb0cacee2e067fea142f785fd43a63b0a314cec1accbe4105 SHA512 04c6f54934c02bdaaf003877c3382671b0ec3f97666430a8516ef999c8b09cadb1b6512031072366b7b02866f4f5b6b1239e52ae35642b0f2f57517df3cc5ad5
+EBUILD rp-pppoe-9999.ebuild 1572 BLAKE2B 3664d5cb341dda783686cde0cf55bbacde0e7a425e620cd0aa656cc853dce83a074fe5e7675044a508ced152dfc9128a647ea65bf2a3873840bd1d0254e32f0a SHA512 aff4fab749d47fb20a74136fe8cbe8b794b7acfa2931bbd0872d8d1298aff50389e376d57caa96a940132d72813a2bf4486c30b8e1d1a78463d8b210799b9ae4
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-4.0-ar_environment.patch b/net-dialup/rp-pppoe/files/rp-pppoe-4.0-ar_environment.patch
new file mode 100644
index 000000000000..651dc9078cda
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-4.0-ar_environment.patch
@@ -0,0 +1,81 @@
+From 7686d18a896118d4b99b15313edac34e6f5a2370 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Thu, 11 May 2023 13:44:06 +0200
+Subject: [PATCH 1/2] libevent: avoid failure in case ar isn't ar but something
+ else.
+
+---
+ src/libevent/Makefile.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/libevent/Makefile.in b/src/libevent/Makefile.in
+index 5f4f43f..02ebe21 100644
+--- a/libevent/Makefile.in
++++ b/libevent/Makefile.in
+@@ -14,13 +14,12 @@ OBJS=event.o event_tcp.o hash.o event_sig.o
+ SRCS=$(OBJS:.o=.c)
+ HDRS=event.h event_tcp.h eventpriv.h hash.h
+ CFLAGS=@CFLAGS@ -I.. $(DEFINES)
+-AR=ar
+ 
+ all: libevent.a
+ 
+ libevent.a: $(OBJS)
+ 	rm -f libevent.a
+-	$(AR) -cq libevent.a $(OBJS)
++	@AR@ -cq libevent.a $(OBJS)
+ 	@RANLIB@ libevent.a
+ 
+ event.o: event.c $(HDRS)
+
+From 162bf8bf6b9c6776e3b6ac000a1e88afe49d9d31 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Thu, 11 May 2023 13:49:48 +0200
+Subject: [PATCH 2/2] ./configure - marginally improve ar detection.
+
+---
+ src/configure    | 6 +++++-
+ src/configure.ac | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/configure b/src/configure
+index 7eb80d0..9a31790 100755
+--- a/configure
++++ b/configure
+@@ -3088,7 +3088,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_AR" = x; then
+-    AR="/bin/false"
++    AR=""
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+@@ -3103,6 +3103,10 @@ else
+ fi
+ 
+ 
++if test "no$AR" = no ; then
++	as_fn_error $? "ar is a required program" "$LINENO" 5
++fi
++
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+diff --git a/src/configure.ac b/src/configure.ac
+index cb7a094..a09241a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,11 @@ AC_PREFIX_DEFAULT(/usr)
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
+-AC_CHECK_TOOL([AR],[ar],[/bin/false])
++AC_CHECK_TOOL([AR],[ar])
++
++if test "no$AR" = no ; then
++	AC_ERROR(ar is a required program)
++fi
+ 
+ dnl Checks for libraries.
+ 
diff --git a/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild b/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild
index 49505ea74cfc..f156559e1489 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild
@@ -17,20 +17,20 @@ 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"
+PATCHES=(
+	"${FILESDIR}/rp-pppoe-4.0-ar_environment.patch"
+)
 
 pkg_setup() {
 	# This is needed in multiple phases
@@ -49,10 +49,6 @@ src_configure() {
 
 src_compile() {
 	emake PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}"
-
-	if use tk ; then
-		emake -C "${S}/../gui"
-	fi
 }
 
 src_install() {
@@ -61,14 +57,6 @@ src_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
 
diff --git a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
index 49505ea74cfc..16b62dea4da5 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
@@ -17,21 +17,17 @@ 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)"
@@ -49,10 +45,6 @@ src_configure() {
 
 src_compile() {
 	emake PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}"
-
-	if use tk ; then
-		emake -C "${S}/../gui"
-	fi
 }
 
 src_install() {
@@ -61,14 +53,6 @@ src_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