gentoo auto-resync : 17:04:2024 - 12:04:27

3 files changed, 3 insertions, 224 deletions

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 4e5304f372a4..ff1c1951e254 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -4,7 +4,6 @@ AUX ejabberd-22.05.logrotate 209 BLAKE2B f4da9d1ce350f192804e89a6dfea49ac72a432d
 AUX ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch 430 BLAKE2B 0301bd38cf5c08a119ac27368ac7477a5388fd9475a6d8b866635a0b89b989fdff7b41607871d1052a31bba7ddd44035528823caf88a691ffe699ca5f20a1ce5 SHA512 98e41ccceb235dd17c1f265790d5145eae6eadb35e359d935774bdea26739381aad15949fbc22ada394181130556ce91a1d82078d92072e04c91ab212a5ef9dc
 AUX ejabberd.confd 161 BLAKE2B f08ab6310c950d3d248fbaf5e6e35bca2e31289ae476b2379a779ebc38926e091cf04883cce94cedff1e4dcf6ec3224079e7828502b97451a8a96fd278a4d102 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
-DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B 670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3 SHA512 3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942
 DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4 SHA512 3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b
 DIST ejabberd-23.04.tar.gz 2581686 BLAKE2B 292da892f62d6940418980bfaec63f3aa570f0af4c78be80ff6996d13269f5303ff9ecd88c0fa4ba8daecf5183a7eb31a7048f3425d128b03cc7029a3198ff0d SHA512 2edb437baae54afd625222f2b251549af3ec469b535a10109679f1edd27fc840579351499f9bc79e8d0d17f752065787eb52607f886e5599386dbed52c8aecab
 DIST ejabberd-23.10-fix-ejabberdctl.patch 1945 BLAKE2B 3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808 SHA512 0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d
@@ -13,9 +12,8 @@ DIST ejabberd-23.10.tar.gz 2615643 BLAKE2B 0c3adfac5d99a33f37b0bd9970489f7a9e32b
 DIST ejabberd-24.02-fix-ejabberdctl.patch 1945 BLAKE2B 3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808 SHA512 0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d
 DIST ejabberd-24.02-set-ejabberd-opts.patch 1508 BLAKE2B 1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa SHA512 aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5
 DIST ejabberd-24.02.tar.gz 2531049 BLAKE2B 6d18393dd909ef580fdcc173fb927a1302f7d444e5587c30f36e5bbfe7634b61c14e06d31f386123ec8732f0c49180a10b0abbd7dea42589d1d0ec9df54ca0f4 SHA512 43dcf1c0f1a2a0390de9edfa24705be6b5bcfdc83b307c175effeae043b4a67dd00c4930c5e43fda98c7c3e0060fac7198313cd27b7962a8997e006ef255df0c
-EBUILD ejabberd-22.10.ebuild 6925 BLAKE2B acf99298e11c8bb573be35d3cfda71d2789b884027bc2366a432b6d3a9df78c82868fe075d8f99b0b62a11be332fa728910c7677a05e1cc5a28fbaa4820658dc SHA512 f93095f1d16a3a85d9c2b44c12f04656f3222614826bf5b6d8808cecfe9a1aad1904a0a56fe5874a7f96f549a74738587e13088ee6759b7678fa7fd2593a87d3
 EBUILD ejabberd-23.01.ebuild 6925 BLAKE2B 6253509421453e88062317a7c6f28a9c7ad3c76d637392e3d5ee65920f9ffeea3e4f39c2da3c1ed25d5e5f7cd324ab473517dda89c64cf6bfbe7cc52604e27a6 SHA512 6227a9c5826f106b03878c6bdb6a91bf13ace70a21afb40c598d84a1db69f0f5a6d6dcd2f88067fee8694678e713efd703ed00c8fd1bf886383e7129a649d7de
 EBUILD ejabberd-23.04.ebuild 6776 BLAKE2B c7f404b51df06d7c28212f2fb2f22ed54c8289ae07fcf75bfb6ca4bb43b6493d589a4e291e3f836d7945ab045f66fd88babd29427366dd34a5bbdff39d8c05df SHA512 51a7a89f0b6c0f7560566ef474e362902a54b22471e10af59c90aaec5739178742e00bffedd090d0cc9d932f3d00f21eb3b1a93ff459c933c68c07151facf33d
