Security cleanup, bug #369739

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

12 files changed, 17 insertions, 716 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index d17d63555a39..753dd1068bd7 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.48 2013/11/03 12:52:04 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.49 2013/12/04 07:20:10 pinkbyte Exp $
+
+  04 Dec 2013; Sergey Popov <pinkbyte@gentoo.org> -jabberd2-2.2.1.ebuild,
+  -files/jabberd2-2.2.1.init, -files/jabberd2-2.2.1.pamd,
+  -jabberd2-2.2.4.ebuild, -files/jabberd2-2.2.4.init,
+  -files/jabberd2-2.2.4.pamd, -jabberd2-2.2.5.ebuild,
+  -files/jabberd2-2.2.5.init, -files/jabberd2-2.2.5.pamd,
+  -jabberd2-2.2.8.ebuild:
+  Security cleanup, bug #369739
 
   03 Nov 2013; Julian Ospald <hasufell@gentoo.org> jabberd2-2.2.17-r1.ebuild:
   rename pid files wrt #241472
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 7e4ef2e71f85..e73b0083b124 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,39 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX jabberd2-2.2.1.init 1625 SHA256 23c37f789d84575824a3cd8d009c88e7035ca1222cdb24e0c8437e1a6e55bec1 SHA512 a910b391be0deb85319563e07d74d0442c3accc1ec24b5ee9235d869b759576e0cae9c947b948d0a4735703177eb4baa5eb23d86f29c5134ef491e12a51c9505 WHIRLPOOL 48cd1a62ee3e123495429809c7ab7ee62c48ab4b2edab1c9523684371a9f5ebd8261b8a93136b3aa9d126cb3773d0d85acb1fc5113f9e88cdeb82f9c02ab06bf
-AUX jabberd2-2.2.1.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
 AUX jabberd2-2.2.17.init 1679 SHA256 25722282d5eff40cff1e1e7c5c59339dc7c8b553db4596089a9b790a12150acc SHA512 7fbf896af72adda8d9689ad138bdb6727d7e4fdafaa92ce86218b404d7dbe0cd7950ca99203cc3422d6d3756c34ea055c4c61b6c6dc64b9216e5fddf7274a76c WHIRLPOOL 12b7d43534e5e9a83dab1caa76d082101e448dfe53fdccda5c6d1836933b5c40dbe4dae01f3dee68653ac280f6220e0cf74351cfcd963f74aad7d32b00e79ec1
 AUX jabberd2-2.2.17.logrotate 332 SHA256 a53d3f86221fc226ddc0a023ea731f2915bf00fac39849a418a5342aea0933c3 SHA512 47cec1568d7c62ac810ec5ffa53eef70595cd5b9808849ee501f50144d5c5a18146449ae74aec88b193047b9649340469c1c0565aa4c41351ded50e3185e574a WHIRLPOOL 5ff2716e332085f0794513732c1f1ab443a1aa9518cc54b2ad294af7e9de3ffeb5c38a6d34be83c529b04b6b986299c8f54f61f6e556c150638fe9d3106ea3ae
-AUX jabberd2-2.2.4.init 1679 SHA256 9bdce2fdf388b90a84f049da9ba7d805f9db50fb14d647cd7195d906ccec6a2e SHA512 b93cf7858fa4154aaeb5823febc1cbb44cc859699ddc41be7a38ba53e9e7c2b02a9d3d58eb9ce474e97151945cf859c3d4a7c220b6107074d9a292a53de50f0b WHIRLPOOL e507db5f53e68640c71f0c4be2b92bdc166cd7a7bbaa2421571d5011a0b4de36bf2433174678a22317caa0e808822b61fb03e4709b4fe27349bce0291cab9c51
-AUX jabberd2-2.2.4.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
-AUX jabberd2-2.2.5.init 1622 SHA256 0f89246b7240f7f4ce528734a054d32bb63c7195c4a278362265ed818d6049e3 SHA512 e207bc463ae5248ad35197fced982be62ca860fc079a778c0c20ac4e51b4f825820ecb0d69a0a33013d02d30cfcea8f2fa265a4a54a1af565182087fe6cc6327 WHIRLPOOL 7ee7f65ab2d409333b1d96911ef49ff6e5019e4bfa1b6d69e86cf18eec07f072099055edf9a53656978f5ca597e13f30eb50162025cab60bb41e8fe95e831934
-AUX jabberd2-2.2.5.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
 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
