5 files changed, 177 insertions, 0 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 33cfe4e24c84..edd03fd010d1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index 89147b0dc8a1..91ed59a77c60 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -3,6 +3,8 @@ AUX kafka-zookeeper.init.d 506 BLAKE2B f0e6ab4a15a54363fe31e567805b19a1b18d59238
 AUX kafka.init.d.5 792 BLAKE2B 458fe70e6e8460e7291421e411440719224688a6521f2514272c16379d302019630add9fa1cf840cbe398afc1d36d5a19522aefbbbad635d050070cdbd6ae0c3 SHA512 578dbbb51ec12220f51ee4e80ebcfc3d20e0d921b262673505f50010522f9f67998293a6081357fc0f8b6d9e4a7dc306d4e5f45d4099bfee80fd5cd3f2940e8d
 DIST kafka_2.13-3.4.1.tgz 106613091 BLAKE2B c75bc59291f2030e34bad8d5401a65603b1ef9f570784c382874807741ee97ed4812a114f8a0dbcfbc9d3abe278f103a4dfca53d5a1a0be6f7ebc1d9c00c8565 SHA512 875308e9b0a3597ea4a1088788f4040f257c3b825730572b038ede0fee3bc5336559f7ef0ab4d78b9512ac71385f84698180a2026ca81f1221ef65811bed6bce
 DIST kafka_2.13-3.5.1.tgz 106748875 BLAKE2B daba54058f8b26dcf622bcf09df3c1abc79886bca0ae1f4221ad593021c329640689408803bac9e62b419e332633f7643354b5168a30c0360f178642c11ae112 SHA512 b6ceb010a5fe1791843cbc53d34d35993e97e03f9518344b4b5bdf7146d0a4e866cd2d4760cab319d8b3323a5bf53037a78fed88c9384381aea2cd0366877763
+DIST kafka_2.13-3.6.0.tgz 113257079 BLAKE2B db5f0bafbbaef256d03a80e27adbcaffc8463cd5fffcba937cdfc418c4ab931770d87424eeff96cdc41e79217954c0885e26bab72e68b9d9c3f905a1991e7865 SHA512 98d20f475bccc11eb3cf05362112c788eea7bfc88abddba66cfcfb48880d3bb97918a90d44eb7c1720527bebca93dd231002b5159876f6ee8b7fcd91cc1b0644
 EBUILD kafka-bin-3.4.1.ebuild 2065 BLAKE2B 8405b16c621951140f30bde027b26337dfc11bdc8b1800b65c5fc7c3e1ac52075a7479a6303df60ed27d42af6e266825de090dcd66bfe9156d3af78ce55b4da9 SHA512 70ff29218e9409d07a33275b287ce86d42835e79a1bdf3ab86791ffc764c749f473bf0d86fecffbdfdcf011facad187a4ea47158ef49354fe0ff716cc8f0bb36
 EBUILD kafka-bin-3.5.1.ebuild 2065 BLAKE2B 8405b16c621951140f30bde027b26337dfc11bdc8b1800b65c5fc7c3e1ac52075a7479a6303df60ed27d42af6e266825de090dcd66bfe9156d3af78ce55b4da9 SHA512 70ff29218e9409d07a33275b287ce86d42835e79a1bdf3ab86791ffc764c749f473bf0d86fecffbdfdcf011facad187a4ea47158ef49354fe0ff716cc8f0bb36
+EBUILD kafka-bin-3.6.0.ebuild 2065 BLAKE2B 8405b16c621951140f30bde027b26337dfc11bdc8b1800b65c5fc7c3e1ac52075a7479a6303df60ed27d42af6e266825de090dcd66bfe9156d3af78ce55b4da9 SHA512 70ff29218e9409d07a33275b287ce86d42835e79a1bdf3ab86791ffc764c749f473bf0d86fecffbdfdcf011facad187a4ea47158ef49354fe0ff716cc8f0bb36
 MISC metadata.xml 390 BLAKE2B b381ee7c8449c21b4036052e12f2442e1480e9790df1e42ac5375dbb13c7c9344e8d2b2f9b80bc75fdafdd023d6a80c2149151233ee7d2908539ef9d998e7445 SHA512 fe9f241db7f81e850901a8d3b7c2d90f043d3b80851132359055e855c9b1c949566aab4a3889b5af56db99e9f18000e40b4f9096221a9bf813ac5e82bb88bf7e
diff --git a/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild b/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild
new file mode 100644
index 000000000000..62f5d3c5f537
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-3.6.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="https://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.13
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper connect"
+
+COMMON_DEPEND="acct-group/kafka
+	acct-user/kafka
+	virtual/jre:="
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+	sed -i -e 's:/tmp/connect.offsets:/var/lib/kafka/connect.offsets:' "config/connect-standalone.properties" || die
+	eapply_user
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+
+		ewarn "Zookeeper owner has been changed to kafka:kafka"
+		ewarn "you might want to run chown -R kafka:kafka /var/lib/kafka/zookeeper"
+		ewarn "or set COMMAND_USER=\"root:root\" in /etc/conf.d/kafka-zookeeper"
+		ewarn "to keep the previous behavior."
+		ewarn "All logs files have been move to /var/log/kafka/"
+	fi
+
+	if use "connect"; then
+		doins config/connect-distributed.properties config/connect-standalone.properties
+		newinitd "${FILESDIR}/${MY_PN}-connect-distributed.init.d" "${MY_PN}-connect-distributed"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.5" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 5f8e38ce3cd0..4fd4ed40c05c 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -9,9 +9,11 @@ DIST memcached-1.6.18.tar.gz 1081928 BLAKE2B edfaf02cdd3b13930d473fbc4475484602b
 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.22.ebuild b/net-misc/memcached/memcached-1.6.22.ebuild
new file mode 100644
index 000000000000..53e00ffd929c
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.22.ebuild
@@ -0,0 +1,104 @@
+# 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.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	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 \
+		--disable-werror \
+		$(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"
+}