[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/

["Florian Schmaus" <flow@gentoo.org>]

commit:     93e94c71b6c61e9472cfee0357e7a63ed78588fe
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 21 16:49:41 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Sep 21 19:56:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e94c71

net-im/ejabberd: drop 21.12-r2

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

 net-im/ejabberd/Manifest                 |   2 -
 net-im/ejabberd/ejabberd-21.12-r2.ebuild | 222 -------------------------------
 2 files changed, 224 deletions(-)

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index e8815deaf151..df8cc1d38ab8 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,2 @@
-DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
-DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
 DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
 DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da

diff --git a/net-im/ejabberd/ejabberd-21.12-r2.ebuild b/net-im/ejabberd/ejabberd-21.12-r2.ebuild
deleted file mode 100644
index 51848cda5a6c..000000000000
--- a/net-im/ejabberd/ejabberd-21.12-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam rebar systemd verify-sig
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
-	-> ${P}.tar.gz
-	verify-sig? ( https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc -> ${P}.tar.gz.asc )"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
-
-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.29
-	>=dev-erlang/eimp-1.0.21
-	>=dev-erlang/fast_tls-1.1.13
-	>=dev-erlang/fast_xml-1.1.48
-	>=dev-erlang/fast_yaml-1.0.32
-	>=dev-erlang/yconf-1.0.12
-	>=dev-erlang/jiffy-1.0.5
-	>=dev-erlang/jose-1.11.2
-	>=dev-erlang/lager-3.9.1
-	>=dev-erlang/p1_oauth2-0.6.10
-	>=dev-erlang/p1_utils-1.0.23
-	>=dev-erlang/stringprep-1.0.27
-	>=dev-erlang/xmpp-1.5.6
-	>=dev-erlang/pkix-1.0.8
-	>=dev-erlang/mqtree-1.0.14
-	>=dev-erlang/idna-6.0.0-r1
-	>=dev-erlang/p1_acme-1.0.16
-	>=dev-erlang/base64url-1.0.1
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
-	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/epam-1.0.12 )
-	postgres? ( >=dev-erlang/p1_pgsql-1.1.16 )
-	redis? ( >=dev-erlang/eredis-1.2.0 )
-	sip? ( >=dev-erlang/esip-1.0.45 )
-	sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
-	stun? ( >=dev-erlang/stun-1.0.47 )
-	zlib? ( >=dev-erlang/ezlib-1.0.10 )"
-RDEPEND="${DEPEND}
-	>=acct-user/ejabberd-2[pam?]
-	captcha? ( media-gfx/imagemagick[truetype,png] )
-	selinux? ( sec-policy/selinux-jabber )
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=(
-	"${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
-	"${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
-)
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
-	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.
-customize_epam_wrapper() {
-	local epam_wrapper_src="${1}"
-	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'
-}
-
-# 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
-
-	rebar_remove_deps
-	correct_ejabberd_paths
-	customize_epam_wrapper "${FILESDIR}/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() {
-	emake REBAR='rebar -v' src
-}
-
-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}.initd" "${PN}"
-	systemd_dounit "${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	keepdir /var/{lib,log}/ejabberd
-}
-
-pkg_postinst() {
-	local migrate_to_ejabberd_user=false
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "For configuration instructions, please see"
-		elog "  https://docs.ejabberd.im/"
-		echo
-	else
-		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
-}