clean up wrt #432936

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

5 files changed, 13 insertions, 209 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 907ea6dfecdd..575b7c531a9e 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.56 2014/01/06 09:29:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.57 2014/01/06 14:44:42 hasufell Exp $
+
+  06 Jan 2014; Julian Ospald <hasufell@gentoo.org> -files/jabberd2-2.2.8.init,
+  -files/jabberd2-2.2.8.pamd, -jabberd2-2.2.14-r1.ebuild:
+  clean up wrt #432936
 
   06 Jan 2014; Agostino Sarubbo <ago@gentoo.org> jabberd2-2.3.1-r1.ebuild:
   Stable for sparc, wrt bug #432936
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 4447b9a9fefe..87194a95fed9 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,31 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX jabberd2-2.2.8.init 1675 SHA256 7cb895e641d4b58120a3e37bd7d19849b45ca180b2d8cd41ebc25821f4cb6e8f SHA512 12e596478d821f610c44173e501ddcb92da0e95df9827b3b4bcd29c9d7176684a94f4c8db30294d37fd9a35208cc500c1059fcf5444d430b8f16f2a9ed8a2910 WHIRLPOOL 94dc6c29b4a86691b1fbace24f89b8b7abc9011dd4a80f51aa0e41fba818efb6249212319840b449d9e57442539578b61164c392e2144ee8db0db9950966f922
-AUX jabberd2-2.2.8.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
 AUX jabberd2-2.3.1.init 1750 SHA256 ee0d31d5e9d8142eb3e7f080c4d012397988a69e21f18107c06dd52e750a7efe SHA512 e5673ce660b4bd82d52a378fd1e6ec02d0aa1dd68243ae43f7accec1cb1aad98d02ad49798783479898152554b97471b0e0f6e8419306c42ed0f166782a63006 WHIRLPOOL 66d996a3ecfdac415c6e62b7b2ac0af067dc230b607297115fd43b421cd1f0100514d9e89c515e8ab6efecd556da5fa5b677bb08516f0da19b6a8f7e834fc943
 AUX jabberd2-2.3.1.logrotate 332 SHA256 a53d3f86221fc226ddc0a023ea731f2915bf00fac39849a418a5342aea0933c3 SHA512 47cec1568d7c62ac810ec5ffa53eef70595cd5b9808849ee501f50144d5c5a18146449ae74aec88b193047b9649340469c1c0565aa4c41351ded50e3185e574a WHIRLPOOL 5ff2716e332085f0794513732c1f1ab443a1aa9518cc54b2ad294af7e9de3ffeb5c38a6d34be83c529b04b6b986299c8f54f61f6e556c150638fe9d3106ea3ae
 AUX jabberd2-2.3.1.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
-DIST jabberd-2.2.14.tar.bz2 615984 SHA256 cd6bd518dda172935ad16f180f40ba6ebf7d4aa83ef4f9445ac6b55b438a9e3f SHA512 96f33990d8d7c1b4751530f483c6ac0ded0936b73465f3a52cab853f3cea2af218cd15a7e3d911732f730775fb24e95211e9f4a722138d674484c8a564e23418 WHIRLPOOL a3d380fc90c1fb63e46e7f1484a38d7b58852562455f987852f4db275c01583cfef8c43057e69ba3d6b440260c12ad97cd4e31456b091211f7b4344eb93f2c46
 DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
-EBUILD jabberd2-2.2.14-r1.ebuild 2790 SHA256 5fd14aed649eec1107b0e717ff00c4641bbbb133f2752b5c1569bc3b539e064e SHA512 d4644d8587163689630fed68b14a9443da56e812abbb32f70e948c3659ff6a186974e249283e850e2cc7aac9c60adad4ff48c078e71f471f58f5b9f3bdf578f4 WHIRLPOOL 799531f513cb1aca0b734096dacbffa44f56afc17a85724feb7872cfebfa4dc2ac717bf2ed8626f021d912b5d3ae0d45b5c090e7f640779ff911f4f307b66f96
 EBUILD jabberd2-2.3.1-r1.ebuild 4680 SHA256 b837e2a2059f381a0ba5dff89839609013f6c06cf9009916f3726bc947f7e8c1 SHA512 c607c726149c6d6cd10844cc3708734406a03c73d1e03b33fc4310e29b3089601999d30ee52503a8dbdc7b655afe8958e0c31a7a025a6834871a3c26029aa5f0 WHIRLPOOL 051e1c9064c8e75848acecc902f7eaa06b83a2dad3f29a307ab28715bc207da4e2cc1f440670e2b91cb499f94295eb2d3f6b47dff2daa072e0894f0ec048b26b
