commit:     8c7e89a857081bde330cfb69e09b56357265b061
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 08:28:13 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 08:35:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7e89a8

net-im/ejabberd: drop 23.01, 23.04, 23.10-r1

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-im/ejabberd/Manifest                 |   5 -
 net-im/ejabberd/ejabberd-23.01.ebuild    | 219 ------------------------------
 net-im/ejabberd/ejabberd-23.04.ebuild    | 216 ------------------------------
 net-im/ejabberd/ejabberd-23.10-r1.ebuild | 223 -------------------------------
 4 files changed, 663 deletions(-)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 426f5dda6cdb..0245abf12e78 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,8 +1,3 @@
-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
-DIST ejabberd-23.10-set-ejabberd-opts.patch 1508 BLAKE2B 
1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa
 SHA512 
aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5
-DIST ejabberd-23.10.tar.gz 2615643 BLAKE2B 
0c3adfac5d99a33f37b0bd9970489f7a9e32bc1a832efe510be3281cd4ac2df890aa7eeab5758149b3cb16a2e6a71937ee955a86113bba14540d5c685f900ef6
 SHA512 
d42af356b0b6ebbba757de4256e308766f046d6c2a7df355330fbc9a9fb329635a22c2f9e5fc4d0a9dbe2d7e5488efe85000c4d04a9a0ce12921d839899e0c45
 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

diff --git a/net-im/ejabberd/ejabberd-23.01.ebuild 
b/net-im/ejabberd/ejabberd-23.01.ebuild
deleted file mode 100644
index 0f035a88b40c..000000000000
--- a/net-im/ejabberd/ejabberd-23.01.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2024 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 ~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.36
-       >=dev-erlang/yconf-1.0.15
-       >=dev-erlang/jiffy-1.0.5
-       >=dev-erlang/jose-1.11.5
-       >=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.1
-       >=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.22
-       >=dev-erlang/base64url-1.0.1
-       ldap? ( =net-nds/openldap-2* )
-       mysql? ( >=dev-erlang/p1_mysql-1.0.21 )
-       odbc? ( dev-db/unixODBC )
-       pam? ( >=dev-erlang/epam-1.0.14 )
-       postgres? ( >=dev-erlang/p1_pgsql-1.1.20 )
-       redis? ( >=dev-erlang/eredis-1.2.0 )
-       sip? ( >=dev-erlang/esip-1.0.49 )
-       sqlite? ( >=dev-erlang/sqlite3-1.1.14 )
-       stun? ( >=dev-erlang/stun-1.2.7 )
-       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.04.ebuild 
b/net-im/ejabberd/ejabberd-23.04.ebuild
deleted file mode 100644
index 93c881b724c4..000000000000
--- a/net-im/ejabberd/ejabberd-23.04.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2024 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 ~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.36
-       >=dev-erlang/yconf-1.0.15
-       >=dev-erlang/jiffy-1.0.5
-       >=dev-erlang/jose-1.11.5
-       >=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.2
-       >=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.22
-       >=dev-erlang/base64url-1.0.1
-       ldap? ( =net-nds/openldap-2* )
-       mysql? ( >=dev-erlang/p1_mysql-1.0.21 )
-       odbc? ( dev-db/unixODBC )
-       pam? ( >=dev-erlang/epam-1.0.14 )
-       postgres? ( >=dev-erlang/p1_pgsql-1.1.22 )
-       redis? ( >=dev-erlang/eredis-1.2.0 )
-       sip? ( >=dev-erlang/esip-1.0.49 )
-       sqlite? ( >=dev-erlang/sqlite3-1.1.14 )
-       stun? ( >=dev-erlang/stun-1.2.7 )
-       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'
-
-       # 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
deleted file mode 100644
index c8083549429e..000000000000
--- a/net-im/ejabberd/ejabberd-23.10-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2024 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
-       
https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch
 ->
-               ${P}-fix-ejabberdctl.patch
-       
https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch
 ->
-               ${P}-set-ejabberd-opts.patch
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~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-20[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.36
-       >=dev-erlang/yconf-1.0.15
-       >=dev-erlang/jiffy-1.0.5
-       >=dev-erlang/jose-1.11.5
-       >=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.7.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.22
-       >=dev-erlang/base64url-1.0.1
-       ldap? ( =net-nds/openldap-2* )
-       mysql? ( >=dev-erlang/p1_mysql-1.0.22 )
-       odbc? ( dev-db/unixODBC )
-       pam? ( >=dev-erlang/epam-1.0.14 )
-       postgres? ( >=dev-erlang/p1_pgsql-1.1.23 )
-       redis? ( >=dev-erlang/eredis-1.2.0 )
-       sip? ( >=dev-erlang/esip-1.0.50 )
-       sqlite? ( >=dev-erlang/sqlite3-1.1.14 )
-       stun? ( >=dev-erlang/stun-1.2.10 )
-       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"
-       # Both patches for https://bugs.gentoo.org/919711
-       "${DISTDIR}/${P}-fix-ejabberdctl.patch"
-       "${DISTDIR}/${P}-set-ejabberd-opts.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'
-
-       # 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
-}

Reply via email to