gentoo auto-resync : 06:03:2024 - 13:06:09

5 files changed, 22 insertions, 109 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 484718dfb06c..3c8a40bba2a4 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 9ed334b1807b..33baf7912eb3 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,7 +1,6 @@
 AUX gtk-gnutella-1.2.1-glibc234.patch 1881 BLAKE2B 4f4ce21452694eefcbf2c9e70d4ae1b3279a5c94c194bdef56bc4078d38302ba2901f2c23b8c877d4f3af75dcfad4c8cecf7321f362d841133bca991557d7ffd SHA512 9c328f8d17a1bbda4dcef95e2068823826ed09cd7d17268ab91294eecf10ba2dfd09c0f9bcdce32aa80f3c17c09e4ead1f9c632010155d95b2ed37a513ef656e
-DIST gtk-gnutella-1.2.1.tar.gz 25055800 BLAKE2B 09f68979bc4df130e2b7b4a78017c2834feab1173d6242fe07856be038b9c671609fee7a7ec270fd6f9592a2fb2bfa0bf8a08472da0f41f6e3dc2dfaafd5ed58 SHA512 e53c8e0f7d11f699e9eb77546f3d6ca240ee9fa92e8817af4631250d86714b97eb36fbcd83e46d8429cbd12532c9c9a343a2ba69eba6deda4bc9c5610e98efc8
 DIST gtk-gnutella-1.2.2.tar.gz 26708793 BLAKE2B 9b8c1600914f5679c017929afa6d1f508734b21d95231c15588c64d9b1e9185ddb82ee26478d5d5d34c715fd475ccfe1e65b4b96ed4acc271444d21317013630 SHA512 d4825bb765d9b73b24d1dc7238a31c5e78c9adb7c765b0b913d4fce1467fb3655ac3214381748bca20fd3e02345ba0583d591e2177299d5130951808cd7bd325
-EBUILD gtk-gnutella-1.2.1-r1.ebuild 1996 BLAKE2B db620fad11b2276476a3e74c21c4cd5827b36308d6d8763595696aed0fd65543984fdb67c73102591577377708aa0c0219cbcaa197a5a6f20ddcaedc7689486c SHA512 43a0b3e7ea17c098f802994d0f7b6f886f054ca0d9afb79b0f1cc6066bb2f4fc2535b151c05f501ba1e785cba5e8b3cb3ff6ae731069a021388972be66cae467
+DIST gtk-gnutella-1.2.3.tar.gz 28346798 BLAKE2B a502ed7bc8cae8355df3c4b7f0e85c06076d9e6703060299f4b6d01680c0822a5269faa4854e6044134d9cc3f3819ea2a3a2fccdf2e44e49b357f29191271e55 SHA512 fbd7aa528aff95dfcfc4b4620fb0b788301e31286208accbb6eada93cc8ad83c4f7ed3275a5af6e91b49aebe6ba836b4094036e79602235d5fd6161ba797339a
 EBUILD gtk-gnutella-1.2.2-r1.ebuild 2090 BLAKE2B fc5d76e585aa149028f897bca113cf5e695ba1b509a05aefb26c49217393bc455d0385aeb2590f56316f68d2ede2432c05d5e6dc31459ee524a43d167ff38872 SHA512 4180cc4f37966496401ac49c9ab2caa4236a287bee6ffe9c934b1ca87f63daac6209a0a7df846adf8e976f4a8d2a797e1359ce5334e6947014629b382a153157
