gentoo auto-resync : 20:11:2024 - 03:02:59

13 files changed, 154 insertions, 36 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 4e235caffc4e..403b580bda1a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 50c9a9b69996..5fee1862405f 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,7 +1,7 @@
 AUX apt-cacher-ng-3.3.1-flags.patch 340 BLAKE2B e9de81bc2a73a24c99fc7f3509d5e94e148e5ec1c4c672c28428aec398344a37b180084f26f7050fc39a92942ffb2a743b87e13dda7b21d9085516c7847e29f7 SHA512 f57cf0f6d74f1326feb2796a92ed22c6e19dcfed923f6c3a130ca82e0a0abd3c7e629ca29eb1512aefd2500e2da75cdffbd32d53c727a1be52ea3d4664f4cceb
 AUX apt-cacher-ng-3.5-perl-syntax.patch 365 BLAKE2B db71cf58c61ef6192f0d2955f64dbbe89ea580c4dbdd6cabc150f5cdebbf383f916dcfc1379e0caa1792be7dbda18898e71fc7a4f1829ae77160dc4a9ca83a74 SHA512 fe933eac743b13974cd7451f9a8fcbd32d6f779b992aaa07526eb291eeb64dbd48050ec08ae141fee55df2f1c415799073a78236c6fa10d5eb12733e2919ca16
 AUX apt-cacher-ng-3.6-optional-systemd.patch 2307 BLAKE2B aaf31601172f378c403dea6fc9f5d0ace9a6bb5f4d1eb2a4cdfd5198c15b59ad5f98663618d2303fd52147de40cfb2f8ac6e0b149ea73e9bf4cdba27c647a14c SHA512 b337dbaf7379e1cdbfab32c93046312e7e69ffebc5229f056c11434ae2fd1248ff94595eaeb0810d7a8a6e127fb663919c5d4311be06e6b0013e057912062aeb
-AUX apt-cacher-ng-3.7.4-gcc14.patch 685 BLAKE2B 28a7ae9dc7d25683d34d6c37afd13e0779e84f9e94f3f727be29a2260bb3cd2d44e392f09488bd01d13993983ef6d3c644f466eb56ab3eaa1a3ff266fe9495d6 SHA512 93ac03de3c772da8d775ef67212ca062e10d61f15462bb6ac303885674a0a0065011513113c930d18f5e69d5f9a146d895c1eb61b4782801f76d5d2c4b455859
+AUX apt-cacher-ng-3.7.4-gcc14.patch 838 BLAKE2B 565e28ab1b6081769ac77df5b6fb0eb90371468a18c1a6c525057bdec20823c4ad794f86e31114739018bff0ae1da79cab6e3bc0adf47cafccb389923977a743 SHA512 f0660c140e54779feeb1005d315bddabed538c6b801737a8706ff0352f68b7276e78011edbbe0136fb4c910517c36b90e0f23043f5fc5adaa319a8a1d644e0cc
 AUX apt-cacher-ng-3.7.4-musl.patch 193 BLAKE2B 2b08c2cf6229473de18138ff0b112040665736ccec1725c056d29b2b6240e7873a194e5234e2dda95761403c893e103ba4a5d03e29e70d77415e0c969505840c SHA512 27e2f88054669c63c6d0d560461ef12514f1e8493f970fdc76bef8cc50d47315b3e61a2613fc30188d3631d563fd238a1f85e19d3f0b08880e17fd53292c57a5
 AUX apt-cacher-ng-3.7.4-strlcpy-glibc-2.38.patch 1097 BLAKE2B eeaad0cf7865e7b8ec461e63d447fd2c212b6f09acddb4fda87a29ad54db2bdde204ff707acfd3387d3ca0e926409556ec6cfb694e095d486f17a6d0612225f4 SHA512 67d010458841b02aabc0ac408b3ce88647837101431a87c8cd57012edc4a076a5c85d43aaf2f4c00bbd7116ff43794d096f4ca06740c467bddd080e4aee9f515
 AUX confd-r2 452 BLAKE2B 36175fbb8305e43139e0a30aca1840c184972e0c1fe61189634ff38184b905d6ecd372bfa8e13b52babba18da0c8f364a6ba66890d6de96ce6970c7c8ff3b2d2 SHA512 4a7cd8ee8125def9290d2e7a369f76308bcf8faf22eb908c974cedb7206d1d02417636cc14ccec9047bd25d7f4fd0d245189353cb2b0266f8c8122e019460666
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
index 345d7d5c80e4..913a18477c84 100644
--- a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.7.4-gcc14.patch
@@ -37,3 +37,13 @@
  #include <map>
  #include <iostream>
  
