Remove old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 13 insertions, 222 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index e1d9da4c8428..4294aeef5b10 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/ejabberd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.111 2012/09/23 08:22:11 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.112 2013/01/31 00:34:01 radhermit Exp $
+
+  31 Jan 2013; Tim Harder <radhermit@gentoo.org> -ejabberd-2.1.10.ebuild:
+  Remove old.
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> ejabberd-2.1.11.ebuild:
   x86 stable wrt bug #427714
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index c150c7194a71..b1eff3d2ded0 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -3,17 +3,19 @@ Hash: SHA256
 
 AUX ejabberd-3.confd 161 SHA256 0296d3d281a321cd7380772c1d89a94e4a86f85b7f43bf9dc1af74935c2e6386 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb WHIRLPOOL 657c44991244d58c10590093a7f58f654cb45cf7e22244b474459c63a449c17d0cf1d6f2d62008ddb34f0022f8fc9e31f22d2010cb3d1070a462bcb22a9a81fc
 AUX ejabberd-3.initd 1018 SHA256 1c07fa02152b42bee44a8d1cd3f031596aeee37276ec4a36d765e3c54aa23075 SHA512 1142b4f1ca240f20603ca9a64819780ff4a1d9fbde2940fd1dab6cbca1d2de5108cf35aa00ff1c037dc72a778c6502521e3908c6cde5a39c4bb3c9fc1c70aceb WHIRLPOOL 59c15d4e7225c927768123cd93ebb0d1479c1ef500c179a8811eaa0db1d0d4562d7e3134fd02ffdeb866ca05e19e13570df419c6d51a7a7314cde4ef858c796e
-DIST ejabberd-2.1.10.tar.gz 1942456 SHA256 9dc2e5889e919a7d51f2b95b83da835116631db81550a115c02e71909ad932be SHA512 a98f2b1cc018e4558bd16e84c9bd3e4b875a6eb0bcc6d3f0873c121b40223a8913a2a729c66c6d4a61316340abb4d0bfa9655d680f790c7484f0eb0588dbaac1 WHIRLPOOL 0dd4e93983594e5032c11a687fb09b3234ae7515e99022c4a1f441d8cfc53262c0968ed04a27ec7b6c9e3b0fc039c7dee0e45696139307177661f4bd904c6801
 DIST ejabberd-2.1.11.tgz 2014232 SHA256 91d5c10e64f9faa60c345c68304746f493d71f82723302955d40d6619e3d87de SHA512 6f09c80b03a84595294c679d49b5991985707f6c9e8c2f9fad94618224666e05b4325a5bef840d2ccf0c803038fc11b49b168716a3e258312216e201bdd4bb88 WHIRLPOOL 2ab09c84619173090acabf19cde10f14e3240fa6b89fb7d963bd79aca960b11a6f869f691d219c55b1b0a664c676afc800599671dfc923a0302d2075eec0e224
 DIST ejabberd-mod_statsdx-1080.patch.gz 14024 SHA256 0f3a3a991c14d797e795ef4fffcf19aa9a54608f5053b759187ec7d3696b9edb SHA512 cdec93504501f60d01defe8634d2fe1ee900d78bd8d4568313b581d0e306144df50d3a8d2b724091bdb7c4a7f65c6bb4ebc4bd053ffdda7acb6512b92d1249cf WHIRLPOOL 881b776b6476319c81ae9bfea286baff1020f0b1acdc8437cf38105678f141eb5bd1cbb615326886cc0937db8039901c6ab5747b63b7934fca8356e96454a290
-EBUILD ejabberd-2.1.10.ebuild 7943 SHA256 b3a6b6399891416093a9ab608d2b4c2c821fe4fcf87cd967e9149816b9cd9823 SHA512 2f65cadb00c65d1514dd756439dd9544d1b2271a95220577ed303cc749f6f2e39c4e6435541087467e1879a6cd1e9adaf19fee592acf872dfa9ea68108dea048 WHIRLPOOL 50089dfca281cdeff1b1f944b06b2ad68214fd647cf5820cacd1007e7e8dd1d268dd59fea133bbcfa08e0ee33d11223a787186675c2bf4d7bb918a18ba577cd9
 EBUILD ejabberd-2.1.11.ebuild 7940 SHA256 343b0ff68bcf8d6d4379628b3dfee5ed5bf4565caf981e4113edcb87d260f2fa SHA512 9782f0993dc5734b3b57e50020f7952c706b97f518040934737364edfcca78597cf39152cd8c9f4e86063168abf4975cf6f3d78f9f4e6426db59adf04ec9f04d WHIRLPOOL b375b28cafdfb6ba7e5f46ec0dd844a80477bf82c37a690a5e2a7d27dcfb54f60abdee1922d2098313cf9b701ecef46638341792a0ef2b98d97bda7c1ed1e0a3
