gentoo auto-resync : 29:11:2024 - 02:06:03

7 files changed, 93 insertions, 135 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 7f394dfb8a40..609662b9b87c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/htbinit/Manifest b/net-misc/htbinit/Manifest
index 4fe9782dfc92..0941afb89502 100644
--- a/net-misc/htbinit/Manifest
+++ b/net-misc/htbinit/Manifest
@@ -6,6 +6,5 @@ AUX htbinit.rc 706 BLAKE2B af87c49783feaea896d91b84284a21d902ea1f6180a231815094c
 AUX prio_rule.patch 563 BLAKE2B c73dfcd5a63651bb50a57fb2c2aa95add7522510d15c946a364b6f44e6326df6a441aef34e78058d98d0b30a99d8cd0cfa60c24005acbdee1994bea61718ab7a SHA512 57d61fb83c4d6908bbbab4b90ad828398ba1f3b13ac74828caebbc45b763da9dd7e9d6213e1e9c30b9c1da04d8c8e3be73139d1803d7f808c3541774f7a983da
 AUX timecheck_fix.patch 1148 BLAKE2B 8652531c9a908695502e0eb25e4ab55a11f22e35a92c666658ca07b08111b34527b795d4bd2d810a36d5955b907b99e64570475435c742923037515413b6d8f8 SHA512 ec0b1ca92d3f24a26b1c41c7003e185eb0bdd6204b57038632bcd87f80d5e30c803593869c6c05c1ea6eae561f943b20976b2f5210160af0e1ed921a3ff2b10b
 DIST htb.init-v0.8.5 32038 BLAKE2B a21cc92b3a5d7badc3b3c7813549d25668152e3dd9c7c0f54ca14227b9d6e194a727d5ff97380c2795dbaada71d3b54894c8755f9bf80ba684552de14dc8dfaf SHA512 5f54f662e8b30c4efa6c8cac50eeddfec8650aa6f651065c0962c32067ca7ba17266d20860c296bac44d1f78caa50f6c948f3c55d468a76f9ce2069a43d3c6dd
-EBUILD htbinit-0.8.5-r7.ebuild 1597 BLAKE2B 92ebc4a558b506c6f2e950450a3f38b7ad0102a54e9b32b118e45d01fd9e0ae8878ffae58114401a77ecd38a6e596d29c56152c7259baeb626dd967eebe95f80 SHA512 1f55c33e00feea22ef402b6d1c8e5653d7ad3c4617a22044c26107496d72b6f113b0a3bb1f403e059039cc72c0c9b0cc1e14c5a526e0333f0e780a63b3c39789
 EBUILD htbinit-0.8.5-r8.ebuild 1573 BLAKE2B 7c899c81a09f08eea32c7f69e55f19ed06d956da8c56409b1c02858075132a4ad720506a6264b72fc3b9f47c679c3f8e98aabe5e3cc6605fdadfe8e044e9ec62 SHA512 743375b73eb34d4bab613ffcf707fe751743b87380f27e293382433dd0f0276536718827f2f2d3e7937ecc99280ab854c90c5585271ab869d0a21e007b05e35d
 MISC metadata.xml 1023 BLAKE2B 06982afbf0a26ca2b56c5da0dc9f0e4fc5fcf646375a94a2023102211346a6a8cd42ac68ee0bbf69356ac5ec435249ece88d50b92e5e5626c3c7d9fa69b67d60 SHA512 9efa13f33923d52d81abd0e05fc57e6d491e52836e4b8f3a86d2e16f647ce2c70f4a9c9297ccc789d97f352fb07fa524206afcc17a6d05ef190f9a6aea11ee6c