+--- a/fs/httpfs.cc
++++ b/fs/httpfs.cc
+@@ -38,6 +38,7 @@
+ #include <dlfcn.h>
+ #endif
+ 
++#include <algorithm>
+ #include <list>
+ #include <unordered_map>
+ 
diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index 2ce2883c66d5..298c8fde735a 100644
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -2,6 +2,5 @@ AUX jwhois-4.0-add-timeout_init-prototype.patch 1052 BLAKE2B e8c69a6eb0a8b6c382d
 AUX jwhois-4.0-avoid-implicit-declarations.patch 1424 BLAKE2B ff8be8c49b456e890f5d219c02a9392eda739eb5b227178e10c74e397e14bebfb770ea52da4e491d759b95aa6ae5bf4ea6086a4354fbb91886bdbebcd41678ba SHA512 5338654736da5a7328ea1650c8c45ed55799a107fc17c38729404ce1d7f92a63d5c777993ebd800caeded6e0c31cc7a22e167c08751bd30e6a34762b6cc315cc
 AUX jwhois-4.0-connect-logic.patch 425 BLAKE2B d0896781a15e43a3b0e4e13bad2e9c2e9a6cddca5e8fa1c49b5fd79b73b39292638559a5bcfc7c63b4aa894a5c13dfeac56d006752d580d2532e1351a5d47296 SHA512 7cd437dabdc332cf5068b98a7d87380572f4e94c3fa6554b62377491018deb6aa94e36339069e5628b0965405446f8fcc41ec44c6e4f6ac8e087b06819533c83
 DIST jwhois-4.0.tar.gz 493007 BLAKE2B f578f2a57a95ce78829b859c3135c5ace8431b539bb3447e54633a262996a2d1d3c9802706171437acd325d99cc62773901d7473067307a322b4805d529b0292 SHA512 5d625c3f1031a8eb8ef766ef5d47a8c1a4396d1ad3344fc9449f80dd71ad84aadf21ba67f5c2f99348f732a4df998eefe699fcec4efcadf87f579b70302a44ae
-EBUILD jwhois-4.0-r1.ebuild 658 BLAKE2B 3d45278ca5131f5cff1e6fc078b48f97f717248d5c58ce838a4529271f9e8b696129396d86952a2290bf00bbc18faedec5e65812350ad6de3c4c0f024c05fbf5 SHA512 cd279370a993a4c636d3cf54ab32f1e09db9a1dab398167c3b16d8deae30531048cff759e9af6834920dbb1b7ccf88c4b7c6049a1d7f9c03750d26e48bb160f7
 EBUILD jwhois-4.0-r2.ebuild 854 BLAKE2B ca5ecac1735b3546a3073a35a476f6ec156310b36cc06d96c2f286588a964db303d3caae5c9305f39cfb639a8d4786e0c9d25fb7b36e91f4d173d37c7bc1259c SHA512 ce967d4591e335a52a50efbf0a451100735f675e8dc30c0abcb712f6db38a4451ae6591d2d38bc7c252822847fea393cd0fec85aaa506a7f63e10564ded93b1d
 MISC metadata.xml 397 BLAKE2B aba6ab91f71b858ca2399d55f86685ab4973dc6dd31f7b46f718eac316a65064a774b3d830ef35e1f791236c3a2e8b29ee915970ec85d533c9ba4ceae86f84b3 SHA512 5d7f70ab21dd6d8e7378ccc1b619535cc20fd76ffb61f90a2ef06732f58fa5e91ca2d99dc91ef89c2d7c9b3b1de478757ca40dbf3c0d65c3da23df5bde42e16c
diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild
deleted file mode 100644
index b8d0d0cb440d..000000000000
--- a/net-misc/jwhois/jwhois-4.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Advanced Internet Whois client capable of recursive queries"
-HOMEPAGE="https://www.gnu.org/software/jwhois/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="idn nls"
-
-RDEPEND="idn? ( net-dns/libidn )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# bug 208875
-	"${FILESDIR}"/${P}-connect-logic.patch
-)
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var/cache \
-		--without-cache \
-		$(use_enable nls) \
-		$(use_with idn libidn)
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 16e3da178b07..4474c023c12e 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,7 +7,7 @@ AUX networkmanager-1.48.4-fix-libsystemdless-build.patch 2475 BLAKE2B 3a754ae614
 DIST NetworkManager-1.46.0.tar.xz 7033296 BLAKE2B db190876105d83c8d2ef7e827fa653ab14f9687ab18392600e04d20020d1dc797d3857c9fb05111fcafd18fe477b93947566100ea7113758703842cded71ed40 SHA512 27f234ad5b715ad0ae9d6adcdc91a4499b76fe78d3a5644aced8976588f0e82f2d03daec47589f1313b9802207c784ade67e921d4d2fa3c813cbf727558ad407
 DIST NetworkManager-1.48.10.tar.xz 6085272 BLAKE2B 8f615b1afec72ac600fd2cbe458644c4e83312e76c5ecf0e84484dce60510867350ec1fc2fb68fdee40ae4aca3d9e935ef8e433ea60ebe431b96699c0ce01222 SHA512 baef2ecc7da5c2f00278e8596f47c9304321896f1b79a6f304e27365c89a5fbaac6fbb68433a8fad94eeeffa56561968d0afee1adb24df6a8e6f2dba978cc620
 DIST NetworkManager-1.48.4.tar.xz 6080980 BLAKE2B b5d216e064043e688ce8fc582e4bfae859a3e746fce2bc13f43a871a6886270c75b77cb1c73f4b9c89e89619683a8cdce698cfe1bd249bd68108f02b982dea04 SHA512 73c9399d528b78fe1393ad2015f641d9dcfe8a1134b65a65e051aa08eece6574f44a340d140d1de525000b365370bc2615da0e682b16c2da28dc597961e6410d
-EBUILD networkmanager-1.46.0-r1.ebuild 11861 BLAKE2B dd9f20b84d9323f1456cb71a745af0274138e71df1f5eccd97a77217e7e219d8bb87eaf4ab53d791db41f9edb794c41aae0985a76e9478975f14ae3a3db50a23 SHA512 0421c4a5be084139970ebd020da6fc898b0285865e8bd6d876391dc36c09911dd297c514752f4d700d53bb881efa481b981ed578e622d672f8981030029c6a71
-EBUILD networkmanager-1.48.10.ebuild 11966 BLAKE2B ed5114c321f9772568a4cb7e79494e7954eb63dd27dad8c0b4dbe44326c11699eee8fd6962c3793d6c201e61cb05a6a2317b87e7da3d849eeb636244466c4ca0 SHA512 9adb0dca821341189dcafddc98dc568323a48550ea66185a2ad04ef6cb9173d2d30d4e6ac4c35d72ae13177e5b9e68a8eaf0d3916fc58c7dc460d87e5cfb9ddb
-EBUILD networkmanager-1.48.4.ebuild 11952 BLAKE2B 83f43565c5c4c0ba634a876053ae080880f5d3f4c5a940377a2fecf78845f0540af2324c31e6db42068d0489d25749ed52ab11784fc2344814304f87b0cae34f SHA512 f76480d6ae01f8b63866cee69a81f84d76692c05fd748df4b539fb4bb56f76bc2196057a4ff00a803731cc5ea1d824319be232705732ca088956a7da551a5a38
+EBUILD networkmanager-1.46.0-r2.ebuild 11944 BLAKE2B 8f20550d23c892ac8d30adc98c3ee1e351dfc1e3e31f1e91f8df6c905eab6ea2dee570f65ed4525be1c6316b1f7650dd6f422b0e300524804d435ff84a5f58c4 SHA512 600fea678e8cb7286a449479db9aaa56cc8f97d2c2817a9818cc1e665bd57852a82632f4de340c21b13a8983572e84a5f8a986fe156b4c3b99561c32f4961d37
+EBUILD networkmanager-1.48.10-r1.ebuild 12049 BLAKE2B c0ba01f818e0b85176aa85560c39e6c4ae2e88d4d4fd0d5544ebcff48107f0274476b71bb4bb363ba39d4d0446a6817b53cd3e0832baa9ff41121c5eb4424330 SHA512 88018ac0b0dddf110402042f7b7950876bdfcdede1c9956869da475b3da52b5b253524218b04e14b6b9843eab3c66569d1da9cd9e66717ae45613dfb25b34866
+EBUILD networkmanager-1.48.4-r1.ebuild 12035 BLAKE2B 3bacdcf0b873522021b06eda8ac6c3f0feec4ffd0007c61c6551f247284fd123a93ea0203ba38de3aa0e22378f2052d7999b92ea0f658b738716c15bf79fcbb7 SHA512 a7d0e8ee3c2f001db5fa13d2baf534912c557c4f82ce0e4136e9e4ec8bb8b4513cbf5e7744cdb455113d4af7500a3fc3e1784f099aaa053fd671cf122b08ba8d
 MISC metadata.xml 2360 BLAKE2B 0d95733c3909e35ef555ad32c44e706d48347e6b8a5f7f915831edf7a43376e973fa32c7704325818704b59082fbbb2e4610e075848f09ac7c818d8fdbb94830 SHA512 c4478c41989eca2b777bb59767ce7660d70b261f61bc42673bc61e7e4db528c45f921c384de5454e7f901f4cfdb3cf1303e183397671606ed43c1fdaa59762c7
