gentoo auto-resync : 14:05:2023 - 04:00:22

8 files changed, 124 insertions, 20 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 78068432c19b..d02deec3160a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index cee42c46dc4b..4757c4a4b55e 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,6 +7,8 @@ AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba55
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.6.18.tar.gz 1081928 BLAKE2B edfaf02cdd3b13930d473fbc4475484602b70bca323f28636b1770780be34fdb325c70d0b0ba7f8d92233aab4dac8a5537be84276489be6a803e1d93d1dc34ab SHA512 85e5a5e7c901b02158ea20cc58f2e7e6ba4806c40a0105185140b31fa40f3ce0fc704f6f17ea4a425a9ff543f9d30092aadbb202ea4ca46476c151e65eac97e6
 DIST memcached-1.6.19.tar.gz 2599941 BLAKE2B a66eef916b1d540558cf6487363b95a4228784d921bc0987da803c8d3897ad2ef22ef9949d95251b92b98390d900d4ca26a88862cbf33b8e5d624f3f32cb00d2 SHA512 60d93065e0ef2b17e9da5370a497a4fbfc64c0af70e14fdfdab60c0c94c0b19e30da31d615e19565474c278141a4cb401c65fd79bd70947dd96a9fee81824a74
+DIST memcached-1.6.20.tar.gz 2615902 BLAKE2B 3baa0b2c72619104f43dce6e19b4ae7f54da8342dbdebc06bdd03b5c63bc0133bed71800d8b890d7eb6745a19799fdfd2f1d9f1636bc109ad8827f828639f304 SHA512 518784e7ea1f919e3cd67afe394c9435b18f63b612e528d12f554a806ee479139db08ee8ab8e176ee0e88cee6e732cf311fbe6942fc0ca5b1a2286638e1cfcb9
 EBUILD memcached-1.6.18.ebuild 2975 BLAKE2B 1ddeee044758f6c594acfbfb8ceb825fc1d5fa9a35c895d8844c31f9ec5224a3fec61f0478c5fa633f0a7fe787eece323609542db13cb7d1db35c27ae2b5648c SHA512 eed2bfd686b15c2fe5dd400a614080a645fa545d49f3b49f687c547300072a9b82eb5a2beff213e2bda5e860a620edca851258f5ca5b0e5201ebdb9e81d32610
 EBUILD memcached-1.6.19.ebuild 2975 BLAKE2B 1ddeee044758f6c594acfbfb8ceb825fc1d5fa9a35c895d8844c31f9ec5224a3fec61f0478c5fa633f0a7fe787eece323609542db13cb7d1db35c27ae2b5648c SHA512 eed2bfd686b15c2fe5dd400a614080a645fa545d49f3b49f687c547300072a9b82eb5a2beff213e2bda5e860a620edca851258f5ca5b0e5201ebdb9e81d32610
+EBUILD memcached-1.6.20.ebuild 2982 BLAKE2B 2eaa1cbc10cfde4ad6c8ada1c300a6969928db4dafc11af6b400026e8e57481e062822de1204196c9d8a84a727846bddfc087b4defdbd8c14d8664cfa6054648 SHA512 d9477a08513a46e775ce4e361ba6ffd346c09e4e05177e2846b6e5c7760e3db238bb7f30b57da8e77482b0f0a3031d66a92b2a66dafa06ab7ee3ee63c4db8688
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.20.ebuild b/net-misc/memcached/memcached-1.6.20.ebuild
new file mode 100644
index 000000000000..0987a83cff6b
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.20.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )
+	ssl? ( >=dev-libs/openssl-1.1.0g:= )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+	eautoreconf
+
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl) \
+		$(use_enable ssl tls)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 33933d3588b0..4d8e5324e437 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,5 +1,5 @@
 DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e