-MISC ChangeLog 22027 SHA256 d2de3f61a34847c472497deb7209c47f5160c264461ec8b7c64d0796c2b9e17a SHA512 26af360740b7d8064cc396eb8df305d397f2131813776a91601f63918e93b042747fec08d63fc697eadf7ee3627f822aa23ede735daf028e8674774fcdf1d65e WHIRLPOOL a17bad1cf74e2df398785da85d3c626f9ff21a3dcc1969122fb8a0b8b285c79f4c48a472c79a239048db3126a4f9799966d8dd55f5e6e37cba9eed78167ce627
+MISC ChangeLog 22115 SHA256 f815f6c7b7d4a7e08bc23148a5877da87db2f565088285996955dbd8510d2294 SHA512 fe528786d4be397f8c6b2e7b3f1d3a016bf4b3a7f302df4de74357ad4f6fb845fe61c96602266ed75018a81e6f26a6d781ab66fbaa021d22db659bcc7f3df9df WHIRLPOOL e7dd3ed710b0e920421186f97141df188d29a53e6cb4eb6bd61812444f019b32f725112c22d7c8651414391e2d8d9a7dcd9caf55d57ac705e9dd1483f8ddbe80
 MISC metadata.xml 815 SHA256 687ad563d41f2ab628da5c0ce09e8fe8c92c703005dbca370f76a2cd0e080265 SHA512 a1f49a65bc08ec23463708e912325ce2a915c825838d7f800b48d79e402bdb6e329cce6fcb64154c71d07eade05e21beee690a583059e570aa12fb6b6fc019a0 WHIRLPOOL 21f280142009b4ed175af6a8665980cae8a61c4e24cb4e250588e9cfba3ab96c315a3e14dc7080fa9517610022cceece5006ae5e7146d6f60f52469bc2852b65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBexrkACgkQuUQtlDBCeQIm9ACfQaNfGbLuD0BPRxNluukYCmB2
-8oQAnAo+lRRbIvBv21Kx8V+jFLAewPXu
-=3QlR
+iQEbBAEBCAAGBQJRCbv+AAoJEEqz6FtPBkyjsAQH+OHnpF5ZYOl1RfRFAXFrw1Wf
+tbHSI8nitTlA1d5x5VxUrvakP022PWkUo5m+PnHSOL0xIjTo4xSJ/ONBRkBjBEAh
+WQ37QGdcouYXJN9ykAnU2HWMu9TJ0s9c+kdPcx/Cxxx6rI0RzglHwlWUYE0LO1tU
+PF09E8TKq3LdZ3zlNHP8061aWNJOYTfB9qZu6ynWjGpNhFva45H7u0pdD+Wp3yXR
+tsTO1avM0Lbym3c/UsxXGAIZ+HtHzbCjAVbnHlnKrziVcrP1CEzwDcVd17ZvjYWm
+R+3tgpxLDu3tbAqlVY8AKE877+KDpXokXWvZEtoA0QlqrKQM1Ik76tB4CEV/BQ==
+=WbNl
 -----END PGP SIGNATURE-----
diff --git a/net-im/ejabberd/ejabberd-2.1.10.ebuild b/net-im/ejabberd/ejabberd-2.1.10.ebuild
deleted file mode 100644
index 74dff5909e51..000000000000
--- a/net-im/ejabberd/ejabberd-2.1.10.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.10.ebuild,v 1.3 2012/06/01 13:29:08 nativemad Exp $
-
-EAPI=4
-
-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/ejabberd-mod_statsdx-1080.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub 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 )"
-
-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() {
-	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_OPTS="-p2" epatch "${WORKDIR}/ejabberd-mod_statsdx-1080.patch"
-	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)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# 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"
-		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
-	fi
-
-	cd "${WORKDIR}/${P}/doc"
-	dodoc "release_notes_${PV%%_rc*}.txt"
-
-	#dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}-3.confd" ${PN}
-}
-
-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
-	# Fix ssl cert permissions bug #369809
-	chown root:jabber "${EROOT}/etc/ssl/ejabberd/server.pem"
-	chmod 0440 "${EROOT}/etc/ssl/ejabberd/server.pem"
-	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
-}