-EBUILD ejabberd-23.10-r1.ebuild 7165 BLAKE2B 55cc3aa2820eebb73aa67e81c15965e6e0139d41787063e7121c3231d9be4d31dc6d33e947ffc81ace964620cc2fd1d18a55892f8fe7c0c0f150521225985c3c SHA512 d33787538c827b08f7e3e4a9b468dce3d72a86d749db242420d965246516316a916017706d6723baf70fcf89572c717ec0fdb775aaae939d2db17bf0e7c25c4e
+EBUILD ejabberd-23.10-r1.ebuild 7164 BLAKE2B 81837d29ab8c68c4c3b3e4f4f332b15000badabe0fbe56fa134cbfef372351e61c40b57b093855bd6cf7b0e27422041be4002d764010b11321dc3829ac523d1b SHA512 a0442a35341d89f38c6314fada1a06509f3216ae75e4e1c87ab15cfe06a9fc3404fa6e9b911556acfc1c93ec330fb388a55b72918ad00de390c06cd3eceab28c
 EBUILD ejabberd-24.02-r1.ebuild 7053 BLAKE2B 709ce1c30842e4826fdb9f85c829d5d39f1ec50e039d2b540ef4a24ee71a483faee3174e069a53cdca83556c84855d3c0b936570825f125632d440e04b01f421 SHA512 34675c7e482f1edac8bf1ff8fe3bda38b21558196db7d8c2d3bb5ed58bcdd94dfe7dfabc0420c9298a394138e7250fdd4266c3be328cf0b43a54bee68e8ada0c
 MISC metadata.xml 1484 BLAKE2B 74f0ec404b37dfe72d8751dd8bc8f0ba0b56f334939a5311af70df4616f19e536209b9be7361b35c8e5d316fbce623afdbf7e3ce53a139eb0d2e0d895275ae3c SHA512 793584e1e44c3a651b15eed84a91a801cd809392ccf7623f1a1b222e65641f8dca18515fb90e42e4a51178f4686d3c61778e14834be23feb23b269b4f07c91fb
