gentoo auto-resync : 25:11:2023 - 10:31:10

7 files changed, 71 insertions, 96 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 29275589385c..79880f9d6f20 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 4447211cd550..694cbebd8a39 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -2,5 +2,5 @@ AUX libmicrohttpd-0.9.75-fix-testsuite-with-lto.patch 2078 BLAKE2B c3a7882d6e340
 DIST libmicrohttpd-0.9.76.tar.gz 2199858 BLAKE2B 2c2de77d731ff130bb1491733b91e9e0b0c68bc30ea1a826f7f1d97aaf83fa7f6bec3c219f81c5293de72595b26d1e6eb66cdd4bfe3b16bd37a10e3acd3c6446 SHA512 9ff8a837892142376eaeaf50c0b0dba76697d0ff44b908434cba8db4324c57dfb8bbcc1a922b97d825891ac10f50693dee9388531856e0fa81fa2cfeac538581
 DIST libmicrohttpd-0.9.77.tar.gz 1896679 BLAKE2B 09a07c7da77d6072e5aa0fb121aedffb66b6cfdb2da30d1809583469282365832beb935417e779ddb31876949358d25c10bf79616079393503ca5860d88ac052 SHA512 001025c023dd94c4a0cf017ed575e65a577b5ce595e7e450346bfb75def77eaa8a4cfbeffb9f4b912e34165c2cfca147c02c895e067a4f6c5a321a12035758a5
 EBUILD libmicrohttpd-0.9.76.ebuild 2141 BLAKE2B 6fef5583a9de3e782e32f8cea3bbb77b6e101330b1398cf7317abaea16be559d0b15e9623afa5fc9125cdef5f5a9c956b4e1a0a3d26349ed358f7dc032d27d02 SHA512 b4e76ed574f2b5525aeba67f31ca0b621be1117171729ec31b2e75ac701d9afac355413850c932da14ff8883ddb61f54bf43bf1ae7e99691ad79dfb1988d26dc
-EBUILD libmicrohttpd-0.9.77.ebuild 2071 BLAKE2B abfea1ceee04aa5ffac75663c97b1518cd38a0a1c82822f2aeb1ce7dcd615e0a3f8cfa0d098239c746421835f3a0ae9bc35495fba52daea9f2a12f5d5c318475 SHA512 053edc3f6da4ff99de97f84e5592b6c780ede3c6d49f0c9710332c112ddeca4fe9f7f466104be6cff9a74de3fdbee821cdb311f8214171706c79ebf6f1f179a3
+EBUILD libmicrohttpd-0.9.77.ebuild 2069 BLAKE2B c1705709ae161e7b32d3ff8044d9fe81d8fc752cd62ddb426a85da8176ae2bcbfddbb9816382aa209c9ef188b0c1b1c0579497f18c93aea9a75387dd535cb0b5 SHA512 a0ad43d2ebc6c647b5f098c0cb31ed457014e9496958035e29e6143951baf067c9c0f254982acaeac07f128d696b17a3eaff2cda55663dfee3d0933fd8635e12
 MISC metadata.xml 739 BLAKE2B d56bb58c6d6347fc17894e8f7a5d287fcbd99f613b47fd4e589e992eb3726b55e4cc0218267db884c6e1c2006a2acad9f677a9681e73eb4498b61bd9558dd246 SHA512 b8643f623f3b874e9ff9d6ce2c9f5d0ddee1722fbb58f4e5250e1a8a784295b0f88a36fc78f15047ec2447b7fafd3d3d3fc1394ca40c9944a306d730fa48644a
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild
index fd1fbe4258f4..d0eed498d5a5 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.77.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+epoll +eventfd ssl static-libs test +thread-names"
 REQUIRED_USE="epoll? ( kernel_linux )"
 RESTRICT="!test? ( test )"
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index 1cbdb7aa4180..3e56c33b0428 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -4,4 +4,5 @@ AUX liboauth-1.0.3-openssl-1.1_2.patch 750 BLAKE2B cf07dc1722c41f55e1ea5d241c91b
 DIST liboauth-1.0.3.tar.gz 504950 BLAKE2B 56cf10574af58995de9bf86bb7f00becb360cc899bf1ddb23804820d63ae2c7af29aa29031f68ce79a6cc441cbce27aebf5f1c9dfa029243d7732592d03620c7 SHA512 5a13818dbb3e0df76f7a3fde451eff4f90c9bebfe2076a294921af0c07c2b0789f717f0f862ac6961562d4227e016dc198ddd7efb9c7ac599c3bfbcdb2ac33fa
 EBUILD liboauth-1.0.3-r2.ebuild 1592 BLAKE2B 6c76cf5af8ca1ac43da32d47ffe97ff1070d5912d96bbcfc5c250b9d3ece6cd8200059a62e9753249cfba239ff7f1abdc63e3c5e719dafd5005e4c9f8e35bd52 SHA512 a9db5e954ee658f867cf9cfeaac39610b367118c6afd75def4dcc8df0994d77e647da5f9ff77a8453b15af5c5ed7ab29f02310dcda599933311a7591cf3e6b14
 EBUILD liboauth-1.0.3-r3.ebuild 1748 BLAKE2B f2c3ab26714866cfebf548d00cbc151a6416134cd0b1f81fd53b032d3d31340a3986b591616e979955ac8592f265c099720cc099e00628d2dd5bf152839d1c71 SHA512 89718289454f802965b114fba901413e27d1776c05a0e5d5b61cb267562faf1dd4f73ceab08f2b7cc84fafcae80766347c9ea5a95e4ea9686b2a17d163cd25dd
