net-im/jabberd-2.1.4

6 files changed, 38 insertions, 48 deletions

diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 86a2898..91dbca0 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX jabberd-1.4.4-crypt.patch 605 RMD160 62763a71dfeb13763cd6e2cb47a2ec36a942fd42 SHA1 3befde7962b643050e61d04bd87483ed192483a1 SHA256 0a96fea2745058546bada3b234be4a803df836ba2b65052737b000867e932eca
 MD5 3de1d023b07d0bf247a71329eb70355d files/jabberd-1.4.4-crypt.patch 605
 RMD160 62763a71dfeb13763cd6e2cb47a2ec36a942fd42 files/jabberd-1.4.4-crypt.patch 605
 SHA256 0a96fea2745058546bada3b234be4a803df836ba2b65052737b000867e932eca files/jabberd-1.4.4-crypt.patch 605
 AUX jabberd-1.4.4-genhash.c-rev1253.patch 392 RMD160 e78d8a7edaaf65e2057c39ab5a564c926ea4b5d1 SHA1 abc212773b9d469c308bf57c6558f331c73f574d SHA256 f6c49a1e5a788c300c87912553b9d2ba4295c395c58b81bfac0bdce6d10a78ea
 MD5 da03862bd6e85156860dda87ed726b1c files/jabberd-1.4.4-genhash.c-rev1253.patch 392
 RMD160 e78d8a7edaaf65e2057c39ab5a564c926ea4b5d1 files/jabberd-1.4.4-genhash.c-rev1253.patch 392
 SHA256 f6c49a1e5a788c300c87912553b9d2ba4295c395c58b81bfac0bdce6d10a78ea files/jabberd-1.4.4-genhash.c-rev1253.patch 392
 AUX jabberd-1.4.4-mio-bug-rev1291.patch 499 RMD160 7d50054ca0c3304d47b530a604c68d2e2b5d4c5f SHA1 6ae07090112cb9f4ba5d84e1ba798e20b59cb2bf SHA256 8aef4a6bedaeaad668b4df57a42dc3ece8ad7b91789dcff1e942af819b582841
 MD5 15d1ed12f5a4d1849f2c3c050aa4e7d4 files/jabberd-1.4.4-mio-bug-rev1291.patch 499
 RMD160 7d50054ca0c3304d47b530a604c68d2e2b5d4c5f files/jabberd-1.4.4-mio-bug-rev1291.patch 499
 SHA256 8aef4a6bedaeaad668b4df57a42dc3ece8ad7b91789dcff1e942af819b582841 files/jabberd-1.4.4-mio-bug-rev1291.patch 499
@@ -24,51 +21,44 @@ SHA256 929afb2954329eaef703ca985cd9e391002b80aea5e21f0d67933ffaa12db9c3 files/ja
 AUX jabberd-1.4.4-xdb_file.c-rev1107.patch 539 RMD160 dbfca4d0801291f1b1c10e12ac4040d06a38006f SHA1 593fd01f2e0003aedf6714fc9e384da68e04b511 SHA256 6f532e7f792431072226fea8c032fa3463080b355325a7281317a2764ea6e245
 MD5 c3d81de427c5acd5f9e54ce6371adad2 files/jabberd-1.4.4-xdb_file.c-rev1107.patch 539
 RMD160 dbfca4d0801291f1b1c10e12ac4040d06a38006f files/jabberd-1.4.4-xdb_file.c-rev1107.patch 539
 SHA256 6f532e7f792431072226fea8c032fa3463080b355325a7281317a2764ea6e245 files/jabberd-1.4.4-xdb_file.c-rev1107.patch 539
 AUX jabberd-1.4.4-xdb_sql.c-rev1211.patch 882 RMD160 48c9f7ad6f4c10c26c9aa89730434a3632de3f75 SHA1 8519d7920e75c3273efe766f3336c588808e0778 SHA256 5dda2f6b8c86b0b02d569f3436d2d0b23d352926649469b2f4041a94535a6c10
 MD5 9145524db44a8da4ade06cf07811ef75 files/jabberd-1.4.4-xdb_sql.c-rev1211.patch 882
 RMD160 48c9f7ad6f4c10c26c9aa89730434a3632de3f75 files/jabberd-1.4.4-xdb_sql.c-rev1211.patch 882
 SHA256 5dda2f6b8c86b0b02d569f3436d2d0b23d352926649469b2f4041a94535a6c10 files/jabberd-1.4.4-xdb_sql.c-rev1211.patch 882
 AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1 630cd9c50c20a73992b9891051e02350f6abcba9 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac
 MD5 3b4be327293fb0abc0cdb5dcac80d033 files/jabberd-1.4.4.init 554
 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e files/jabberd-1.4.4.init 554
 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac files/jabberd-1.4.4.init 554