diff --git a/net-im/ejabberd/ejabberd-22.10.ebuild b/net-im/ejabberd/ejabberd-22.10.ebuild
deleted file mode 100644
index e7e5988884bb..000000000000
--- a/net-im/ejabberd/ejabberd-22.10.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools pam rebar systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="
-	https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
-	roster-gw selinux sip sqlite +stun zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:		>=dev-erlang/luerl-0.3
-# TODO: )
-DEPEND="
-	>=dev-lang/erlang-19.3[odbc?,ssl]
-	>=dev-erlang/cache_tab-1.0.30
-	>=dev-erlang/eimp-1.0.22
-	>=dev-erlang/fast_tls-1.1.16
-	>=dev-erlang/fast_xml-1.1.49
-	>=dev-erlang/fast_yaml-1.0.34
-	>=dev-erlang/yconf-1.0.14
-	>=dev-erlang/jiffy-1.0.5
-	>=dev-erlang/jose-1.11.2
-	>=dev-erlang/lager-3.9.1
-	>=dev-erlang/p1_oauth2-0.6.11
-	>=dev-erlang/p1_utils-1.0.25
-	>=dev-erlang/stringprep-1.0.29
-	>=dev-erlang/xmpp-1.6.0
-	>=dev-erlang/pkix-1.0.9
-	>=dev-erlang/mqtree-1.0.15
-	>=dev-erlang/idna-6.0.0-r1
-	>=dev-erlang/p1_acme-1.0.20
-	>=dev-erlang/base64url-1.0.1
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( >=dev-erlang/p1_mysql-1.0.20 )
-	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/epam-1.0.12 )
-	postgres? ( >=dev-erlang/p1_pgsql-1.1.19 )
-	redis? ( >=dev-erlang/eredis-1.2.0 )
-	sip? ( >=dev-erlang/esip-1.0.48 )
-	sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
-	stun? ( >=dev-erlang/stun-1.2.6 )
-	zlib? ( >=dev-erlang/ezlib-1.0.12 )
-"
-RDEPEND="
-	${DEPEND}
-	>=acct-user/ejabberd-2[pam?]
-	captcha? ( media-gfx/imagemagick[truetype,png] )
-	selinux? ( sec-policy/selinux-jabber )
-"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=(
-	"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
-)
-
-# Get path to ejabberd lib directory.
-#
-# This is the path ./configure script Base for this path is path set in
-# ./configure script which is /usr/lib by default. If libdir is explicitely set
-# to something else than this should be adjusted here as well.
-get_ejabberd_path() {
-	echo "/usr/$(get_libdir)/${P}"
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	rebar_remove_deps
-
-	# Set paths to ejabberd lib directory consistently to point always to directory
-	# suffixed with version.
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
-		-i "${S}/Makefile.in" \
-		|| die 'failed to set ejabberd path in Makefile.in'
-	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ejabberd path in ejabberdctl.template'
-
-	# Get epam-wrapper from 'files' directory and correct path to lib directory in
-	# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
-	# file exists there already.
-	local epam_wrapper_src="${FILESDIR}/epam-wrapper"
-	local epam_wrapper_dst="${S}/epam-wrapper"
-	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
-	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
-		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
-		|| die 'failed to install epam-wrapper'
-
-	rebar_fix_include_path fast_xml
-	rebar_fix_include_path p1_utils
-	rebar_fix_include_path xmpp
-
-	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
-	# rather than its parent which is default. That way ejabberd directory
-	# takes precedence is module lookup.
-	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
-	sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-user=${PN} \
-		$(use_enable debug) \
-		$(use_enable full-xml) \
-		$(use_enable mssql) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable pam) \
-		$(use_enable postgres pgsql) \
-		$(use_enable redis) \
-		$(use_enable roster-gw roster-gateway-workaround) \
-		$(use_enable sqlite) \
-		$(use_enable sip) \
-		$(use_enable stun) \
-		$(use_enable zlib)
-
-	# more options to support
-	# --enable-elixir requires https://github.com/elixir-lang/elixir
-}
-
-src_compile() {
-	# Note that we also add ejabberdctl.example, which will be used by
-	# ejabberd's build system to create /usr/sbin/ejabberdctl, as
-	# target. Otherwise, ejabberdctl.example is due to be created by the
-	# 'install' target (as per upstream's Makefile.in). However when
-	# invoke the 'install' target (in src_install below), DESTDIR is
-	# set, which causes DESTDIR to scope into the ejabberdctl.example
-	# generation.
-	emake REBAR='rebar -v' src ejabberdctl.example ejabberd.service
-}
-
-src_install() {
-	default
-
-	if use pam; then
-		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-
-		pamd_mimic_system xmpp auth account
-		into "$(get_ejabberd_path)/priv"
-		newbin epam-wrapper epam
-	fi
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}"
-	systemd_dounit "${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}"
-
-	keepdir /var/{lib,log}/ejabberd
-}
-
-pkg_postinst() {
-	local migrate_to_ejabberd_user=false
-
-	if [[ ${REPLACING_VERSIONS} ]]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 21.04-r1; then
-				migrate_to_ejabberd_user=true
-				break
-			fi
-		done
-	fi
-
-	# Sarting with >=21.04-r1, the ejabberd configuration is now in
-	# /etc/ejabberd and no longer in /etc/jabber. See if we need to
-	# migrate the configuration. Furthermore, ejabberd no longer runs
-	# under the, shared via net-im/jabber-base, 'jabber' use, but under
-	# its own user. This increase isolation and hence robustness and
-	# security.
-	if $migrate_to_ejabberd_user; then
-		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
-		ewarn "(just as upstream) and *not* /etc/jabber."
-		ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd."
-		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
-		ewarn "Please check your configuration, and finish the migration by stopping ejabberd"
-		ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd."
-
-		local -A dirs_to_migrate=(
-			[/etc/jabber]=/etc/ejabberd
-			[/var/spool/jabber]=/var/lib/ejabberd
-		)
-
-		for src_dir in "${!dirs_to_migrate[@]}"; do
-			local eroot_src_dir="${EROOT}${src_dir}"
-			local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
-
-			cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
-
-			if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
-				rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
-			fi
-			if ! use prefix; then
-				chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
-			fi
-		done
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-23.10-r1.ebuild b/net-im/ejabberd/ejabberd-23.10-r1.ebuild
index 72df4518bfd7..6a842d1ea221 100644
--- a/net-im/ejabberd/ejabberd-23.10-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-23.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
 REQUIRED_USE="mssql? ( odbc )"
 # TODO: Add 'tools' flag.
 IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis