gentoo auto-resync : 17:12:2023 - 20:58:01

9 files changed, 4 insertions, 435 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 57ef0f9fe3a0..a1127084891a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 4fd4ed40c05c..c49ce9171039 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -5,15 +5,8 @@ AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec
 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63
 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a
 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
 DIST memcached-1.6.21.tar.gz 1127623 BLAKE2B 13feb4872f5d196c1c3ded0159c16c2b09661b95f2486fbffb012d3f0bc86a94cbcf82aea9d4e59a9beac7cc4251fb60efd9e2f4c066831cb9b582bd44631d28 SHA512 9d8ba8964474e7ed40095e414747a3ce76860ee32b9d8bac19fc7932a79d4bb9947e4cbe810933b6d271f4b0ee5576e25089ca40f414b25faf9245733bfbd369
 DIST memcached-1.6.22.tar.gz 1135926 BLAKE2B 872594e087e2302ac7901481797aa6fda98a73e39b8ad64e084c87834e86d7026abcdc3a87b016d0c7eb80bc96621ac9a0da8fcc0b46fc93e7c042cc30848cac SHA512 a30adc4f14c32051d2fc112eaa71de96f7ba614bd7f940ab5dd86365fe5e4df1399fa6fe6591cee903c8b914f2156050edef3139bafe38cd4a2b6424ba973e8e
-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
 EBUILD memcached-1.6.21-r1.ebuild 2869 BLAKE2B 671e6a2585b7f33af492f4e41bab77fc2e44df35010ec6e0b072b2b4ceab4f40ac869e0a3e458e32f78b377cf972fb83d16d4e873ecb1da76e0e3c9bd9d24d04 SHA512 2323da15f73225ef28c5598f5c54fa268884f628cb3cbeca1c72c92c6f53de3a8c0b6b83f453b71c4337c30bf12c6f49af7faa4ddc00091e46e84d8909b09ab5
-EBUILD memcached-1.6.21.ebuild 2982 BLAKE2B 2eaa1cbc10cfde4ad6c8ada1c300a6969928db4dafc11af6b400026e8e57481e062822de1204196c9d8a84a727846bddfc087b4defdbd8c14d8664cfa6054648 SHA512 d9477a08513a46e775ce4e361ba6ffd346c09e4e05177e2846b6e5c7760e3db238bb7f30b57da8e77482b0f0a3031d66a92b2a66dafa06ab7ee3ee63c4db8688
 EBUILD memcached-1.6.22.ebuild 2869 BLAKE2B 671e6a2585b7f33af492f4e41bab77fc2e44df35010ec6e0b072b2b4ceab4f40ac869e0a3e458e32f78b377cf972fb83d16d4e873ecb1da76e0e3c9bd9d24d04 SHA512 2323da15f73225ef28c5598f5c54fa268884f628cb3cbeca1c72c92c6f53de3a8c0b6b83f453b71c4337c30bf12c6f49af7faa4ddc00091e46e84d8909b09ab5
 MISC metadata.xml 1135 BLAKE2B d16930abfea735bd634c90e0add475eab661c6309c83f418586f0fb3a23e001888bb9c455d886a074d652da98bdaf99c2292357d6241b06c33bd046aac67b0ce SHA512 7bc61552d088369f7ad0204444371140dbd75aa10e9340bdafd2046c0dbfe1921edf8806ff8f96dde8e1e9a9239e82f1d8019e386b44c1e916aa39157c29b6de