-AUX jabberd-2.0.11-configure.in.patch 396 RMD160 86c99a761a23e55ebce98bdffba060e18073826f SHA1 59d16a3ce6f30bdea79c67fe9051a6c4624ddac9 SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f
-MD5 0d6acfc3d4a22d09d4d17ffd202d38d8 files/jabberd-2.0.11-configure.in.patch 396
-RMD160 86c99a761a23e55ebce98bdffba060e18073826f files/jabberd-2.0.11-configure.in.patch 396
-SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f files/jabberd-2.0.11-configure.in.patch 396
-AUX jabberd-2.0.11.init 1701 RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 SHA1 95958ed179ec3c8b20dc4a2934c1a8adae08b92b SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a
-MD5 15e304cfa6bdf41c2633da7fe6063ace files/jabberd-2.0.11.init 1701
-RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 files/jabberd-2.0.11.init 1701
-SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a files/jabberd-2.0.11.init 1701
+AUX jabberd-2.1.4-configure.in.patch 396 RMD160 86c99a761a23e55ebce98bdffba060e18073826f SHA1 59d16a3ce6f30bdea79c67fe9051a6c4624ddac9 SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f
+MD5 0d6acfc3d4a22d09d4d17ffd202d38d8 files/jabberd-2.1.4-configure.in.patch 396
+RMD160 86c99a761a23e55ebce98bdffba060e18073826f files/jabberd-2.1.4-configure.in.patch 396
+SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f files/jabberd-2.1.4-configure.in.patch 396
+AUX jabberd-2.1.4.init 1701 RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 SHA1 95958ed179ec3c8b20dc4a2934c1a8adae08b92b SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a
+MD5 15e304cfa6bdf41c2633da7fe6063ace files/jabberd-2.1.4.init 1701
+RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 files/jabberd-2.1.4.init 1701
+SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a files/jabberd-2.1.4.init 1701
 DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
-DIST jabberd-2.0s11.tar.gz 777466 RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d SHA1 c938d95fc17634b889ba9b1d7d27115593b13e3d SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a
+DIST jabberd-2.1.4.tar.bz2 843796 RMD160 1f8ab0b8ab51508ff89085f3fe1342fdd9b54204 SHA1 c1c4b3f74bf1220e9957d0260772d0d2148f2f0c SHA256 e9823c78505c233cc228146a181614a8f191f523948480f78a716fff2921385a
 EBUILD jabberd-1.4.4-r3.ebuild 3066 RMD160 f17931e3958c08c395419c718c009578929c7b23 SHA1 1d235e8d0574e83ebe870566d409f1ae937c3de9 SHA256 c240575c4deccbef864c3415397b913252321ff291d4c1291a8fb327bbe5d057
 MD5 703d5ba2de35a3258c9fa81b9ff5fc96 jabberd-1.4.4-r3.ebuild 3066
 RMD160 f17931e3958c08c395419c718c009578929c7b23 jabberd-1.4.4-r3.ebuild 3066
 SHA256 c240575c4deccbef864c3415397b913252321ff291d4c1291a8fb327bbe5d057 jabberd-1.4.4-r3.ebuild 3066