-DIST jabberd-2.2.1.tar.bz2 645496 SHA256 6790e4f76febc2889bbe463c85879a4cccc9e6d72f98c9d0bb2a6fe0fa848aa6
 DIST jabberd-2.2.14.tar.bz2 615984 SHA256 cd6bd518dda172935ad16f180f40ba6ebf7d4aa83ef4f9445ac6b55b438a9e3f SHA512 96f33990d8d7c1b4751530f483c6ac0ded0936b73465f3a52cab853f3cea2af218cd15a7e3d911732f730775fb24e95211e9f4a722138d674484c8a564e23418 WHIRLPOOL a3d380fc90c1fb63e46e7f1484a38d7b58852562455f987852f4db275c01583cfef8c43057e69ba3d6b440260c12ad97cd4e31456b091211f7b4344eb93f2c46
 DIST jabberd-2.2.17.tar.xz 1382124 SHA256 0be815dfa1e450cd7416a9a2046c6f9ad547b11b562b6d0bf33520594e03b647 SHA512 9d003c98b5dd4ae00541194a890c68a31b41c665ba7932c542a4d7d70b4d1b4e8e93b66ec868119cb928755c24611113c89e504b6f8392baee5336cff9f475c8 WHIRLPOOL ef34de29b89346d48959abd0130c019318c440a1e999cba12b7dd31d6722fa3419677f9e14e344db712dfca5bb7e952425782cfd70f757981854a45c4cfed9a1
-DIST jabberd-2.2.4.tar.bz2 649737 SHA256 8cb7a69e92b8a7994a42ba28b910bc90e3174a7cc5928f1025bc1e17aee33eec SHA512 47720c423f42777af12ed5defcac1b150d7a91fc19c67d2913df77f92eae8a604c4b715a6b8eee7c539d4973028f7dbc4aa0c47c1b11430c9132bd160bbc774e WHIRLPOOL d34662138205e6222274aff6b568a2641cada7d4eabef26153bf6b259a9e1d7545bc9dd0986d0691469e37bcb3ba680105dc923d55f43fbfc0723c6f53cade1e
-DIST jabberd-2.2.5.tar.bz2 649910 SHA256 14c36491f2fe83caacac6bef49b77dc43d56c76bc375fc0cf85e8373010f54e9 SHA512 374eaa85f05a9b3346f6f7afc42f83d8caecaa2d0e200a70f806d499836f19ab291d55e6a50ac8c91ba60f2cfaf7ec23345bf9b02948d601571aae4e8adf956d WHIRLPOOL abdaddaec56ec6c102ff7883f8f8fdbb11d0b076413addf2b51cab67d1eea104466c5db55a068f35dbca4e3276a4d99f922fd25815c7f9b688c91b3598459a34
-DIST jabberd-2.2.8.tar.bz2 631830 SHA256 772959b0582fca92168f151252fd6a2286b715d72959ce494ca92935957961a3 SHA512 f993bc36ab6aeac9eba773f133f6c543f2f3095f89aaefe2cffe6bd3b2390527054b815209cda429f6198451793ab1ee76f715b477e86c655d449d04d3a224ba WHIRLPOOL 0afa43253087504087d4eb866a363e1fabd5b4c2b33df389ee0a057a9c4048711b78b17c950c442e0d84e138ce317f19657208af98697c3e69ac44df9c38afa9
-EBUILD jabberd2-2.2.1.ebuild 2924 SHA256 adb842dfba0a645cbe823746e04aa281778517f2beba19e36857ac99783c39d7 SHA512 1ca53896c662b2f4b131970cc28302c010c9aca3bf96d857645f65edd368e8274e40413eafdcf992f034b87e7193b7819ca7515cd1c8e475ec1e10061c573d5a WHIRLPOOL d5391805d19d9e1a2f21c0bac9d49b54d4906c4add56c27a71bca78642d0d2c640b032aca67767d51b298a59717a7c0b327567270b3db70cc1047aa7bb4e16a3
 EBUILD jabberd2-2.2.14-r1.ebuild 2790 SHA256 5fd14aed649eec1107b0e717ff00c4641bbbb133f2752b5c1569bc3b539e064e SHA512 d4644d8587163689630fed68b14a9443da56e812abbb32f70e948c3659ff6a186974e249283e850e2cc7aac9c60adad4ff48c078e71f471f58f5b9f3bdf578f4 WHIRLPOOL 799531f513cb1aca0b734096dacbffa44f56afc17a85724feb7872cfebfa4dc2ac717bf2ed8626f021d912b5d3ae0d45b5c090e7f640779ff911f4f307b66f96
 EBUILD jabberd2-2.2.17-r1.ebuild 4636 SHA256 c7bae8d5abf6c6ddd46172faf98ba0027c007770df7e6632264a2c6a4edc0f15 SHA512 edc208e6555f93084487211508907cc4da5cf7dc7a1b8e35190e78295c911f9033dffcd7cd2a2483ea90cab21378d5e272f46fd51396e9dfde5115a072042f4c WHIRLPOOL 2a7dc9cc03434894086511c8a61eab95f2ef1d9e5bfae49424cd53d5bf41add3614828aac88c87bf70cea9e8bdee544e7acfd83db37e0779ce58587b6a7f2aa0
 EBUILD jabberd2-2.2.17.ebuild 3501 SHA256 82581a10e0092748b81fc2ad99b22c0720a18a868b070a5f5ca08fc4b77b8668 SHA512 2186ed2d84c1d7bfe6f75555dca623aa411a855acafdd1fa5f34e003684936bd9c47baec663fed9d3a5e2a3120f763ebf4dadc283e427b05a06362084e053a53 WHIRLPOOL 26654553a8791c9734d24e97f2f9e795922bbc87434c8fd7878e57aaf7016fcf07b8e0f709043e5317104ec40c07cada5279e61174cadee0406a6eafb9f5f268