diff --git a/net-misc/memcached/memcached-1.6.18.ebuild b/net-misc/memcached/memcached-1.6.18.ebuild
deleted file mode 100644
index 0ed1ae622894..000000000000
--- a/net-misc/memcached/memcached-1.6.18.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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/memcached/memcached-1.6.19.ebuild b/net-misc/memcached/memcached-1.6.19.ebuild
deleted file mode 100644
index 0ed1ae622894..000000000000
--- a/net-misc/memcached/memcached-1.6.19.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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/memcached/memcached-1.6.20.ebuild b/net-misc/memcached/memcached-1.6.20.ebuild
deleted file mode 100644
index 0987a83cff6b..000000000000
--- a/net-misc/memcached/memcached-1.6.20.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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/memcached/memcached-1.6.21.ebuild b/net-misc/memcached/memcached-1.6.21.ebuild
deleted file mode 100644
index 0987a83cff6b..000000000000
--- a/net-misc/memcached/memcached-1.6.21.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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/remmina/Manifest b/net-misc/remmina/Manifest
index 3664b24a2c9b..b599b387524e 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,6 +1,6 @@
 AUX remmina-1.4.32-REM-2981.patch 2104 BLAKE2B e9cf4692a218e0abfbc1ef0b4e694d239ac70dcdf177e83c7250638d27171cf378055e0889836f1c94c9fcd3d536eaf1270844eebc67ba63d9b3ecdbf69fb485 SHA512 0e6fd380017054bad76176fce973cefc8607c6a80cfb5dd3a755972bb1bcfd8da6cb7919896307b6d53a8a5fa123606825615dc840ad7f264c29d160734f0b17
 DIST Remmina-v1.4.31.tar.bz2 2078380 BLAKE2B daee0b68305e3ec0eedcc8cb3622ed5649303562fccd766bf5cc6ed1e96f27c1608286afa1b9bbaf44480bdc210f71a863bf442974ebbc1c50ebfbcf2dfeea35 SHA512 288e7fb5b5251d251e9502ec310f2bfe526f1a28a91c9dd9e79c712191c5d2b287844bd994596dc5097ec50ed8282d0af11144f6c5f0a74cb444aa4c6a8f6838
 DIST Remmina-v1.4.33.tar.bz2 2105164 BLAKE2B 94f73f895f7e0478779d71097ee57ba049299e702527df2cf8a48ea41647f641684131b10b2f4faa7cf831ccea29611a68c2427127a2ebea87acac54f996a446 SHA512 c019131d2c3756946a332a3037286c8370a2e07b20a416c657cc2852ece9e59236499a2c5e45d4e9f391d9265089763957c6968c668e110c350e668053db6d82
-EBUILD remmina-1.4.31.ebuild 2646 BLAKE2B 6d1d8c99ac245ffc02a1b01a765c4a2d9ef16b800bcda161e97fcf30dcf0145e9011d099436d18b660718c22d56428f7db680b1269cebd4013e7b8c99ce802bf SHA512 614f34099c713427df58a34cd7730ab7ef3daa4ce354c6215ebf300d869b93df5e1b9756c8a3154444966024c049426ce9c8a3420424f01d795322862b583742
-EBUILD remmina-1.4.33.ebuild 2762 BLAKE2B a999fc2fefab690a0137f1053d99145beddd5b596f8bc8a49ab24cf9d795a24cf32d032241b03555f4d3a0e7ae5d0ff9c7986d8dfc4cbbb06e217cda750e534b SHA512 c3694063a07300d906d4b5ba3e4b7b6fe23df53078dda4af1cd751b9eeac4d9e419c7443c11826f5a6dd1c4902236556ec144936e2934d5cc1bafd02d3c2a633
+EBUILD remmina-1.4.31-r1.ebuild 2648 BLAKE2B 57fa1e8d07fd555d14947cc530396becc94a9ee116eb5d1f384620be2dcffa139ecf11483a87086b561bef6871882b42269b48ca2acd324206dc121250f09c54 SHA512 552d80c762b6b7f8dcce865f87dba41ea8df455555f6e8242762a554a11171b98ffb393680b6542cbc18cc8106a872df74e204c23285309d889d0fb87a9e4c42
+EBUILD remmina-1.4.33-r1.ebuild 2764 BLAKE2B 8d24e41ead43b541d1cc68f2f8a9e5a298289d2d1587cb1d3ea330ac521998402f20475e7ac0c7b3f8c77c0fd1bae2dff52f38b7ac5a6cddb9b4ccc9f026f7ae SHA512 36ebde1316d528c8497d60cecf76fa9bbee058f87df4eea8683c2873281a28f428915c2338e2e32f02aee8961ad3dcaa75d2c5795c555d7f9391dc7537de2e69
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
diff --git a/net-misc/remmina/remmina-1.4.31.ebuild b/net-misc/remmina/remmina-1.4.31-r1.ebuild
index b362cbf26010..61570e40729b 100644
--- a/net-misc/remmina/remmina-1.4.31.ebuild
+++ b/net-misc/remmina/remmina-1.4.31-r1.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	crypt? ( dev-libs/libgcrypt:0= )
 	keyring? ( app-crypt/libsecret )
 	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
+	kwallet? ( kde-frameworks/kwallet:5 )
 	python? ( ${PYTHON_DEPS} )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
 		<net-misc/freerdp-3[X]
diff --git a/net-misc/remmina/remmina-1.4.33.ebuild b/net-misc/remmina/remmina-1.4.33-r1.ebuild
index 9217f07d5493..de2dbe944bbe 100644
--- a/net-misc/remmina/remmina-1.4.33.ebuild
+++ b/net-misc/remmina/remmina-1.4.33-r1.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	crypt? ( dev-libs/libgcrypt:0= )
 	keyring? ( app-crypt/libsecret )
 	gvnc? ( net-libs/gtk-vnc )
-	kwallet? ( kde-frameworks/kwallet )
+	kwallet? ( kde-frameworks/kwallet:5 )
 	python? ( ${PYTHON_DEPS} )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
 		<net-misc/freerdp-3[X]