-EBUILD jabberd-2.0.11-r1.ebuild 2296 RMD160 65c90c7c98dd4479e41cefd709c8d978d6a954f1 SHA1 9df16440e636bbcaf444d96b6ed648cc009aa1f1 SHA256 cc0f46b870e66636035b0a0b0d8578ffe20bc955bd4a78de67810eca4e24c022
-MD5 f8f39d1a57b8074a95791b64a1c95b84 jabberd-2.0.11-r1.ebuild 2296
-RMD160 65c90c7c98dd4479e41cefd709c8d978d6a954f1 jabberd-2.0.11-r1.ebuild 2296
-SHA256 cc0f46b870e66636035b0a0b0d8578ffe20bc955bd4a78de67810eca4e24c022 jabberd-2.0.11-r1.ebuild 2296
+EBUILD jabberd-2.1.4.ebuild 2330 RMD160 771bae5fbdb463758d5816c660f5ffbce196cdef SHA1 81a4d6185a55366e58127f9e6470d3a32879053b SHA256 da88c8d53aa364528d0933765cc7c687d67abed13839c3cf6f54e64ef3aeb146
+MD5 13725474b621926e462d78e105919942 jabberd-2.1.4.ebuild 2330
+RMD160 771bae5fbdb463758d5816c660f5ffbce196cdef jabberd-2.1.4.ebuild 2330
+SHA256 da88c8d53aa364528d0933765cc7c687d67abed13839c3cf6f54e64ef3aeb146 jabberd-2.1.4.ebuild 2330
 MISC ChangeLog 15464 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 SHA1 2ed0d2fa838de3b4e1d720f577116af6eba842ec SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830
 MD5 e71dbcd3a38fc84fc22dac39a6019359 ChangeLog 15464
 RMD160 bac8facc410dced776f4b5d9f0c4b051100f9409 ChangeLog 15464
 SHA256 7ea8ffdf9c099ca3fc43ccb381100ce6b519de8f6bb582305535491373fb8830 ChangeLog 15464
 MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
 MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
 RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
 SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata.xml 399
 MD5 6608e1126e4f091819d2c41a1a8843a5 files/digest-jabberd-1.4.4-r3 241
 RMD160 0c09cceb4332b70a38db717adb4bd1d244337b72 files/digest-jabberd-1.4.4-r3 241
 SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/digest-jabberd-1.4.4-r3 241
-MD5 3cbebd7d43212be46daad3e042dce34f files/digest-jabberd-2.0.11-r1 244
-RMD160 4638cd85561494bb4ec40e8af80cc145f8156b23 files/digest-jabberd-2.0.11-r1 244
-SHA256 8d5a3e81789ef9e85b365e2974311b0f46ffb940a2b0bfdbc80457e40014f05b files/digest-jabberd-2.0.11-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGG06Wgo/w9rxVVVERAqwGAJ9hGphTLOa8Up4pjiU0RZR8wskt9wCfZBxL
-/1ZKMSqwcAOvHY/oik5od+U=
-=up4x
------END PGP SIGNATURE-----
+MD5 25a5e186c9891488b376450459f220b0 files/digest-jabberd-2.1.4 244
+RMD160 5821ca628801138bd4a32a32e10d6a513c14fa02 files/digest-jabberd-2.1.4 244
+SHA256 145d54a062e7bc260393ab78b287789593e3d6a6a7473c9543b89d2393826d7c files/digest-jabberd-2.1.4 244
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.11-r1 b/net-im/jabberd/files/digest-jabberd-2.0.11-r1
deleted file mode 100644
index 351198e..0000000
--- a/net-im/jabberd/files/digest-jabberd-2.0.11-r1
+++ b/dev/null
@@ -1,3 +0,0 @@
-MD5 67d1663ed97a5ba707d5d145b1d19c55 jabberd-2.0s11.tar.gz 777466
-RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d jabberd-2.0s11.tar.gz 777466
-SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a jabberd-2.0s11.tar.gz 777466
diff --git a/net-im/jabberd/files/digest-jabberd-2.1.4 b/net-im/jabberd/files/digest-jabberd-2.1.4
new file mode 100644
index 0000000..05015b1
--- a/dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.1.4
@@ -0,0 +1,3 @@
+MD5 88096f8be9c02ad424b6dc75fb29ae6f jabberd-2.1.4.tar.bz2 843796
+RMD160 1f8ab0b8ab51508ff89085f3fe1342fdd9b54204 jabberd-2.1.4.tar.bz2 843796
+SHA256 e9823c78505c233cc228146a181614a8f191f523948480f78a716fff2921385a jabberd-2.1.4.tar.bz2 843796
diff --git a/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch b/net-im/jabberd/files/jabberd-2.1.4-configure.in.patch
index 64a6697..64a6697 100644
--- a/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch
+++ b/net-im/jabberd/files/jabberd-2.1.4-configure.in.patch
diff --git a/net-im/jabberd/files/jabberd-2.0.11.init b/net-im/jabberd/files/jabberd-2.1.4.init
index fee8d2e..fee8d2e 100644
--- a/net-im/jabberd/files/jabberd-2.0.11.init
+++ b/net-im/jabberd/files/jabberd-2.1.4.init
diff --git a/net-im/jabberd/jabberd-2.0.11-r1.ebuild b/net-im/jabberd/jabberd-2.1.4.ebuild
index 5a28efe..4ecfc5b 100644
--- a/net-im/jabberd/jabberd-2.0.11-r1.ebuild
+++ b/net-im/jabberd/jabberd-2.1.4.ebuild
@@ -1,98 +1,98 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.11-r1.ebuild,v 1.8 2007/04/10 08:44:43 nelchael Exp $
+# $Header: $
 
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="none"
 inherit autotools eutils versionator
 