-EBUILD gtk-gnutella-1.2.2.ebuild 1949 BLAKE2B d162cfd393c49841539c3ddb8139c9988bdad626adc24bd823580519d491b708c7adaf8b9dc03f20d798cb49236b47b90738fb2607b06417865d24de7f721823 SHA512 03f0c604145d4ee9d1bfc1e738420450cfe316f4e8220ae0c774a514db9c6508b321fbce61d13a7949c0ba53a544bb0dd95ebda8127c953248044794b5b2406b
-MISC metadata.xml 300 BLAKE2B e9ffeb0b3d0f0d277f266cc32ed360a56a1cc6c3201e309d091098f476a19fe534d224c8c941c3f954ef6c4b5b27cd526bd834b893a39fbb5ada5bb6a776e689 SHA512 d54f62330468cb7be81b4f1d465196cf17e96f6688e7c754b9c4a01445eb0228e88726624f0087307a107f00181fcc9114fb8df94c8cb8620d9340cf38f7e9f0
+EBUILD gtk-gnutella-1.2.3.ebuild 2093 BLAKE2B 347b3024e4542570408ee8fcd4e347799886d854ac3236d8aa6371b948aa9ddb0ff8ad4f15e31ffe5838909c270e828d4437c768df40128830b8c73a9e51a700 SHA512 689910d552ec580c3469a2b203bdbc714b0519680042b80859e2c0577f2b8ca6f4675fe7c9697e7de589e7920c6b33477c4f55de703b0535f964f45fa86269cd
+MISC metadata.xml 375 BLAKE2B 4da349fbdd9a52e3ba88d2e48b52b4d8cf640180b246cd29385bb0f6edf6c0854ffc378150282dca1619e3344ea6ab4d85ea6948a5dab8e35e81ba75003604fc SHA512 6352413c72447697a44fc5774972c06d2a76c276c6da4a7d408d5901fc4614bcef7e1e739f7dc3357609f7c62091f89b1b67f4d2dceafa01d5696beb7de3bcce
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.2.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.2.ebuild
deleted file mode 100644
index 821479e147f3..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic strip-linguas toolchain-funcs
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="https://github.com/gtk-gnutella/gtk-gnutella/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="CC-BY-SA-4.0 GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	dev-libs/glib:2
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
-	dbus? ( >=sys-apps/dbus-0.35.2 )
-	ssl? ( >=net-libs/gnutls-2.2.5 )
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	filter-lto
-	strip-linguas -i po
-
-	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-	for ling in ${LINGUAS}; do
-		echo $ling >> po/LINGUAS
-	done
-
-	default
-}
-
-src_configure() {
-	# There is no option to turn off optimization through the build.sh
-	# script.
-	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
-
-	# The build script does not support the equivalent --enable
-	# options so we must construct the configuration by hand.
-
-	local myconf
-
-	if ! use nls; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if ! use dbus; then
-		myconf="${myconf} --disable-dbus"
-	fi
-
-	if ! use ssl; then
-		myconf="${myconf} --disable-gnutls"
-	fi
-
-	if use gtk; then
-		myconf="${myconf} --gtk2"
-	else
-		myconf="${myconf} --topless"
-	fi
-
-	./build.sh \
-		--configure-only \
-		--prefix="/usr" \
-		--cc="$(tc-getCC)" \
-		${myconf}
-}
-
-src_compile() {
-	# Build system is not parallel-safe, bug 500760
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/bin
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS ChangeLog README TODO
-
-	# Touch the symbols file into the future to avoid warnings from
-	# gtk-gnutella later on, since we will most likely strip the binary.
-	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
-}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.3.ebuild
index 29b70da8bd1a..5b8114f35cac 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.2.1-r1.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.2.3.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic strip-linguas toolchain-funcs
 
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
+DESCRIPTION="GTK+ Gnutella client"
+HOMEPAGE="https://gtk-gnutella.sourceforge.io/"
 SRC_URI="https://github.com/gtk-gnutella/gtk-gnutella/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="CC-BY-SA-4.0 GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="nls dbus ssl +gtk"
 
 RDEPEND="
 	sys-libs/binutils-libs:=
@@ -26,17 +26,19 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-glibc234.patch" )
-
 src_prepare() {
 	filter-lto
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+	local ling
 	for ling in ${LINGUAS}; do
 		echo $ling >> po/LINGUAS
 	done
 
+	# bug #738504
+	sed -i -e 's|share/appdata|share/metainfo|g' extra_files/Makefile.SH || die
+
 	default
 }
 
@@ -77,7 +79,7 @@ src_configure() {
 
 src_compile() {
 	# Build system is not parallel-safe, bug 500760
-	emake -j1
+	emake -j1 AR="$(tc-getAR) rc" NM="$(tc-getNM)"
 }
 
 src_install() {
diff --git a/net-p2p/gtk-gnutella/metadata.xml b/net-p2p/gtk-gnutella/metadata.xml
index 3fa6a1a30d53..dda0bfd39acc 100644
--- a/net-p2p/gtk-gnutella/metadata.xml
+++ b/net-p2p/gtk-gnutella/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>graaff@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gtk-gnutella</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>graaff@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">gtk-gnutella</remote-id>
+    <remote-id type="github">gtk-gnutella/gtk-gnutella</remote-id>
+  </upstream>
 </pkgmetadata>