-EBUILD jabberd2-2.2.4.ebuild 2928 SHA256 a7213d1461da20fcb1b072bc0474a01c52a396ab54017b6dc13fd9a6df9a05da SHA512 bd72498f3507365d1c0bc41110d02d8db620c84a816e970bc994499e2ba830e23226981da55d40bb9db43d8889f69c89ade58eb3b50fc853e7a1a9aa4bbcd43d WHIRLPOOL 330aa8b7d368c60bf611b7a2373b784db9693f1c12ffdc2309311101eae3743d00b40ebc030d33e389a2a450b37a76646b1ac14d53a3557a770566c8838a9e3b
-EBUILD jabberd2-2.2.5.ebuild 2932 SHA256 44661830750e303cb98124b2928d97a815d900708bd118a0341a436fe968bae7 SHA512 8bac71bb13c99d311710a2afafab15118104b23f4e827a95783d29f8a5645516fcdbf0061ca4825669dd6e4ea8af6b75f67db25c32f4473a7170f434291f6f34 WHIRLPOOL 0f7d416c3318ec47c8bd2756cd2faabbe89d4d0675dde2230948ac61e02931a465a9556e648c6c57a02fb6c875fe19079878763d0e0762d7a47777505b400c39
-EBUILD jabberd2-2.2.8.ebuild 2942 SHA256 eb4d0ecd1e1d9f11bf07b0e7cc3fb46ba3e33f0bf433682ba36ee4ba19977419 SHA512 96636183e459b7d6af5509442a65af4cb8b88e60959fdb80e07ac25c0d99ccbe97de12954eb3cd6924fdd7bc544c6978ca9c567b571cbb6004ea0fba40f5568d WHIRLPOOL 06c59c6d787f58b4161e78dd5ec391780bc542f926f8b7886f06b9781693b4f4e3cf2f0f4737c513322342d7d9b5987737c8cb181f9fe1f153c14f2da4582b47
-MISC ChangeLog 8430 SHA256 4a5016c6ed9715e15b4b082251d185dfae8af86a1eb8c57fc92236be5747c240 SHA512 8f6ffae711f775c956b1667ec1434be53609fbd065dd5086abfbb367cbc49c0ac6ecfc7d86806ec5911b8adaba2bb4ff5634bfc7bafb107fe8fe3224fbb4db56 WHIRLPOOL ae1886d1dbc0640bd135ad02a877563b2e89232f8fe14ddcfb08006c442ef348da171f6657fbe035b78f2d535d0e2183bdd11818d518301da773002f3344243c
+MISC ChangeLog 8787 SHA256 03aa33817cbb8f298be66b127975ada17221a5c4e6999d840bbd85ec111df5f1 SHA512 6121195bc6bf4a172db869814bed2edb2bc22d5b74549b0d2622a3e6f7d212cc65bb7cd0da97078fc54940d1ab0432313f7cd7376295d99513b881e453cddd3d WHIRLPOOL bbef8cf44f95ee6e4e52ea6cca46a06667add2ec2982dc208b297854596d78f83707fbdcdc09a35716a0430f94f74f2c31d6ebb68d8db339827db02d39e507b9
 MISC metadata.xml 448 SHA256 4966a22a3af290736a27783754e46610629eeeefda510ef06d3f824ba4ac4157 SHA512 2ae033f2429c31bc46462aacea1cd2928ef1c8e9d18289c858fd7187458e94f2c94f81ae12101343450bfbc648e3bf68960337d0234117bd0ee4a74a6980fc27 WHIRLPOOL 6a25f913341a9f904d9242402b7f9015d9dc272835dd169a1bc697bb9300da4081ad48726bd88bca0f62da19b0fa4172385bf8c13781b3b5be86b08b8f8be862
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSdkb5AAoJEFpvPKfnPDWza2kH/jqRzJK9H/chb5MctaJ25prF
-i0rj1OzY97WCILyPfuYE4x0EzlXbxhXS4m9V2vcHtYdhhWRuf/r106JoAKDj90E+
-jfZ03l1RT1uZyRkw5Szqmg0ORZD769PUp5gcYFx/je1YC6a97LCPhLR6VmhomVTk
-TI7kgOvI+j5mQLsh3V3TM1T/bX17Dkpsdk0Hv6L0IDtmuqBSE3pxjy56tZ52v66R
-KzEzmG6sjv+Tg3WL6/sD8vUdcj4pWwLYPetUo804bw38XxbOZeuknVjjzr/KBb9L
-ZI97fMLGOt/PFviNX02WlL1zarXG5RPyoPZiYWpZ6JoNNpjytVF0FD62Zvzyx+k=
-=5JIG
+iQEcBAEBCAAGBQJSntdnAAoJECo/aRed9267bAsIAJJqJBKfngnFNjKOqMtR7d3i
+cyfW4/R/LT/yPe0INm3aGESjZgayWMwMZUdH73Lwgl8JFjeDx5AcAkDIqu5/h7qm
+DHwpOgGw6F9P9g6sOhNErBHxW288hifJ4ov09oFRGLz5bxB54dLpjYdQ3Vhk7wem
+hRHE1/nNm69lYB6S88DuyBn3DEHEukWZ61dz/QwHAS1jW0lilFF/24rZ7bP2tZfK
+9aezeww8nEs19d5A6KVAFTl6+VWV0JlD2tTisDRBu87MYactC18cxusGBFfG51+1
+YPvP2Z4biXtWjcez6DNMfezDB55/vnhN1oh3Fy6PR1u3apWj3tR6VD3zasZssfY=
+=u8VA
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/files/jabberd2-2.2.1.init b/net-im/jabberd2/files/jabberd2-2.2.1.init
deleted file mode 100644
index 085e6d0853e2..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.1.init
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 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.1.init,v 1.1 2008/07/30 11:34:36 gentoofan23 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() {
-
-	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.1.pamd b/net-im/jabberd2/files/jabberd2-2.2.1.pamd
deleted file mode 100644
index 2c5a5347ad6a..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.1.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/files/jabberd2-2.2.4.init b/net-im/jabberd2/files/jabberd2-2.2.4.init
deleted file mode 100644
index aa4b88876285..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.4.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.4.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 /var/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.4.pamd b/net-im/jabberd2/files/jabberd2-2.2.4.pamd
deleted file mode 100644
index 2c5a5347ad6a..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.4.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/files/jabberd2-2.2.5.init b/net-im/jabberd2/files/jabberd2-2.2.5.init
deleted file mode 100644
index e6f2032bdb97..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.5.init
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 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.5.init,v 1.1 2009/01/24 14:53:23 kingtaco 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() {
-
-	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.5.pamd b/net-im/jabberd2/files/jabberd2-2.2.5.pamd
deleted file mode 100644
index 2c5a5347ad6a..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.5.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.1.ebuild b/net-im/jabberd2/jabberd2-2.2.1.ebuild
deleted file mode 100644
index bdf2485b0cb0..000000000000
--- a/net-im/jabberd2/jabberd2-2.2.1.ebuild
+++ /dev/null
@@ -1,110 +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.1.ebuild,v 1.4 2013/01/23 11:41:03 pinkbyte Exp $
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-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.24 )
-	mysql? ( virtual/mysql )
-	ldap? ( net-nds/openldap )
-	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
-	!net-im/jabberd"
-
-S="${WORKDIR}/jabberd-${PV}"
-
-src_compile() {
-
-	# 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)"
-
-	if use debug; then
-		myconf="${myconf} --enable-debug"
-		# --enable-pool-debug is currently broken
-		use memdebug && myconf="${myconf} --enable-nad-debug"
-	else
-		if use memdebug; then
-			ewarn
-			ewarn '"memdebug" requires "debug" enabled.'
-			ewarn
-		fi
-	fi
-
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-fs --enable-pipe --enable-anon \
-		${myconf} \
-		$(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)
-	emake || die "make failed"
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed"
-	newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed"
-
-	dodoc AUTHORS README UPGRADE
-	docinto tools
-	dodoc tools/db-setup{.mysql,.pgsql,.sqlite}
-	dodoc tools/{migrate.pl,pipe-auth.pl}
-
-	cd "${D}/etc/jabber/"
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/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"
-
-}
-
-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
-		ebeep
-	fi
-
-}
diff --git a/net-im/jabberd2/jabberd2-2.2.4.ebuild b/net-im/jabberd2/jabberd2-2.2.4.ebuild
deleted file mode 100644
index 47b090e06fe1..000000000000
--- a/net-im/jabberd2/jabberd2-2.2.4.ebuild
+++ /dev/null
@@ -1,110 +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.4.ebuild,v 1.7 2013/01/23 11:41:03 pinkbyte Exp $
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-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
-	!net-im/jabberd"
-
-S="${WORKDIR}/jabberd-${PV}"
-
-src_compile() {
-
-	# 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)"
-
-	if use debug; then
-		myconf="${myconf} --enable-debug"
-		# --enable-pool-debug is currently broken
-		use memdebug && myconf="${myconf} --enable-nad-debug"
-	else
-		if use memdebug; then
-			ewarn
-			ewarn '"memdebug" requires "debug" enabled.'
-			ewarn
-		fi
-	fi
-
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-fs --enable-pipe --enable-anon \
-		${myconf} \
-		$(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)
-	emake || die "make failed"
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed"
-	newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed"
-
-	dodoc AUTHORS README UPGRADE
-	docinto tools
-	dodoc tools/db-setup{.mysql,.pgsql,.sqlite}
-	dodoc tools/{migrate.pl,pipe-auth.pl}
-
-	cd "${D}/etc/jabber/"
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/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"
-
-}
-
-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
-		ebeep
-	fi
-
-}
diff --git a/net-im/jabberd2/jabberd2-2.2.5.ebuild b/net-im/jabberd2/jabberd2-2.2.5.ebuild
deleted file mode 100644
index c387c5690c5c..000000000000
--- a/net-im/jabberd2/jabberd2-2.2.5.ebuild
+++ /dev/null
@@ -1,110 +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.5.ebuild,v 1.4 2013/01/23 11:41:03 pinkbyte Exp $
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-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
-	!net-im/jabberd"
-
-S="${WORKDIR}/jabberd-${PV}"
-
-src_compile() {
-
-	# 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)"
-
-	if use debug; then
-		myconf="${myconf} --enable-debug"
-		# --enable-pool-debug is currently broken
-		use memdebug && myconf="${myconf} --enable-nad-debug"
-	else
-		if use memdebug; then
-			ewarn
-			ewarn '"memdebug" requires "debug" enabled.'
-			ewarn
-		fi
-	fi
-
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-fs --enable-pipe --enable-anon \
-		${myconf} \
-		$(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)
-	emake || die "make failed"
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed"
-	newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed"
-
-	dodoc AUTHORS README UPGRADE
-	docinto tools
-	dodoc tools/db-setup{.mysql,.pgsql,.sqlite}
-	dodoc tools/{migrate.pl,pipe-auth.pl}
-
-	cd "${D}/etc/jabber/"
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/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"
-
-}
-
-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
-		ebeep
-	fi
-
-}
diff --git a/net-im/jabberd2/jabberd2-2.2.8.ebuild b/net-im/jabberd2/jabberd2-2.2.8.ebuild
deleted file mode 100644
index 36d078e2aff9..000000000000
--- a/net-im/jabberd2/jabberd2-2.2.8.ebuild
+++ /dev/null
@@ -1,110 +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.8.ebuild,v 1.5 2013/01/23 11:41:03 pinkbyte Exp $
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-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
-	!net-im/jabberd"
-
-S="${WORKDIR}/jabberd-${PV}"
-
-src_compile() {
-
-	# 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)"
-
-	if use debug; then
-		myconf="${myconf} --enable-debug"
-		# --enable-pool-debug is currently broken
-		use memdebug && myconf="${myconf} --enable-nad-debug"
-	else
-		if use memdebug; then
-			ewarn
-			ewarn '"memdebug" requires "debug" enabled.'
-			ewarn
-		fi
-	fi
-
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-fs --enable-pipe --enable-anon \
-		${myconf} \
-		$(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)
-	emake || die "make failed"
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed"
-	newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed"
-
-	dodoc AUTHORS README UPGRADE
-	docinto tools
-	dodoc tools/db-setup{.mysql,.pgsql,.sqlite}
-	dodoc tools/{migrate.pl,pipe-auth.pl}
-
-	cd "${D}/etc/jabber/"
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/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"
-
-}
-
-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
-		ebeep
-	fi
-
-}