gentoo auto-resync : 09:03:2025 - 01:48:35

3 files changed, 3 insertions, 128 deletions

diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index f6dd76a5b51e..0825c30666f0 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -1,8 +1,6 @@
 AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473d786c1e9acccf3512ba437d203798114ea1e9eb1fa79f4e5c6eca977b7b1357c2e668e SHA512 26329da5360bd25dacea3fde8c025f0bc34203970d2e75b47157fc0c4a3873cf6e7faa93c0a5a51bf20618846135ab18a09b6157521c3199c0667f969d491c4d
 AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625eb05e62338efce126fe06e7c59f021848ba12247d35196864496cab3ac9414bdd9cddda54ea6fb5deb2360e2 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791
 AUX olsrd-0.9.8-clang16-buildfix.patch 1391 BLAKE2B e7f7a94b02835dbd174d76924e48c18788e3900009cec448a8bb55d110843883a60a137fd7f4dede8f9df1d22f59b1d35d837386fcb89db37111f6f8fd677166 SHA512 d74744373de6db07b1592bb49f4fc0bb941bb195c7e639e85bb5dac1e8ce520c1bb383fcfd1f8844ad1765c3d4527650f4e032569d8d2cc6a66daf98f2cc2f2e
-DIST olsrd-0.9.8_p20210612.tar.gz 14446761 BLAKE2B ef841fcf81ae25acb3c47d70f15e34c614b17c28688e0f718aa45ebabea68844f825a4187bbf5468daa4763c8a2b8c87f5f5a502ce0c5fde1b940f9aa3c6ca5e SHA512 466b762ea1f9ecc4ded3298700d1786b893d87fbcc2e457c75f5adfaaf543e6cea5ab2e63d34814a7c2f65cab895fb19c4cb5a7ec5347b13d0e18703a641126e
 DIST olsrd-0.9.8_p20241102.tar.gz 14463841 BLAKE2B a63302f7102c4e9418d1d3db6d3bbb68e4567a8791c6043f33cf9258a236748b5a36d6a66d6519dfca994115b4c2cd7f236e05a33b309928e3e83788c60aca3d SHA512 f8209e20b358458668412185960b1234fb1e3855c1600b0b0996709443c716554684f07e165d5b061d8fda488dca6aab5fcb2563674de7104cd31e369b0ac03a
-EBUILD olsrd-0.9.8_p20210612-r1.ebuild 2767 BLAKE2B 8fa034cf752742532edfca42a4a27c8f2780ddcd7a984ed2f423839a2ae59bd0431b0efa8bf38333b00c3ff1a501c4c2cb7698699f1d9bdce6dffab8ffefcd93 SHA512 a7aa59c1e8c0202232ea697cae00c720a4344609e1de81787adae96c725121657fa52cf39211c5fbf5231b17755795ecffa187515b85c194a3967af36fe7eb34
-EBUILD olsrd-0.9.8_p20241102.ebuild 2746 BLAKE2B 5ed82ec2ee79b417b9d5e1f588b2ec0acea92428365245bde34c964a09cff97fce345d3c17fe013085b8135751c4e2ed79a62307193e2ff9e4191a280064a0dc SHA512 6c8ac2c603bffb9be9acd7a9cd9dbc5a22d7b48ade40e7bee4ff89ab56c94f3a01267c489adcedb0deff965be1bcb9db2096cb11d839fcdbcac1f9ba464488d0
+EBUILD olsrd-0.9.8_p20241102.ebuild 2745 BLAKE2B 64c69748dab6167ad2139360659e48ab7c3a6c64fe3240230474082762db586dca298923c2dcf65e836b9274dc208ae47cab6aab3404aed8f50d8f1c576b59d5 SHA512 55f83094262d5fb0fffb8d246fb6596a9d5b87fa257b4388daf961eabab0980eb1a558948cc0ab583b2cb657c1f9165d8fc295f15bf8caa3509657ff3e7bd91a
 MISC metadata.xml 324 BLAKE2B 0e3d7a0154ecc4a0ae6c8f48bc9b28aad1289e1635783f3a74cf753f6392d530823cb1c1e0034f04c50fae65a2ec67892702737d9052a889353f1c0e63fd2f1f SHA512 d43e748039672d6b51690be28db0f6a19e8e41a7a930721cb3c51e0620f19a3ae603a9a35eb9994118a662a312678f38d5a80c6cf7ecd2d676148366ddcae41b
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
deleted file mode 100644
index 78216e9c4d92..000000000000
--- a/net-misc/olsrd/olsrd-0.9.8_p20210612-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-# Snapshot to fix build failure with >= bison 3.7
-# bug #735572
-MY_COMMIT="4973feb538b5b98b9d8ac2f8f474202f6d73de78"
-DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
-HOMEPAGE="http://www.olsr.org/"
-SRC_URI="https://github.com/OLSR/olsrd/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-#SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="gtk pud"
-
-RDEPEND="gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	pud? ( sci-geosciences/gpsd )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
-	"${FILESDIR}"/${PN}-0.9.8-clang16-buildfix.patch
-)
-
-src_prepare() {
-	default
-
-	# fix parallel make
-	# respect AR
-	# verbose build
-	# fix default prefix, bug #453440
-	sed -i \
-		-e '/@echo "\[/d' \
-		-e 's|$(MAKECMD)|$(MAKE)|g' \
-		-e 's|@$(CC)|$(CC)|g' \
-		-e 's|@ar |$(AR) |g' \
-		-e '/^prefix/s:/usr/local:/usr:' \
-		$( find -name 'Makefile*' ) || die
-
-	# respect LDFLAGS
-	sed -i \
-		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
-		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
-}
-
-src_configure() {
-	if ! use pud; then
-		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
-	fi
-}
-
-src_compile() {
-	tc-export PKG_CONFIG
-
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/${PN}" \
-		OLSRD_LDFLAGS="${LDFLAGS}" \
-		OS=linux \
-		VERBOSE=1 \
-		build_all
-
-	if use gtk; then
-		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
-	fi
-}
-
-src_install() {
-	# See bug #715392 re LDCONFIG
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \
-		LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-		OS=linux \
-		STRIP=true \
-		LDCONFIG=true \
-		install_all
-
-	if use gtk; then
-		emake -C gui/linux-gtk \
-			DESTDIR="${D}" \
-			LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-			install
-	fi
-
-	doinitd "${FILESDIR}"/${PN}
-
-	gzip -d \
-		"${ED}"/usr/share/man/man5/olsrd.conf.5.gz \
-		"${ED}"/usr/share/man/man8/olsrd.8.gz \
-		|| die
-
-	dodoc CHANGELOG \
-		valgrind-howto.txt files/olsrd.conf.default.rfc \
-		files/olsrd.conf.default.lq \
-		lib/arprefresh/README_ARPREFRESH \
-		lib/bmf/README_BMF \
-		lib/dot_draw/README_DOT_DRAW \
-		lib/dyn_gw/README_DYN_GW \
-		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
-		lib/httpinfo/README_HTTPINFO \
-		lib/mini/README_MINI \
-		lib/nameservice/README_NAMESERVICE \
-		lib/pgraph/README_PGRAPH \
-		lib/quagga/README_QUAGGA \
-		lib/secure/README_SECURE \
-		lib/txtinfo/README_TXTINFO \
-		lib/watchdog/README_WATCHDOG
-}
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20241102.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20241102.ebuild
index f3615b049487..0d4168d7c869 100644
--- a/net-misc/olsrd/olsrd-0.9.8_p20241102.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8_p20241102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gui pud"
 
 RDEPEND="