diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 2f05a29..fa77abb 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,8 +1,5 @@
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.16-no_debug.patch 1597 SHA256 705e041cd90a25c33628cc398c6c62ada46142d70c21315f5fb0d52d5ea02bc0 SHA512 306ca11839756b2289c5deaee8c55148546f9301a3c3a8343eb652cdc90f337c1d2d3e555ab348b19b41f17f781c4d5b0f532502e87ce6d7981b043e0dd42713 WHIRLPOOL 476151b962a2deb6ababdcddbcd558d4363656f5219e719a6e6ce156295b405a31d33059a8689293041122f14076694da7fe68b32d30469ea4c6b63ca446ddd4
-AUX jabberd2-2.2.16.init 1781 SHA256 004ff343acfce247f9f9fc89699340ab3c149f1a67bcb6e71a17ea565d321539 SHA512 cd25fc9cb1db6b55c295b724ccb163cff24adc3cc92b580e7b7d7fb797074c922a5b0d9d95a7bff18b36b0c925c7aaf5afeeb4957112fb36f4726567e8cc8443 WHIRLPOOL 93c7b752b6748eea02652d6073866388fd4532274bbd32f4cd9b75252bc5cb3a7a26d3bf64713d14b4065caab85dfd13fbdf75bf3a5fcdb58eda5c67982d0775
-AUX jabberd2-2.2.16.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.17.init 1781 SHA256 004ff343acfce247f9f9fc89699340ab3c149f1a67bcb6e71a17ea565d321539 SHA512 cd25fc9cb1db6b55c295b724ccb163cff24adc3cc92b580e7b7d7fb797074c922a5b0d9d95a7bff18b36b0c925c7aaf5afeeb4957112fb36f4726567e8cc8443 WHIRLPOOL 93c7b752b6748eea02652d6073866388fd4532274bbd32f4cd9b75252bc5cb3a7a26d3bf64713d14b4065caab85dfd13fbdf75bf3a5fcdb58eda5c67982d0775
AUX jabberd2-2.2.17.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.4.init 1625 SHA256 f01a66b3303f1ac366492e913a82952996b75619335ae210357e43e4fbed37a7 SHA512 df57e053ca7e4a8af841d659295ea4a5d747b21b6ae49f238a66cb7583e6cee6e50b5ad2781c42bda142a16e6bc9bce1aecfb12bec4b1974b652639f1e164ee8 WHIRLPOOL 3c56c3f588048db901dcf20554387e303df0876d9a6962406568e4a061854930f8b1b539d8b1a35ba1a175c2f4ba39929709ab009a8a529bc161a6bd19adad5d
@@ -11,7 +8,5 @@ AUX jabberd2-2.2.5.init 1622 SHA256 0f89246b7240f7f4ce528734a054d32bb63c7195c4a2
AUX jabberd2-2.2.5.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.8.init 1625 SHA256 38e08cc155b9a7f7781a3255f7a1bbb885fed9eb22d72a37349b5f7790cf1689 SHA512 02ef6d0c67291a9d7f7fc313c3e075fbca9d8bf7d74a63fb8326d112f90657e39828eb47220eaceecc58e56452bbbf3303f00e26c0a8e03473b8f47664687129 WHIRLPOOL 0ef41ded73116611910d5156c43d68abae44898d4c3b87198adc1e94fe3a4ce51a77850fabf4d662d1beaefd6757095d6753a3cc4a7f5d5698922bd463f6a383
AUX jabberd2-2.2.8.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
-DIST jabberd-2.2.16.tar.gz 2818476 SHA256 112844e0319dc31faf9225930fe10f811b9faefe2e4e30b73d8e3ab965a7d4bf SHA512 dfa4f6ea5f01ea3c689d42bd51aab909b447d93ad5ecbd8ba6d1c93901cf22f0c99c7d1cf59cb841b7802e5baabf83535d7458aa8a6a50a263f818185fb85457 WHIRLPOOL 2104490084e2b72a5d3411c661590b9dd7b33015ba07625f8e2bb86739d50c927248daf603e2c3108c21bf7a4995bf9dfef99ff44f8cac90065c85877f4f988b
DIST jabberd-2.2.17.tar.gz 636543 SHA256 2f14860928b4ef8ad0ed49a24d6946db48d64166fa08a7cacd22e0cd7ad45843 SHA512 f9e637868ed147f92445b58c4ecd5b38a36e52e7b32a07ce37778781c50eb84dbe4436929cbf39d814c92b473fa62ddabbd55015ffda9320580f59b882970017 WHIRLPOOL cdb8d917f8f8c4e722ef6526e8aa83bf8eb729f6cc7a1056bc36efb7a7a8aaa91b66c5305a6a14cce834d350f1c64adb8646800686f995b817edc5b5c0a11174
-EBUILD jabberd2-2.2.16.ebuild 3056 SHA256 eca1e557d33d53f5b1b324dc44ec6ba803da3557565a3d06b82f11d7600cf517 SHA512 1c85da4ff9fe40d9e005006fc77acaff498f6e36f0955267791d3c4ef368d750f5e332b0c0cc076e6b6670dcc4b02130d1169c3345a4dde7a81162becdbbaa56 WHIRLPOOL 65ea9c775a73e01d637a07ac815826085b7490c4aca8cae029326aa8d46cde8a32dd71b729b670ecbca9583c15d9e0045ae2fad44ca1928683dfafde4956f3a4
EBUILD jabberd2-2.2.17.ebuild 3044 SHA256 39a21debfebb616599e329b5b8f4cda65da2960832003415343704666b61b6e7 SHA512 db7a214aa287da97628f5741b076bca371a39380a2f2b4e383b4b3d86de4cf272fe8cf401a2f9ec1c7b692b16a600b332f8b2bcfaaebf91bc43af3500b1c116f WHIRLPOOL e775135c6f50d2406314335fa6e117b319f7e431a39ca42da5c5c5a6bc35d8ddea6ef6351b157b97d47a519fc25c4ada2d8effc3c98724b51a027ce643fb340a
diff --git a/net-im/jabberd2/files/jabberd2-2.2.16-no_debug.patch b/net-im/jabberd2/files/jabberd2-2.2.16-no_debug.patch
deleted file mode 100644
index e48ad9e..0000000
--- a/net-im/jabberd2/files/jabberd2-2.2.16-no_debug.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ur jabberd-2.2.16/util/log.c jabberd-2.2.16_patched/util/log.c
---- jabberd-2.2.16/util/log.c 2012-05-04 14:51:08.000000000 +0000
-+++ jabberd-2.2.16_patched/util/log.c 2012-07-25 08:10:49.004560934 +0000
-@@ -223,12 +223,12 @@
- debug_flag = v;
- }
-
--int set_debug_log_from_config(config_t c)
-+void set_debug_log_from_config(config_t c)
- {
- return set_debug_file(config_get_one(c, "log.debug", 0));
--};
-+}
-
--JABBERD2_API int set_debug_file(const char *filename)
-+JABBERD2_API void set_debug_file(const char *filename)
- {
- // Close debug output file but not stderr
- if (debug_log_target != 0 &&
-@@ -255,7 +255,7 @@
- // set stderr
- debug_log_target = stderr;
- }
--};
-+}
-
- #else /* DEBUG */
- void debug_log(const char *file, int line, const char *msgfmt, ...)
-@@ -263,4 +263,7 @@
-
- void set_debug_flag(int v)
- { }
-+
-+void set_debug_log_from_config(config_t c)
-+{ }
- #endif
-diff -ur jabberd-2.2.16/util/util.h jabberd-2.2.16_patched/util/util.h
---- jabberd-2.2.16/util/util.h 2012-05-04 14:51:08.000000000 +0000
-+++ jabberd-2.2.16_patched/util/util.h 2012-07-25 08:11:19.612564607 +0000
-@@ -414,9 +414,9 @@
- JABBERD2_API int get_debug_flag(void);
- JABBERD2_API void set_debug_flag(int v);
- JABBERD2_API void debug_log(const char *file, int line, const char *msgfmt, ...);
--JABBERD2_API int set_debug_file(const char *filename);
-+JABBERD2_API void set_debug_file(const char *filename);
-
--JABBERD2_API int set_debug_log_from_config(config_t c);
-+JABBERD2_API void set_debug_log_from_config(config_t c);
-
- #define ZONE __FILE__,__LINE__
- #define MAX_DEBUG 8192
diff --git a/net-im/jabberd2/files/jabberd2-2.2.16.init b/net-im/jabberd2/files/jabberd2-2.2.16.init
deleted file mode 100644
index 2e913db..0000000
--- a/net-im/jabberd2/files/jabberd2-2.2.16.init
+++ /dev/null
@@ -1,83 +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.16.init,v 1.1 2009/05/08 15:24:09 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
-
- if [ ! -d /var/run/jabber ] ; then
- mkdir /var/run/jabber || die "Can't create run directory /var/run/jabber"
- chown jabber:jabber /var/run/jabber
- fi
-
- 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 \
- --user 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.16.pamd b/net-im/jabberd2/files/jabberd2-2.2.16.pamd
deleted file mode 100644
index 2c5a534..0000000
--- a/net-im/jabberd2/files/jabberd2-2.2.16.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.16.ebuild b/net-im/jabberd2/jabberd2-2.2.16.ebuild
deleted file mode 100644
index 966ab5a..0000000
--- a/net-im/jabberd2/jabberd2-2.2.16.ebuild
+++ /dev/null
@@ -1,117 +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/jabberd2/jabberd2-2.2.16.ebuild,v 1.4 2012/02/20 12:16:52 naota Exp $
-
-EAPI="2"
-
-inherit db-use eutils flag-o-matic pam
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.xiaoka.com/"
-SRC_URI="https://github.com/downloads/Jabberd2/${PN}/jabberd-${PV}.tar.gz"
-
-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
- dev-util/cppunit
- 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_prepare() {
- use debug || epatch "${FILESDIR}/${P}-no_debug.patch"
-}
-
-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,mysql,db,' \
- c2s.xml* || die "sed failed"
- sed -i \
- -e 's,mysql,db,' \
- 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
-
-}