+EBUILD liboauth-1.0.3-r4.ebuild 1480 BLAKE2B 9b9ce8c03628931b7368b53f95b5d2a4a7a6532205dbb08f3b5cea94d6aa7a8eb75e9d084992fef581fd03b57165ef62aaf3453135cb15245d59c1758fef5eaa SHA512 3a4a58afe900ae11fe78f8b5f4ea0122c38d79071d0b024ea72a43a5e4bfe29a7aae3dce0c8bb8ad6f77480da3c909af758f10c74c8af2c72948a038488a9e81
 MISC metadata.xml 880 BLAKE2B 7d21173fe9d5aa67de1cd75f2055bd686ca7223ad58761cc79241e88e390696fa60abb32c845e51a827720d281963258b41661c0757ba28211b7a0f9055d8cad SHA512 09d4eff65caa5df8b6b60454726cbc0725527d823d337162b06d35476d54569b5e324e920a4c658dbb6c7d0db516e587903aeb6701f01206b7fb766081f11e92
diff --git a/net-libs/liboauth/liboauth-1.0.3-r4.ebuild b/net-libs/liboauth/liboauth-1.0.3-r4.ebuild
new file mode 100644
index 000000000000..1d65ea10de65
--- /dev/null
+++ b/net-libs/liboauth/liboauth-1.0.3-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="C library implementing the OAuth secure authentication protocol"
+HOMEPAGE="https://liboauth.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="curl doc"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.1-doxygen-out-of-tree.patch
+	"${FILESDIR}"/${PN}-1.0.3-openssl-1.1.patch
+	"${FILESDIR}"/${PN}-1.0.3-openssl-1.1_2.patch
+)
+
+RDEPEND="
+	>=dev-libs/openssl-3:=
+	curl? (
+		net-misc/curl
+		|| (
+			net-misc/curl[ssl,curl_ssl_openssl]
+			net-misc/curl[-ssl]
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+		media-fonts/freefont
+	)
+"
+
+DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README )
+
+src_configure() {
+	local myeconfargs=(
+		# Upstream recommended NSS in the past for licencing reasons but w/ OpenSSL 3 that's
+		# no longer a problem, plus curl >= 8.3 doesn't support NSS anymore.
+		--disable-nss
+		$(use_enable !curl curl)
+		$(use_enable curl libcurl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		# make sure fonts are found
+		export DOTFONTPATH="${EPREFIX}"/usr/share/fonts/freefont-ttf
+		emake dox
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index f6ac3db72687..ac46649415d0 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,8 +1,5 @@
-DIST libpcap-1.10.3.tar.gz 951869 BLAKE2B 3614042f7d8cd5a25221f52d2ed09f9f44643cdc0901ff21041ddb7ba85193c667036f7d989c8b59e6e205d630e062da46533110914dd287013a9ff80b31e97f SHA512 57bc07cbc8c326e203ce10ce1eb9f55760fc33320718d8643c65a68949334291877dffcf19af5f61eb9b4eda2d8ffe7bacee38363d2d6536cc85ae81c851684d
-DIST libpcap-1.10.3.tar.gz.sig 442 BLAKE2B 30f0053bc05564fd06aeac751d85eb4838c55c783a0eed450f4de238391c87b8915378f4dc679a14276c9e5e17e9bc74b861241a0a0e86bb22dc2680552f43db SHA512 dc5ae51a96f9dfc570009a5c711a1e4eca012e99d6eb7af3b35c5636199b3273e92a657fdf85688650c093cc9b6c435ba1e9b84100469b2604b8d3125613b4ab
 DIST libpcap-1.10.4.tar.gz 952153 BLAKE2B 05a7eafc1e1817f7844008db89d8fb10cd2525c22f7ee6c9e3d582b14229412f38ccced5e9d80a96dd459ef9eab12eccb5c1dd4978ddc9f66267469212005e4c SHA512 1f6d6ddd07dae7c557054cb246437ecdaf39d579592a5a6bdf1144eea6cb5a779ac4ca647cfed11ec1b0bb18efc63b845444e497070bacefaaed19a5787ae5e1
 DIST libpcap-1.10.4.tar.gz.sig 442 BLAKE2B d0eb5da9a57003848b24d458e50a201d0bb8876a12e63f6627bf9dc1a784e780610cd0c858243cc75a63999b40bc64507b078777ae844ede7c07eef9f4f9e0d5 SHA512 34aa401c2e162d708c61b78b445af2fe4ddc0e57de9124b5cc3a05679ffbc3834088160f83892d827e25c65b33313fe71aa73c2de09935d387252ab315ca5ee1
-EBUILD libpcap-1.10.3.ebuild 2207 BLAKE2B e7ba317e3a01518f10b86f4bf55584f2cfd1ebd4ef96c28370e8998ee0a3395ffbaba00f53a09dba5906a0172158b6dd0851a82ffa280b271f196adbd476697c SHA512 6e59aa1cc207ec930d817e340f6af1c2b6811fba5ebb78b03ff59bb213dff38dea62f4d2db364afc1180e0565ea973adf4fa7e5da40eb9789964c34570eabcb9
 EBUILD libpcap-1.10.4.ebuild 2207 BLAKE2B e7ba317e3a01518f10b86f4bf55584f2cfd1ebd4ef96c28370e8998ee0a3395ffbaba00f53a09dba5906a0172158b6dd0851a82ffa280b271f196adbd476697c SHA512 6e59aa1cc207ec930d817e340f6af1c2b6811fba5ebb78b03ff59bb213dff38dea62f4d2db364afc1180e0565ea973adf4fa7e5da40eb9789964c34570eabcb9
 EBUILD libpcap-9999.ebuild 2215 BLAKE2B 557da84e072969dcef7befb399e1aa4ca46b2de344b2e93e8682436b83423d09ab39b57cb0fb17d4dfa36e903ec7a5fd83206d9a993c429acabf0713970db205 SHA512 97c42286f3131c79f7fdb686872cf68e8b5d468a0d90221c4b1fd37cd10b6931271e8353fecbb34015f9ef896fb2ce43ddc1256e4e7f9a7325807ad621966baf
 MISC metadata.xml 811 BLAKE2B d3c9d3d8ed42bb512b1d1608076d19ee7f3d3f06f5c622bfbe2f4ea1326397bd03fb480f4c01caf8c367b58a3f466f0b94b5e94b14c9d66cc7cbbde3c70651ec SHA512 bbef3e91d4958ec7070871f176aef2934e15d6bb45a45249dbd903b7dc108931c48df691df5810ad0e95c6bca2be707f88646b79b0d42a4a3c8966b6d0918dfb
diff --git a/net-libs/libpcap/libpcap-1.10.3.ebuild b/net-libs/libpcap/libpcap-1.10.3.ebuild
deleted file mode 100644
index 5d183cff7e97..000000000000
--- a/net-libs/libpcap/libpcap-1.10.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
-	inherit verify-sig
-
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
-	rdma? ( sys-cluster/rdma-core )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	sys-devel/flex
-	dbus? ( virtual/pkgconfig )
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-src_prepare() {
-	default
-
-	if ! [[ -f VERSION ]]; then
-		echo ${PV} > VERSION || die
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug #884275
-	export LEX=flex
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable bluetooth) \
-		$(use_enable dbus) \
-		$(use_enable rdma) \
-		$(use_enable remote) \
-		$(use_enable usb) \
-		$(use_enable yydebug) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-	use test && emake testprogs
-}
-
-multilib_src_test() {
-	testprogs/findalldevstest || die
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}