Drop PROVIDE=virtual/jabber-server, bug #358833, thank Ulrich Müller for report. Drop unused.

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

5 files changed, 11 insertions, 233 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 115d876cfbd2..9dc799076bce 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.90 2011/03/21 17:34:16 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.91 2011/03/22 15:05:59 pva Exp $
+
+  22 Mar 2011; Peter Volkov <pva@gentoo.org> ejabberd-2.1.5.ebuild,
+  -ejabberd-2.1.5-r3.ebuild, ejabberd-2.1.6.ebuild:
+  Drop PROVIDE=virtual/jabber-server, bug #358833, thank Ulrich Müller for
+  report. Drop unused.
 
   21 Mar 2011; Kevin McCarthy <signals@gentoo.org> ejabberd-2.1.5.ebuild,
   ejabberd-2.1.5-r3.ebuild, ejabberd-2.1.6.ebuild:
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 9f40e49177ce..dde60c0c52d6 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -13,9 +13,7 @@ DIST 2.1.1-mod_statsdx.patch.bz2 13041 RMD160 9cc6d71ff2a2d58b0e377a3facb564d22d
 DIST ejabberd-2.1.5.tar.gz 2278008 RMD160 7abd6bc4a03f68d03e13ee8c1ff3a5fee6098dc6 SHA1 8966d6752219c9386f48a5b8e1f2f8fb0e7477ae SHA256 31a46228c6933d7c24435753300a4d2ae2e84568a6097175dc5d4e553299dd9d
 DIST ejabberd-2.1.6.tar.gz 2874967 RMD160 9b6ed4986ffcd1ea90d23770e54cb002bc52304c SHA1 a1afbfc270f8e4c945bd91f64b7073781590535b SHA256 b54886b119a0ae9f19c8dd91a18e85e518fbd979d47812bee582e872cfbc3544
 DIST mod_shared_roster_ldap-0.5.1.tgz 607758 RMD160 5669a3d16fbca4d399e85a7d0dfda71643e6e2c7 SHA1 a9498d26e17752b882b3341b633d1804075d74ef SHA256 60e4ba0921d1ac65f9cca04fa2a7a3bbe3a9af52a26ad1a4fca4a3c6f1f0cc19
-DIST mod_shared_roster_ldap-0.5.3.tgz 663731 RMD160 c8905ccffe4bd99f77fe91d583502d0912b9a005 SHA1 5bb1991868341c7cfc995348747c43833820af2b SHA256 9e295065b60e5e37e839f7793503e9ae5e367c0a749e870cbbeeef3ce5609954
-EBUILD ejabberd-2.1.5-r3.ebuild 8411 RMD160 8b44c4e140114e0c61800a7ea446e71eeaf424d8 SHA1 841bd7dfa29a9c1d911515d13920a841225146d2 SHA256 8029a0b05ecef2fb70e778530a168830deb9cc10ff3ca47915e24ac8f6f9cc6e
-EBUILD ejabberd-2.1.5.ebuild 8400 RMD160 3988c74f8728ffc3d970b64bf613168995c26076 SHA1 4d1c2f16efad086cb30245dca39659f022d24b19 SHA256 c74d740e0d03995295dfda78320f5287bfdbc5c504111d36e2403beceb6bd068
-EBUILD ejabberd-2.1.6.ebuild 7985 RMD160 0977a1ea16724292ca407b1bb01f510794a878d0 SHA1 75f01a891591b971e68641dfeea3a43ce65f4548 SHA256 fff28a6f91dd4fb5dbb4b7f15a424afc6c65ed7d77435706142bff5449f9602f
-MISC ChangeLog 18872 RMD160 1cc022ae3e915f97ae863d15dd4621f315458094 SHA1 d07b2d30ed0083a337e1c5b8ed3d54fd7a379997 SHA256 a539e4bacef8f27465ed21739c048fc90f42aa384ad2c3a9397a3d670f11e282
+EBUILD ejabberd-2.1.5.ebuild 8363 RMD160 7c23c35b3d3f41bb7e8947d7b5d37ab12dc480c6 SHA1 cfa596018e4b544dfb6c52dc1d5defb834822bbe SHA256 cb106a14aab74f7009433707713c3a77b5640cbcb0abb2d2f345ce84c4666581
+EBUILD ejabberd-2.1.6.ebuild 7948 RMD160 706660a52e9a542e212b302c45b5532f5fcf39a4 SHA1 ec80106e53b7a199896845c6189ec5eb4e88f03e SHA256 502522cedbdf6b92bafe2406ffa2dc169be77fdaecae86c3758f8c3dfeef6d90
+MISC ChangeLog 19088 RMD160 d0ddd3ff9371ba0708010f8bc0c8c78c91c1686f SHA1 4102e44636fa6cee1e8ccdfd9263f10deca2e8b6 SHA256 16913b02b708952bd8dfdad49a3643246b6e9b321f38069345fc69797e1639c1
 MISC metadata.xml 929 RMD160 3a456c8945da34e417ca2fb659807a280b834f85 SHA1 a7b3173f8b63655c049881629e1354c71ddd633e SHA256 4d46909fd72908dff8698bb9dfcf60132e973b28eabbfe75001397ed349ff11b