-MY_PV=$(replace_version_separator 2 s)
-
 DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd.jabberstudio.org/2/"
-SRC_URI="http://jabberstudio.2nw.net/${PN}2/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="http://jabberd2.xiaoka.com/"
+SRC_URI="http://ftp.xiaoka.com/${PN}2/releases/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite ssl"
+IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite ssl idn berkdb anon fs"
 
-DEPEND=">=net-im/jabber-base-0.01
-        dev-libs/openssl
-        net-dns/libidn
+RDEPEND=">=net-im/jabber-base-0.01
+        ssl? ( >=dev-libs/openssl-0.9.6b )
+        idn? ( net-dns/libidn )
         ldap? ( net-nds/openldap )
-        >=sys-libs/db-4.1.25
+        berkdb? ( >=sys-libs/db-4.1.25 )
         mysql? ( virtual/mysql )
         postgres? ( dev-db/postgresql )
         sqlite? ( =dev-db/sqlite-3* )
-        !=net-im/jabberd-2.0.11"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
+        dev-libs/expat
+        dev-libs/cyrus-sasl"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
-
         unpack ${A}
         cd "${S}"
-
         epatch "${FILESDIR}/${P}-configure.in.patch"
-
         eautoreconf
-
 }
 
 src_compile() {
 
         local localconf=
         if use debug; then
                 localconf="${localconf} --enable-debug"
                 use memdebug && localconf="${localconf} --enable-nad-debug --enable-pool-debug"
         else
                 if use memdebug; then
                         ewarn
                         ewarn '"memdebug" requires "debug" enabled.'
                         ewarn
                 fi
         fi
 
         econf \
                 --localstatedir=/var \
                 --sysconfdir=/etc/jabber \
                 --enable-db \
                 ${localconf} \
+                $(use_enable anon) \
+                $(use_enable fs) \
+                $(use_enable berkdb db) \
+                $(use_enable idn) \
                 $(use_enable ipv6) \
                 $(use_enable ldap) \
                 $(use_enable mysql) \
                 $(use_enable pam) \
                 $(use_enable pipe) \
                 $(use_enable postgres pgsql) \
                 $(use_enable sqlite) \
                 $(use_enable ssl) \
                 || die "econf failed"
         emake || die "make failed"
 
 }
 
 src_install() {
 
         make DESTDIR="${D}" install || die "make install failed"
 
         fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
         fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
 
         newinitd "${FILESDIR}/jabberd-${PV}.init" jabberd || die "newinitd failed"
 
         dodoc AUTHORS PROTOCOL README
         docinto tools
-        for i in db-setup.{mysql,pgsql} migrate.pl pipe-auth.pl; do
+        for i in db-* migrate.pl pipe-auth.pl; do
                 dodoc tools/${i}
         done
 
         cd "${D}/etc/jabber/"
         sed -i \
                 -e 's,/var/jabberd/pid/,/var/run/jabber/,g' \
                 -e 's,/var/jabberd/log/,/var/log/jabber/,g' \
                 -e 's,/var/jabberd/db,/var/spool/jabber/,g' \
                 *.xml *.xml.dist || die "sed failed"
-        sed -i \
+        use berkdb && sed -i \
                 -e 's,<module>mysql</module>,<module>db</module>,' \
                 c2s.xml*
 
 }