-EBUILD wget2-2.0.1-r2.ebuild 2144 BLAKE2B 261592f8cb07ca3232b2d1add37796aa7ad5fe902f54c1dc223e823dc481335cf066bd80a151d1cb6db9dffe18682dc7e84c8f6d846c96d91f0f448ee5374e65 SHA512 37886ad3419751936975df3e6fc0084f6931b562e3e3806aacfd50d8bbaf7de847960c314e396eac9844aa908fcb319fd989a04daacff854f57d52e86ae31aad
-EBUILD wget2-2.0.1.ebuild 2743 BLAKE2B 2e9769b9e26137cad9051596dc48daf8a85cbc12bb02cb576f860d9f0c43fb647b7eabae92d886562bdbae3e52aa2b1e9e17527cdd605c7a83751d6fac32b2aa SHA512 e800b116cb7533fca998c8957bcec9bfd86ad02f606a40ab11e08f7849f0f7d4095c95730e3c3b4c6197f990c4510b94674ed3514d1f0bd26b80adb84760df16
-EBUILD wget2-9999.ebuild 2547 BLAKE2B 5d9a5ed2722ec403207722567476ae3af8d169001492063f7967bfb4ff615b4bfda888a333c9ed46e440c9d24aeaac7a09b9c1f33ac03b213954739a456ae143 SHA512 ef8a7260b786e45474f8de096199e5a7ee2222954ec54f93b2b2c014cf10c00eafef1381f5d2b3952a0203bb7c3e6fd6f4d9071e1217ca1c192cfabacea76db3
-MISC metadata.xml 834 BLAKE2B 8eab169590bc792f2063eec8dea70a83a9ba7bd4f363bd6c707ab56f183bffa90008acec04cb18e2aaff9a94195c7e578ea986153a52ca6d40bc7054f37cbb5c SHA512 b565e77d2c6a21178f67d26136e08a3a5eda96786dfea254998a74c032c1864983a1a2757be3b8a9bad733909e85640d1fae859bfe4b7a2e6bb50e2f570aa152
+EBUILD wget2-2.0.1-r2.ebuild 2055 BLAKE2B 0576f5e248d77f224d1dd917c9b28e8eb6476e04ae564b79e953f293acaf7502bde8b1d5b99ab268f716695ba0fbb66617cbaa2b81a78632415b079391cc61a5 SHA512 9053e8ebb0e5c445fd638c4a149864946f126e6f9e91f67615420d5f6bdc71246bdb8a3b229319d801f66d9d8743036f813b9c5722ca83feeebf2bbce5919d88
+EBUILD wget2-2.0.1.ebuild 2654 BLAKE2B 3feefaf562ace459b805ae2ffac5de2149cba905deae795b69412704b50bcba37c58e03aecc42f1c0f5d0d07d9fa75e24db4e1b517597e56e6fc6d15cfaad03c SHA512 de9c5db375389484d8129a758c0b0b2c089fcb8b02e9170a1042af4408f0cc9cff4472608065dc586c45e780bcf0b9cd3a7657b8cf6e130945f087a8b7e522a9
+EBUILD wget2-9999.ebuild 2458 BLAKE2B 4e75262df94e6db8be002957a829714cfac0f03420ed6e453c5da65929ae00364938d066d0f5a707ed9631612d0638d10c527fcc37620c7fc6764534f79a3dee SHA512 20c2d157007f78069d9e04823717ff0efe10cdc4c9dc9a56ab91c696a73c2045b5f787531d68adfc3f8a96c126885a6c1039f71200381883dfd4c32542a88d7c
+MISC metadata.xml 827 BLAKE2B 707f4ea6684a3ae7180790983d3a622721106990e69e8855fde5c6442fade3ff8ff6ff006c7c310bb055a68a7e4ceb376d855393fa491ae6f41ad2e272072fd5 SHA512 7022b91c3c5eb59d3c5a0bc7a5f3f36b25ae766f866b253cdab284ce4c723f2860a82bc8042a9b761911bc80e4726a84893107e27e3cefe84fa2ad4fcbfd69b4
diff --git a/net-misc/wget2/metadata.xml b/net-misc/wget2/metadata.xml
index b9d9ab8fa92e..2ba235a16e20 100644
--- a/net-misc/wget2/metadata.xml
+++ b/net-misc/wget2/metadata.xml
@@ -12,6 +12,8 @@
 		<flag name="lzip">Enable <pkg>app-arch/lzip</pkg> support via <pkg>app-arch/lzlib</pkg></flag>
 		<flag name="openssl">Enable crypto support via <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="psl">Use public suffix list via <pkg>net-libs/libpsl</pkg></flag>
-		<flag name="valgrind">Depend on <pkg>dev-util/valgrind</pkg> for test suite</flag>
 	</use>
+	<upstream>
+		<remote-id type="gitlab">gnuwget/wget2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/wget2/wget2-2.0.1-r2.ebuild b/net-misc/wget2/wget2-2.0.1-r2.ebuild
index 1e0c733d2a3d..c9f6bad3566c 100644
--- a/net-misc/wget2/wget2-2.0.1-r2.ebuild
+++ b/net-misc/wget2/wget2-2.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,8 +12,7 @@ LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/0" # subslot = libwget.so version
 QA_PKGCONFIG_VERSION="2.1.0" # libwget pkg-config versioning
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib"
-REQUIRED_USE="valgrind? ( test )"
+IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib"
 
 RDEPEND="
 	brotli? ( app-arch/brotli )
@@ -43,7 +42,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )
-	valgrind? ( dev-util/valgrind )
 "
 
 RESTRICT="!test? ( test )"
@@ -51,12 +49,12 @@ 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 valgrind valgrind-tests)
 		$(use_enable xattr)
 		$(use_with brotli brotlidec)
 		$(use_with bzip2)
diff --git a/net-misc/wget2/wget2-2.0.1.ebuild b/net-misc/wget2/wget2-2.0.1.ebuild
index 93ecce3e0724..974ef7241035 100644
--- a/net-misc/wget2/wget2-2.0.1.ebuild
+++ b/net-misc/wget2/wget2-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,8 +15,7 @@ fi
 # LGPL for libwget
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/0" # subslot = libwget.so version
-IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib"
-REQUIRED_USE="valgrind? ( test )"
+IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib"
 
 RDEPEND="
 	brotli? ( app-arch/brotli )
@@ -46,7 +45,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	valgrind? ( dev-util/valgrind )
 "
 
 RESTRICT="!test? ( test )"
@@ -84,12 +82,12 @@ src_prepare() {
 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 valgrind valgrind-tests)
 		$(use_enable xattr)
 		$(use_with brotli brotlidec)
 		$(use_with bzip2)
diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild
index a5d97827fcb9..2d271b4a835e 100644
--- a/net-misc/wget2/wget2-9999.ebuild
+++ b/net-misc/wget2/wget2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,8 +13,7 @@ EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0/0" # subslot = libwget.so version
 KEYWORDS=""
-IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test valgrind xattr zlib"
-REQUIRED_USE="valgrind? ( test )"
+IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzip lzma openssl pcre psl +ssl test xattr zlib"
 
 RDEPEND="
 	brotli? ( app-arch/brotli )
@@ -44,7 +43,6 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )
-	valgrind? ( dev-util/valgrind )
 "
 
 RESTRICT="!test? ( test )"
@@ -77,12 +75,12 @@ src_prepare() {
 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 valgrind valgrind-tests)
 		$(use_enable xattr)
 		$(use_with brotli brotlidec)
 		$(use_with bzip2)