diff --git a/net-im/ejabberd/ejabberd-2.1.5-r3.ebuild b/net-im/ejabberd/ejabberd-2.1.5-r3.ebuild
deleted file mode 100644
index 9b579a30026f..000000000000
--- a/net-im/ejabberd/ejabberd-2.1.5-r3.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.5-r3.ebuild,v 1.2 2011/03/21 17:34:16 signals Exp $
-
-EAPI=3
-
-inherit eutils multilib pam ssl-cert
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://www.ejabberd.im/"
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz
-	mod_statsdx? ( mirror://gentoo/2.1.1-mod_statsdx.patch.bz2 )
-	mod_srl? ( https://alioth.debian.org/frs/download.php/3354/mod_shared_roster_ldap-0.5.3.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_srl mod_statsdx"
-IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
-
-DEPEND=">=net-im/jabber-base-0.01
-	>=dev-libs/expat-1.95
-	>=dev-lang/erlang-12.2.5[ssl]
-	odbc? ( dev-db/unixODBC )
-	ldap? ( =net-nds/openldap-2* )
-	>=dev-libs/openssl-0.9.8e
-	captcha? ( media-gfx/imagemagick[truetype,png] )
-	zlib? ( sys-libs/zlib )"
-#>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
-RDEPEND="${DEPEND}
-	>=sys-apps/shadow-4.1.4.2-r3
-	pam? ( virtual/pam )"
-
-PROVIDE="virtual/jabber-server"
-
-S=${WORKDIR}/${P}/src
-
-# paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-#JABBER_RUN="/var/run/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-md2-optional.patch" #331299
-	if use mod_statsdx; then
-		ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
-		ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
-		epatch "${WORKDIR}/2.1.1-mod_statsdx.patch"
-	fi
-
-	if use mod_srl; then
-		ewarn "mod_srl is not a part of upstream tarball but is a third-party module"
-		ewarn "taken from here: https://alioth.debian.org/projects/ejabberd-msrl/"
-		cp "${WORKDIR}"/src/mod_shared_roster_ldap{.{e,h}rl,_helpers.erl} "${S}" || die
-	fi
-
-	# don't install release notes (we'll do this manually)
-	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
-	# Set correct paths
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
-		-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
-		-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
-		-e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
-			-i Makefile.in || die
-	sed -e "/EJABBERDDIR=/{s:ejabberd:${PF}:}" \
-		-e "s|\(ETCDIR=\)@SYSCONFDIR@.*|\1${JABBER_ETC}|" \
-		-e "s|\(LOGS_DIR=\)@LOCALSTATEDIR@.*|\1${JABBER_LOG}|" \
-		-e "s|\(SPOOLDIR=\)@LOCALSTATEDIR@.*|\1${JABBER_SPOOL}|" \
-			-i ejabberdctl.template || die
-
-	# Set shell, so it'll work even in case jabber user have no shell
-	# This is gentoo specific I guess since other distributions may have
-	# ejabberd user with reall shell, while we share this user among different
-	# jabberd implementations.
-	sed '/^HOME/aSHELL=/bin/sh' -i ejabberdctl.template || die
-	sed '/^export HOME/aexport SHELL' -i ejabberdctl.template || die
-
-	#sed -e "s:/share/doc/ejabberd/:${JABBER_DOC}:" -i web/ejabberd_web_admin.erl
-
-	# fix up the ssl cert paths in ejabberd.cfg to use our cert
-	sed -e "s:/path/to/ssl.pem:/etc/ssl/ejabberd/server.pem:g" \
-		-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# correct path to captcha script in default ejabberd.cfg
-	sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
-			-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
-
-	# disable mod_irc in ejabberd.cfg
-	if ! use mod_irc; then
-		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
-			-i ejabberd.cfg.example || die "Failed to disable mod_irc"
-	fi
-
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)/erlang/lib/" \
-		$(use_enable mod_irc) \
-		$(use_enable ldap eldap) \
-		$(use_enable mod_muc) \
-		$(use_enable mod_proxy65) \
-		$(use_enable mod_pubsub) \
-		$(use_enable web) \
-		$(use_enable odbc) \
-		$(use_enable zlib ejabberd_zlib) \
-		$(use_enable pam) \
-		--enable-user=jabber
-}
-
-src_compile() {
-	emake $(use debug && echo debug=true ejabberd_debug=true) || die "compiling ejabberd core failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die "install failed"
-
-	# Pam helper module permissions
-	# http://www.process-one.net/docs/ejabberd/guide_en.html
-	if use pam; then
-		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
-		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die
-		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die "Cannot adjust epam permissions"
-	fi
-
-	cd "${WORKDIR}/${P}/doc"
-	dodoc "release_notes_${PV%%_rc*}.txt" || die
-
-	#dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN} || die "Cannot install init.d script"
-	newconfd "${FILESDIR}/${PN}-3.confd" ${PN} || die "Cannot install conf.d file"
-}
-
-pkg_postinst() {
-	elog "For configuration instructions, please see"
-	elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
-	elog "http://www.process-one.net/en/ejabberd/docs/guide_en/"
-
-	if ! use web ; then
-		ewarn
-		ewarn "The web USE flag is off, this has disabled the web admin interface."
-		ewarn
-	fi
-
-	elog
-	elog '===================================================================='
-	elog 'Quick Start Guide:'
-	elog '1) Add output of `hostname -f` to /etc/jabber/ejabberd.cfg line 91'
-	elog '   {hosts, ["localhost", "thehost"]}.'
-	elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 360'
-	elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
-	elog '3) Start the server'
-	elog '   # /etc/init.d/ejabberd start'
-	elog '4) Register the admin user'
-	elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
-	elog '5) Log in with your favourite jabber client or using the web admin'
-
-	# Upgrading from ejabberd-2.0.x:
-	if grep -E '^[^#]*EJABBERD_NODE=' "${EROOT}/etc/conf.d/ejabberd" >/dev/null 2>&1; then
-		source "${EROOT}/etc/conf.d/ejabberd"
-		ewarn
-		ewarn "!!! WARNING !!!  WARNING !!!  WARNING !!!  WARNING !!!"
-		ewarn "Starting with 2.1.x some paths and configuration files were"
-		ewarn "changed to reflect upstream intentions better. Notable changes are:"
-		ewarn
-		ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
-		ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
-		ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
-		ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."
-		ewarn
-		ewarn "2. SSL certificate is now generated with ssl-cert eclass and resides"
-		ewarn "at standard location: /etc/ssl/ejabberd/server.pem."
-		ewarn
-		ewarn "3. Cookie now resides at /var/spool/jabber/.erlang.cookie"
-		ewarn
-		ewarn "4. /var/log/jabber/sasl.log is now /var/log/jabber/erlang.log"
-		ewarn
-		ewarn "5. Crash dumps (if any) will be located at /var/log/jabber"
-
-		local i ctlcfg new_ctlcfg
-		i=0
-		ctlcfg=${EROOT}/etc/jabber/ejabberdctl.cfg
-		while :; do
-			new_ctlcfg=$(printf "${EROOT}/etc/jabber/._cfg%04d_ejabberdctl.cfg" ${i})
-			[[ ! -e ${new_ctlcfg} ]] && break
-			ctlcfg=${new_ctlcfg}
-			((i++))
-		done
-
-		ewarn
-		ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
-		sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
-
-		if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
-			ewarn "Moving .erlang.cookie..."
-			if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then
-				mv -v "${EROOT}"/var/spool/jabber/.erlang.cookie{,bak}
-			fi
-			mv -v "${EROOT}"/var/{run/jabber,spool/jabber}/.erlang.cookie
-		fi
-		ewarn
-		ewarn "We'll try to handle upgrade automagically but, please, do your"
-		ewarn "own checks and do not forget to run 'etc-update'!"
-		ewarn "PLEASE! Run 'etc-update' now!"
-	fi
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
-	install_cert /etc/ssl/ejabberd/server
-	if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
-		ewarn
-		ewarn "The location of SSL certificates has changed. If you are"
-		ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
-		ewarn "want to move your old certificates from /etc/jabber into"
-		ewarn "/etc/ssl/ejabberd/, update config files and"
-		ewarn "rm /etc/jabber/ssl.pem to avoid this message."
-		ewarn
-	fi
-}
diff --git a/net-im/ejabberd/ejabberd-2.1.5.ebuild b/net-im/ejabberd/ejabberd-2.1.5.ebuild
index 4638f7d60a52..995c5da3b24c 100644
--- a/net-im/ejabberd/ejabberd-2.1.5.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.5.ebuild,v 1.3 2011/03/21 17:34:16 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.5.ebuild,v 1.4 2011/03/22 15:05:59 pva Exp $
 
 EAPI=3
 
@@ -31,8 +31,6 @@ RDEPEND="${DEPEND}
 	>=sys-apps/shadow-4.1.4.2-r3
 	pam? ( virtual/pam )"
 
-PROVIDE="virtual/jabber-server"
-
 S=${WORKDIR}/${P}/src
 
 # paths in net-im/jabber-base
diff --git a/net-im/ejabberd/ejabberd-2.1.6.ebuild b/net-im/ejabberd/ejabberd-2.1.6.ebuild
index 99a99771028a..259b1159e6e6 100644
--- a/net-im/ejabberd/ejabberd-2.1.6.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.6.ebuild,v 1.2 2011/03/21 17:34:16 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.6.ebuild,v 1.3 2011/03/22 15:05:59 pva Exp $
 
 EAPI=3
 
@@ -30,8 +30,6 @@ RDEPEND="${DEPEND}
 	>=sys-apps/shadow-4.1.4.2-r3
 	pam? ( virtual/pam )"
 
-PROVIDE="virtual/jabber-server"
-
 S=${WORKDIR}/${P}/src
 
 # paths in net-im/jabber-base