diff --git a/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild b/net-misc/networkmanager/networkmanager-1.46.0-r2.ebuild
index f30a41bf1845..123afb53ea6d 100644
--- a/net-misc/networkmanager/networkmanager-1.46.0-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.46.0-r2.ebuild
@@ -345,6 +345,9 @@ multilib_src_install_all() {
 
 	# Empty
 	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+
+	# prebuilt manpages aren't installed by meson
+	use gtk-doc || doman man/*.[1578]
 }
 
 pkg_postinst() {
diff --git a/net-misc/networkmanager/networkmanager-1.48.10.ebuild b/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild
index e1de421b87ce..87ea9b1011ae 100644
--- a/net-misc/networkmanager/networkmanager-1.48.10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild
@@ -350,6 +350,9 @@ multilib_src_install_all() {
 
 	# Empty
 	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+
+	# prebuilt manpages aren't installed by meson
+	use gtk-doc || doman man/*.[1578]
 }
 
 pkg_postinst() {
diff --git a/net-misc/networkmanager/networkmanager-1.48.4.ebuild b/net-misc/networkmanager/networkmanager-1.48.4-r1.ebuild
index 0c859a1fbbb4..aff3e4c028ba 100644
--- a/net-misc/networkmanager/networkmanager-1.48.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.48.4-r1.ebuild
@@ -350,6 +350,9 @@ multilib_src_install_all() {
 
 	# Empty
 	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
+
+	# prebuilt manpages aren't installed by meson
+	use gtk-doc || doman man/*.[1578]
 }
 
 pkg_postinst() {
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 3403165d0654..f6dd76a5b51e 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -2,5 +2,7 @@ AUX olsrd 491 BLAKE2B 31844255d3aac5d427ab821a7655201ede53a3ab57ac8da3562e9db473
 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
 MISC metadata.xml 324 BLAKE2B 0e3d7a0154ecc4a0ae6c8f48bc9b28aad1289e1635783f3a74cf753f6392d530823cb1c1e0034f04c50fae65a2ec67892702737d9052a889353f1c0e63fd2f1f SHA512 d43e748039672d6b51690be28db0f6a19e8e41a7a930721cb3c51e0620f19a3ae603a9a35eb9994118a662a312678f38d5a80c6cf7ecd2d676148366ddcae41b
diff --git a/net-misc/olsrd/olsrd-0.9.8_p20241102.ebuild b/net-misc/olsrd/olsrd-0.9.8_p20241102.ebuild
new file mode 100644
index 000000000000..f3615b049487
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.8_p20241102.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+# Snapshot to fix bug #927456 (and before that, bug #735572)
+MY_COMMIT="3653c47b88653be6c5dcf9e8ce3a5efbb69684a4"
+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="gui pud"
+
+RDEPEND="
+	gui? (
+		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
+)
+
+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) -std=gnu17" \
+		LIBDIR="/usr/$(get_libdir)/${PN}" \
+		OLSRD_LDFLAGS="${LDFLAGS}" \
+		OS=linux \
+		VERBOSE=1 \
+		build_all
+
+	if use gui; then
+		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC) -std=gnu17"
+	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 gui; 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/wget/Manifest b/net-misc/wget/Manifest
index 045fb9eeafa0..715f948fa1ea 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -7,5 +7,5 @@ DIST wget-1.25.0.tar.lz 2582072 BLAKE2B 58edd7393b5109804d7a6ce77466d30e1fba3c5a
 DIST wget-1.25.0.tar.lz.sig 854 BLAKE2B 0698971ffdab274ee20d84b84096e9d4bd4a75b57df41643c55304188b3fcce69624a4d7043fb47280a63fb74748c2ce67ff1c6efc929680c8d2aee93498d309 SHA512 06a575b3e16f586c7c7affa2c80b4714bfbcd0aa03305126b16dcc34bd011b1690c71935111cde5f43e0fea214dc11d2da1fb98828c4e913da8c83159d8791e0
 EBUILD wget-1.21.4.ebuild 3165 BLAKE2B aef2873c68139cab5a052e1cb8e6d3fbe717d604e530bf17a2d1eb528035e5e0aae756db61da74ea04bb6ac96b2c163fe05e7da16deac4d46d4656c3b70c5ede SHA512 c22707536d12b991251b4909c4959937c2a29d08a37cc95a7108053a77f5496c61daf14a0fbb5bc814ad6feaeb3527a1a5956e7faaa138e7b19aea3ec5727879
 EBUILD wget-1.24.5.ebuild 3541 BLAKE2B fcf4b10d0e31df16ce83d1a327258e55e32236f843a38a7e56f3ebc7e658dd975b9d8108c1bf999e15559d86ec8cc6c829efd91bd60e2ac0f599bd73949daf2d SHA512 2584de4f5ae95dbb5372f887a98c8e3ac54b004fbaf679256baab49e044a5c30113a9a0ebcb2e01775ada560f2ae903e5d6c7eefa992a26f6849c72cad1f8a23
-EBUILD wget-1.25.0.ebuild 3484 BLAKE2B a44dc6b64dd8cdfaae08ced9d69cb7d48a268278f7daf8183ff4cb434814e5d24a74d884333d9223d2d2537ed83b9fefd19e65810e3a6777e8a9a55ac6e9828f SHA512 d33ce443db629bb5a6c88cf3b7b5f6521f323a9de513f22ffb6c30358dd74c6d44ddc3b02f8db418e2f7188cd33721dd7301c589dccdb00546e44a04f67c219d
+EBUILD wget-1.25.0.ebuild 3479 BLAKE2B 6b07dc5cc65112937ad531ffd93149b347866d074be3f406e054517390a1a6dc341f1ab92f19abce7bcd4c471d11ee48eb15abb5cb3a5d9af8e87f9a14855f95 SHA512 28d16a69a738238fae8e81b0c5a6e8be4c58e96fa417ca1546c6f8ff91913c07aeaa8933d2a094bc5280c486daedac50f5248e0922094a782a01ead16e0e6d92
 MISC metadata.xml 925 BLAKE2B 6a009c4883a765ab687cb5a77339e20bf314e2edc6eb7ca4a2e95296bc2457de9523877df6bc4cd57bd32fdeee182dd356123d49626cb0b321939d37f15c3ace SHA512 cb256297bf62ead8c3841a9186813b0b7230a4078150fc644eb09e94bc7e5588003369a0e03a8530ed5dff893bbac06b2d6d6feec8a20fd9871e4661400e030a
diff --git a/net-misc/wget/wget-1.25.0.ebuild b/net-misc/wget/wget-1.25.0.ebuild
index 9c72b648f3db..042cfc82b303 100644
--- a/net-misc/wget/wget-1.25.0.ebuild
+++ b/net-misc/wget/wget-1.25.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/wget/${P}.tar.lz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="cookie-check debug gnutls idn ipv6 libproxy metalink nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE="ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 RESTRICT="!test? ( test )"