-MISC ChangeLog 9857 SHA256 afb1ee249c9038e8b1b1ead56ef07789addc6f56fb61897697c12600557c7f40 SHA512 d5846747195fa20c7051d17923c29bef993a865e5ac192dc3acdb91805fab312a97d5339230165a67b4c0a3b1f4d92faed792c83ce407f91fd778e3cc8b8b900 WHIRLPOOL cd4b002340f618d5317a7a8edecbacee35d7919ee84ed464f1b7a6ba53a7f1efbdc31d531f6dbdd71a1337c37e09aff39f63b9b18502443b553771c536990d04
+MISC ChangeLog 10023 SHA256 387dfc0733fa9bf36d9fcbf9a75e1f2bc48718907a27b6448d9fb9ae85161189 SHA512 64902964c74297843634e2737cc8581cf8010c2c20978810f71d6806918461c138aa3e87ed112af65d5015a18a98083e6b18c1a869114740cb421c5cf42e6e97 WHIRLPOOL 61f93ec7650e71c2b94eb11f6fca7ce044c85dda09234b32fa2a1f979b74e1efd7b190159a77a24b613388f82d458f04a6d5d73df44ead3b07ebe2b33e538763
 MISC metadata.xml 448 SHA256 4966a22a3af290736a27783754e46610629eeeefda510ef06d3f824ba4ac4157 SHA512 2ae033f2429c31bc46462aacea1cd2928ef1c8e9d18289c858fd7187458e94f2c94f81ae12101343450bfbc648e3bf68960337d0234117bd0ee4a74a6980fc27 WHIRLPOOL 6a25f913341a9f904d9242402b7f9015d9dc272835dd169a1bc697bb9300da4081ad48726bd88bca0f62da19b0fa4172385bf8c13781b3b5be86b08b8f8be862
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSyneNAAoJELp701BxlEWfMRAP/A4XmbXFL7JGJAqvEiFBw+w8
-Ndi+D3GqGoudA8KbMXjaUB/IwafP/VEIB3TBnH+8QPj7AJuiSPia7YN7HhpvKRxW
-awwFhzQv3BLbbFtOatkjosgnokKfdmCAz5i3FLUMfHmqOXSLzp8w3wTBb5UQDcUE
-hY34M0KITd+LShU8Ixaig5QOUeR5rNGUHrSJ784VFZEQBvEdT7nq2xS8KocM3kXj
-VE+hAd2nTtQ3B8nGjMY5sxqRNUrZhcuGIHbcAEIDVvCzxQP1krMPzbDyRRYM1OD8
-KJOFzOqdYy5tR4iVXNuwnAqmamPNoEkT6k9kWEj8mLh/Ofdq161pibQCNq5eaIOV
-Fng1oszy8hzyLXJ7N0NsQ9TGYPIhIzm6lALtYIatDnr3RBzmjCaniGcMlY+8NTkw
-aw9jfIjWG+/MS4VSm2apf9eCjEk/OkId+ctVc6/Hg5bvOEbO/m2K4MGYs0N4KMUU
-eq7b1njZ+9w2DCLcDRfBGieDOTLS28brPtJLUE8kLZwIXumYBgWKYlLmhah8Fh8J
-G74s1h7tIarcE0exSJFsAnW50DTsLDEf3dj2O4xIAPRzCKvC0YjxwrR0u320JA2J
-pPEdP3HnUQKC1HL+elSwncX/XG32FoT3hbWsDm3AuPBWlu5fL4QDPk/ypiE/tkl2
-frK/99e+Rut8yRsSZaVC
-=2c0u
+iQEcBAEBCAAGBQJSysFfAAoJEFpvPKfnPDWzul8H/1oxBcNaCHJdxr0wV56w1dJd
+lADF+FY89SrwXy46CDDxF8exgs/2+eMU1KbSBZxgdNlg39he0XlB5LE+Wyi17m+U
+g9MXi42SYQyv1TK0NDyM8uvGVgSxdfDTkZaKrihFRG+sumQtHHTGSNH4TLfgYiz+
+m5zda4tC0dI0nhxnuCuAsGVvg+CB0dYVcI2fxPcVKoxMF70OYCkQ31bcBrGUozC0
+5RG6exIdO1E/YJYHFLnyLtc1F8CfYm2xoF8kyvZvgUU8xdqI6xXQw+dDN3Or6Zb+
+a27Qph/OYv2a90cR06/R4SDe4+UYhXy3SONehIwuiXvazkpFU+tRcZ18U+06JeY=
+=s3Ls
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/jabberd2-2.2.8.init b/net-im/jabberd2/files/jabberd2-2.2.8.init
deleted file mode 100644
index 2a838267e300..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.8.init
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.8.init,v 1.2 2013/07/23 10:01:35 pinkbyte Exp $
-
-depend() {
-	need net
-	use mysql postgresql slapd
-	provide jabber-server
-}
-
-stopJabberServices() {
-
-	eindent
-	for pidfile in /var/run/jabber/*.pid; do
-		if [ -f "${pidfile}" ]; then
-			service=$(basename ${pidfile} .pid)
-			ebegin "Stopping ${service}"
-			start-stop-daemon \
-				--stop \
-				--pidfile ${pidfile}
-			eend $?
-		fi
-	done
-	eoutdent
-
-}
-
-start_pre() {
-	checkpath -d -o jabber /run/jabber
-}
-
-start() {
-
-	einfo "Starting Jabber Server ..."
-	local services
-	services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
-	eindent
-	for service in ${services}; do
-
-		cfgfile=$(echo ${service} | cut -d ':' -f 2)
-		service=$(echo ${service} | cut -d ':' -f 1)
-		if [ ! -f "${cfgfile}" ]; then
-			if [ -f "/etc/jabber/${service}.xml" ]; then
-				cfgfile="/etc/jabber/${service}.xml"
-			else
-				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
-				stopJabberServices
-				return 1
-			fi
-		fi
-
-		executable=/usr/bin/${service}
-
-		if [ ! -f "${executable}" ]; then
-			eerror "Can't find executable: ${executable}"
-			stopJabberServices
-			return 1
-		fi
-
-		ebegin "Starting ${service} (${cfgfile})"
-		start-stop-daemon \
-			--background \
-			--start  \
-			--chuid jabber:jabber \
-			--exec /usr/bin/${service} \
-			--pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \
-			-- -c ${cfgfile}
-		eend $?
-
-	done
-	eoutdent
-
-}
-
-stop() {
-
-	einfo "Stopping Jabber Server"
-	stopJabberServices
-
-}
diff --git a/net-im/jabberd2/files/jabberd2-2.2.8.pamd b/net-im/jabberd2/files/jabberd2-2.2.8.pamd
deleted file mode 100644
index 2c5a5347ad6a..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.8.pamd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth       required     pam_nologin.so
-auth       include      system-auth
-account    include      system-auth
-session    include      system-auth
diff --git a/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild b/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
deleted file mode 100644
index 5a9686319d86..000000000000
--- a/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild,v 1.6 2013/09/14 10:40:21 ago Exp $
-
-EAPI=5
-
-inherit db-use eutils flag-o-matic pam
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.org"
-SRC_URI="http://ftp.xiaoka.com/${PN}/releases/jabberd-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-
-IUSE="berkdb debug memdebug mysql ldap pam postgres sqlite ssl zlib"
-
-DEPEND="dev-libs/expat
-	net-libs/udns
-	>=net-dns/libidn-0.3
-	virtual/gsasl
-	berkdb? ( >=sys-libs/db-4.1.25 )
-	mysql? ( virtual/mysql )
-	ldap? ( >=net-nds/openldap-2.1.0 )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	sqlite? ( >=dev-db/sqlite-3 )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	>=net-im/jabber-base-0.01"
-
-S="${WORKDIR}/jabberd-${PV}"
-
-REQUIRED_USE="memdebug? ( debug )"
-
-DOCS=( AUTHORS README UPGRADE )
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
-	replace-flags -O[3s] -O2
-
-	use berkdb && myconf="${myconf} --with-extra-include-path=$(db_includedir)"
-
-	# --enable-pool-debug is currently broken
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-fs --enable-pipe --enable-anon \
-		${myconf} \
-		$(use debug && echo '--enable-debug') \
-		$(use memdebug && echo '--enable-nad-debug') \
-		$(use_enable berkdb db) \
-		$(use_enable ldap) \
-		$(use_enable mysql) \
-		$(use_enable pam) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite) \
-		$(use_enable ssl) \
-		$(use_with zlib)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/${PN}-2.2.8.init" jabberd
-	newpamd "${FILESDIR}/${PN}-2.2.8.pamd" jabberd
-
-	docinto tools
-	dodoc tools/db-setup{.mysql,.pgsql,.sqlite}
-	dodoc tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
-
-	pushd "${D}/etc/jabber/" &>/dev/null || die
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/run/jabber/,g' \
-		-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \
-		-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \
-		*.xml *.xml.dist || die "sed failed"
-	sed -i \
-		-e 's,<module>mysql</module>,<module>db</module>,' \
-		c2s.xml* || die "sed failed"
-	sed -i \
-		-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
-		sm.xml* || die "sed failed"
-	popd
-}
-
-pkg_postinst() {
-
-	if use pam; then
-		echo
-		ewarn 'Jabberd-2 PAM authentication requires your unix usernames to'
-		ewarn 'be in the form of "contactname@jabberdomain". This behavior'
-		ewarn 'is likely to change in future versions of jabberd-2. It may'
-		ewarn 'be advisable to avoid PAM authentication for the time being.'
-		echo
-	fi
-
-}