diff --git a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
deleted file mode 100644
index 01719be53c47..000000000000
--- a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2"
-HOMEPAGE="https://sourceforge.net/projects/htbinit/"
-SRC_URI="https://downloads.sourceforge.net/htbinit/htb.init-v${PV}"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="esfq ipv6"
-
-DEPEND="sys-apps/iproute2"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/htb.init-v0.8.5_tos.patch
-	"${FILESDIR}"/prio_rule.patch
-	"${FILESDIR}"/timecheck_fix.patch
-	"${FILESDIR}"/htb.init_find_fix.patch
-)
-
-pkg_setup() {
-	local i
-	for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE4 ; do
-		CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
-	done
-
-	use esfq && CONFIG_CHECK="${CONFIG_CHECK} ~NET_SCH_ESFQ"
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	cp "${DISTDIR}"/htb.init-v${PV} "${S}"/htb.init || die
-}
-
-src_prepare() {
-	default
-
-	sed -i 's|/etc/sysconfig/htb|/etc/htb|g' "${S}"/htb.init || die
-
-	use esfq && eapply "${FILESDIR}"/htb_0.8.5_esfq.patch
-	use ipv6 && eapply "${FILESDIR}"/htb_0.8.5_ipv6.patch
-
-	# bug #474700
-	sed -i -e 's:/sbin/ip:/bin/ip:g' "${S}"/htb.init || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dosbin htb.init
-
-	newinitd "${FILESDIR}"/htbinit.rc htbinit
-
-	keepdir /etc/htb
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog 'Run "rc-update add htbinit default" to run htb.init at startup.'
-		elog 'Please, read carefully the htb.init documentation.'
-		elog 'New directory to store configuration is /etc/htb.'
-	fi
-}
diff --git a/net-misc/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest
index 976a9f077d53..c0613ace5278 100644
--- a/net-misc/vncsnapshot/Manifest
+++ b/net-misc/vncsnapshot/Manifest
@@ -1,5 +1,4 @@
 AUX vncsnapshot-1.2a-amd64grey.patch 312 BLAKE2B 573ec5b25b6829f3702c3f6e1c26160c89edf043ffa59e90e6d4664d51e124dfe688a282ab252f112a55e9eb5df31a2c1e205b7287bc0e8805f005288f29588c SHA512 73065578ac7cc52dbee7043feeea9bab3ec37ed4b0264232fcc531247a685feb41891588141863f861881b982be25db957d0c65ff23775ebcdddeabeaace6d7a
 DIST vncsnapshot-1.2a-src.tar.bz2 70121 BLAKE2B 91e2d1e998f102707e00e5e83e9060fa88f1140b64029564977b93ac5b701be3408540ef76addf4ddf2cccfa973c59f94a127c74f44143c3683e38b0e9359c6d SHA512 2ae53a043c11d02bbb7ff6afc000eef268448643ba1db7b6c5a55fe3e25e65e1b22e64e855d33dfe55b1df04dc57f592e48c44918943642da19f7d06df77027c
 EBUILD vncsnapshot-1.2a-r1.ebuild 1265 BLAKE2B 0472ccfca555499c496d6a2a01c8541d23e46e90a77ae0926ea05586b00b3ce493bc797d481aa24b3cdee4d36bd6349ab3019661481c25486e50c84011448532 SHA512 a5d4c5b74e340d102981c1f1d1592aa644499e50b7f540a6519e31348de6551aa88d8f01c27076e9022bf8d2326470fcfb3a471e00417490e6ee56dd168ccc3d
-EBUILD vncsnapshot-1.2a.ebuild 1251 BLAKE2B 7ba336d3245e3404e4292fa951a836af9ae0cfda144a18fe2dd579d167acd2e405b062651642965a72f48d65be24fa6f24b3e95acbde4e6d8231152ff26f37c6 SHA512 d8f43b7fbe754e2d4ab2d01fe95659106921ea97ba3ecc99365dec168db487c7f0fc357b2099eeaae09078ceffe3bd7398874bd1616572dc27def8e55d3cedeb
 MISC metadata.xml 249 BLAKE2B de21f79d81f60af5286e45d77ea4badf023f24a6bcf35b636ac0cbcb078333fb76e64047f95e386439f2a0481e241f994794f281e6099992ebbe1b8f03da701b SHA512 4629240a2f020dae0d03c273c695cf068cbb9736584caaad9bcb15c175b5d9dc3e8a5fdb9d104c9fa0432b887f16f3d68bee70f52767f6b8125faa7162a269f5
diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
deleted file mode 100644
index c38602a82395..000000000000
--- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers"
-HOMEPAGE="http://vncsnapshot.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc x86"
-
-DEPEND="
-	sys-libs/zlib
-	virtual/jpeg
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-amd64grey.patch"
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:-I/usr/local/include::g' \
-		-e 's:-L/usr/local/lib::g' \
-		-e '/^all:/s|$(SUBDIRS:.dir=.all)||g' \
-		-e '/^vnc/s|$| $(SUBDIRS:.dir=.all)|g' \
-		-i Makefile || die
-
-	# Preserve make instance
-	sed -i -e 's/make/$(MAKE)/' Makefile || die
-
-	# Respect RANLIB
-	sed -i -e 's/ranlib/$(RANLIB)/' rdr/Makefile || die
-}
-
-src_compile() {
-	# We override CDEBUGFLAGS instead of CFLAGS because otherwise
-	# we lose the INCLUDES in the makefile. The same flags are used
-	# for both.
-	# bug #295741
-	local args=(
-		AR="$(tc-getAR)"
-		CDEBUGFLAGS="${CXXFLAGS}"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		RANLIB="$(tc-getRANLIB)"
-	)
-	emake "${args[@]}"
-}
-
-src_install() {
-	dobin vncsnapshot
-	newman vncsnapshot.man1 vncsnapshot.1
-}
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 4106af17e53b..e32a3430c627 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -2,7 +2,9 @@ AUX wget2-2.0.1-stdint.patch 573 BLAKE2B bd2f85fc234a6d019c10212bee2c636c9b42847
 AUX wget2-fix-build-issues-with-clang-16.patch 841 BLAKE2B 055c0e61566fa78360481f618dbcdc5fd65f853c94ac4b5d1e75e43a5be9b6295e9281c632635405eec840a79b6d106b30bf068d7577f21d8d087f6b102f39f1 SHA512 59c95329ee7f779be169c2a9032a36dd49e8c596967ba3a6d0dc12ba3cbd67dab8acccabff7d73126232ee60b699b84ee95253c17b39b47e049134b86700608a
 DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e
 DIST wget2-2.1.0.tar.gz 3867884 BLAKE2B 4bde0b8d8d703f863db10dccdcafe9c93923a6861b973607f7ec2c06fa68921561b41eb049e59ccab4f0abafe5017e15d4131d684ad47b4fa4f6ac38c8772ed2 SHA512 ae1fc267b1c2ee182ee59f0fc34fef238326a20f1ea1c15be6db2c16b70d49e89f61ca937d3e64d214f73ef9646ba4318782ac4210db51bd3d89c55ce4406872
+DIST wget2-2.2.0.tar.gz 4094789 BLAKE2B 20175a91cbddf5f7506d79ba481d7d983df27849fe5e3247f5981873795fbddc786326bd51646366e2bc1ebe64ea4535f19bcd558074c35aac7ee12e6c9996d5 SHA512 b39fb6f65b3be39c0f8f33a337c0417c8b31bf993cddbab1ef5e3dba66c6651ff8ec25d3a01ab5aa632072b14adab06adc4941bdb8e9cbf3b60bdd6f3f059cf1
 EBUILD wget2-2.0.1-r5.ebuild 2101 BLAKE2B ad5a9b30d712ff74aab2341b64acad027c331f968f284959bf4efd2126eae7b09ada5686991415169475e1eb1ca8ad3f63c2285c082982d192566ce7fc30cf42 SHA512 8ed0502c73d3e4da18cb5431305b7f213b0ff718d4afe65d3bf186506696debe429fe6f767e754096dcb5a341f2b66eb26ca5662fd56d4627649a48e52154317
 EBUILD wget2-2.1.0-r1.ebuild 2004 BLAKE2B d5211b88e52e3079711720979fccb0a8a59b4fcdb22b219cfb1a5d97723ace8cf91c412b6706b54e0708fb400bcf1be124ed53c89e80dd6b28ad80991dbfab35 SHA512 f7b31a8d372e129a862a5467509e3c971b72a69b17599156c780231ffc3278b28417c2efbb0827beb832c9cfeb27be42227f7697ef5b3520f25e1bb77e4348ad
