Bump

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

3 files changed, 119 insertions, 2 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index f33316a4b791..b1bda4930c2f 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,11 @@
 # 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.34 2013/01/23 11:41:03 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.35 2013/02/02 09:53:05 patrick Exp $
+
+*jabberd2-2.2.14 (02 Feb 2013)
+
+  02 Feb 2013; Patrick Lauer <patrick@gentoo.org> +jabberd2-2.2.14.ebuild:
+  Bump
 
   23 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> jabberd2-2.2.1.ebuild,
   jabberd2-2.2.4.ebuild, jabberd2-2.2.5.ebuild, jabberd2-2.2.8.ebuild:
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 234bddaa2ab6..6e5c582cadd9 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -7,12 +7,14 @@ AUX jabberd2-2.2.5.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7
 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.1.tar.bz2 645496 SHA256 6790e4f76febc2889bbe463c85879a4cccc9e6d72f98c9d0bb2a6fe0fa848aa6
+DIST jabberd-2.2.14.tar.bz2 615984 SHA256 cd6bd518dda172935ad16f180f40ba6ebf7d4aa83ef4f9445ac6b55b438a9e3f SHA512 96f33990d8d7c1b4751530f483c6ac0ded0936b73465f3a52cab853f3cea2af218cd15a7e3d911732f730775fb24e95211e9f4a722138d674484c8a564e23418 WHIRLPOOL a3d380fc90c1fb63e46e7f1484a38d7b58852562455f987852f4db275c01583cfef8c43057e69ba3d6b440260c12ad97cd4e31456b091211f7b4344eb93f2c46
 DIST jabberd-2.2.4.tar.bz2 649737 SHA256 8cb7a69e92b8a7994a42ba28b910bc90e3174a7cc5928f1025bc1e17aee33eec
 DIST jabberd-2.2.5.tar.bz2 649910 SHA256 14c36491f2fe83caacac6bef49b77dc43d56c76bc375fc0cf85e8373010f54e9
 DIST jabberd-2.2.8.tar.bz2 631830 SHA256 772959b0582fca92168f151252fd6a2286b715d72959ce494ca92935957961a3
 EBUILD jabberd2-2.2.1.ebuild 2924 SHA256 adb842dfba0a645cbe823746e04aa281778517f2beba19e36857ac99783c39d7 SHA512 1ca53896c662b2f4b131970cc28302c010c9aca3bf96d857645f65edd368e8274e40413eafdcf992f034b87e7193b7819ca7515cd1c8e475ec1e10061c573d5a WHIRLPOOL d5391805d19d9e1a2f21c0bac9d49b54d4906c4add56c27a71bca78642d0d2c640b032aca67767d51b298a59717a7c0b327567270b3db70cc1047aa7bb4e16a3
+EBUILD jabberd2-2.2.14.ebuild 2956 SHA256 a4f5d63368bf0a5b8345502ee15d94449d8f7c30345479fba1f1ffd93011261a SHA512 3fd21c14cd50180c4fba7f4dc6ad790d35af763a7a810246eba622a8c5d1501a92a85b1a6cb80bd44da7729c2ae04709df94e09c5546319800d07f215f165f61 WHIRLPOOL 1994481447a6d1d7758ab7cbe6edd8ba4688f3d42354c5a4f4540f9f027c2b9c13f6eba3918e205ea78f6c560b4ab6976931247f7c7b8084dbb54162f09df69c
 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 6411 SHA256 09fe07e34d44b507028f014c2186ec34b42de62e58aee1780108dbcf7e31a297 SHA512 facb9136ee137cf04db4eca9dacd469fb58c767dc00105f4bf656f064b870e939eb1700112802b9379ee83779d23e59468965453d1b1f741b6e6b286b4adb197 WHIRLPOOL f6e7e4685288a97573fb28d929508b88fb666b6857d0332e886062fa49ed15dc5065a86e274a42879e12bd3802e4275209151f8b3d856cd4606fbd2dcbea08fc
+MISC ChangeLog 6525 SHA256 12a9e7b7a2061e3d219bb7aaae33c96aebab29f4e7f6384f9e9e129c3b98382e SHA512 901feb026187a7b8a8342a528d70ec4a9e8672bd6a5f1d5815d850f6b296decf3f7a1e7159cd8963da999a7fbcf0dfbea10209d1c47ee1893f184cac29e1983a WHIRLPOOL 26b4e67410477a1a5dca6aca3ca0323a473356f46031d8db5584d09053081ebcc70944b63e5a0ce9eb99630f4aeb7da12046b0a322fb8c490ac5396b68fd155a
 MISC metadata.xml 404 SHA256 7a3d84eedcd014d9bff34a5d40be06cb6e5f240ef37e287413a8d6772cc0f407 SHA512 db8b4fb6db45a48db7c4746ef7fa3bd9b07731030505e782e9bb155535918ef9bdd9253ba9fac93d3def3e485d03ba24b8748b1404df46b9024cfac18bad4315 WHIRLPOOL 3b1c344807fffbd71bf9816b57886b007e7faaace3018674762c676f718b73b40a11ae2c346d907c345d022dbe3e713cc27bc8675a055744f2c3b01c35d99eff
diff --git a/net-im/jabberd2/jabberd2-2.2.14.ebuild b/net-im/jabberd2/jabberd2-2.2.14.ebuild
new file mode 100644
index 000000000000..2dd8f7bab330
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.2.14.ebuild
@@ -0,0 +1,110 @@
+# 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.ebuild,v 1.1 2013/02/02 09:53:05 patrick 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}/${PN}-2.2.8.init" jabberd || die "newinitd failed"
+	newpamd "${FILESDIR}/${PN}-2.2.8.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
+
+}