+EBUILD wget2-2.2.0.ebuild 2004 BLAKE2B d5211b88e52e3079711720979fccb0a8a59b4fcdb22b219cfb1a5d97723ace8cf91c412b6706b54e0708fb400bcf1be124ed53c89e80dd6b28ad80991dbfab35 SHA512 f7b31a8d372e129a862a5467509e3c971b72a69b17599156c780231ffc3278b28417c2efbb0827beb832c9cfeb27be42227f7697ef5b3520f25e1bb77e4348ad
 EBUILD wget2-9999.ebuild 2461 BLAKE2B 722cd2ecf7ac287d0acb11fa227ee61e718079f5aefb1502cd9554776b5edb240200e4ef4373aca1e827d069848a62836c75373761ac8cd175578394379e16bc SHA512 a231dcdaac8af0f470d1eb54cf5197b0196af4c5ad3e13b2def37ed1d6eb5e52e80dbf760fe372aebd578bed5fb24510be4080b20ea9dae95350e1d0e9f97b1f
 MISC metadata.xml 579 BLAKE2B c79af69ebc4c7486e50182bb2b30883f31243de3b125ef1e152118141989dbcdf64a9e04c8879d05690821fb333583f6a1387198b30ee02be8d9483c6545daff SHA512 d07b10702ee8e38700e171f628a95f4b24748132f8372f9595fbc85345d7e96066c1494a3d216d3428679d52ed2e3a3c0fa50b1e5c41286d0f31348c6646ad9b
diff --git a/net-misc/wget2/wget2-2.2.0.ebuild b/net-misc/wget2/wget2-2.2.0.ebuild
new file mode 100644
index 000000000000..adf3183d13a5
--- /dev/null
+++ b/net-misc/wget2/wget2-2.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
+HOMEPAGE="https://gitlab.com/gnuwget/wget2"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+# LGPL for libwget
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/0" # subslot = libwget.so version
+KEYWORDS="~amd64 ~arm64 ~loong ~x86"
+IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib"
+
+RDEPEND="
+	brotli? ( app-arch/brotli )
+	bzip2? ( app-arch/bzip2 )
+	!gnutls? ( dev-libs/libgcrypt:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	gpgme? (
+		app-crypt/gpgme:=
+		dev-libs/libassuan:=
+		dev-libs/libgpg-error
+	)
+	http2? ( net-libs/nghttp2 )
+	idn? ( net-dns/libidn2:= )
+	lzip? ( app-arch/lzlib )
+	lzma? ( app-arch/xz-utils )
+	pcre? ( dev-libs/libpcre2 )
+	psl? ( net-libs/libpsl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen[dot] )
+"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--disable-valgrind-tests
+		--with-plugin-support
+		--with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)"
+		--without-libidn
+		--without-libmicrohttpd
+		$(use_enable doc)
+		$(use_enable xattr)
+		$(use_with brotli brotlidec)
+		$(use_with bzip2)
+		$(use_with gpgme)
+		$(use_with http2 libnghttp2)
+		$(use_with idn libidn2)
+		$(use_with lzip)
+		$(use_with lzma)
+		$(use_with pcre libpcre2)
+		$(use_with psl libpsl)
+		$(use_with zlib)
+
+		# Avoid calling ldconfig
+		LDCONFIG=:
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		if use doc ; then
+			local mpage
+			for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do
+				doman ${mpage}
+			done
+		fi
+	else
+		doman docs/man/man{1/*.1,3/*.3}
+	fi
+
+	find "${D}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/bin/${PN}_noinstall || die
+}