proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

10 files changed, 690 insertions, 0 deletions

diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
new file mode 100644
index 000000000000..9e461eda2d33
--- /dev/null
+++ b/net-im/jabberd2/Manifest
@@ -0,0 +1,2 @@
+DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
+DIST jabberd-2.3.2.tar.xz 1473436 SHA256 ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03 WHIRLPOOL 42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.init b/net-im/jabberd2/files/jabberd2-2.3.1.init
new file mode 100644
index 000000000000..696a94489836
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.init
@@ -0,0 +1,82 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 executable cfgfile pidfile
+	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})"
+		pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')"
+		start-stop-daemon \
+			--background \
+			--start  \
+			--user jabber:jabber \
+			--exec /usr/bin/${service} \
+			--pid ${pidfile} \
+			-- -c ${cfgfile}
+		eend $?
+
+	done
+	eoutdent
+
+}
+
+stop() {
+
+	einfo "Stopping Jabber Server"
+	stopJabberServices
+
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.logrotate b/net-im/jabberd2/files/jabberd2-2.3.1.logrotate
new file mode 100644
index 000000000000..0ce109263fbe
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.logrotate
@@ -0,0 +1,10 @@
+/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log {
+	su jabber jabber
+	sharedscripts
+	postrotate
+	kill -HUP $(cat /var/run/jabberd/c2s.pid)
+	kill -HUP $(cat /var/run/jabberd/s2s.pid)
+	kill -HUP $(cat /var/run/jabberd/sm.pid)
+	kill -HUP $(cat /var/run/jabberd/router.pid)
+	endscript
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.pamd b/net-im/jabberd2/files/jabberd2-2.3.1.pamd
new file mode 100644
index 000000000000..2c5a5347ad6a
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.pamd
@@ -0,0 +1,6 @@
+#%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.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init
new file mode 100644
index 000000000000..108923fa71c0
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.init
@@ -0,0 +1,97 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_commands="reload"
+
+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 executable cfgfile pidfile
+	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})"
+		pidfile="$(grep -v ^# ${cfgfile} | grep '<pidfile>' | sed 's#<.\?pidfile>##g')"
+		start-stop-daemon \
+			--background \
+			--start  \
+			--user jabber:jabber \
+			--exec /usr/bin/${service} \
+			--pid ${pidfile} \
+			-- -c ${cfgfile}
+		eend $?
+
+	done
+	eoutdent
+
+}
+
+reload() {
+	eindent
+	for pidfile in /var/run/jabber/*.pid; do
+		if [ -f "${pidfile}" ]; then
+			service=$(basename ${pidfile} .pid)
+			ebegin "Reloading ${service}"
+			kill -HUP $(cat ${pidfile})
+			eend $?
+		fi
+	done
+ 	eoutdent
+}
+
+stop() {
+
+	einfo "Stopping Jabber Server"
+	stopJabberServices
+
+}
diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate
new file mode 100644
index 000000000000..fcec0f7a1d59
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate
@@ -0,0 +1,8 @@
+/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log {
+	su jabber jabber
+	sharedscripts
+	missingok
+	postrotate
+	/etc/init.d/jabberd reload
+	endscript
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..67b1f04854e8
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE="berkdb debug ldap memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql )
+	ssl? ( >=dev-libs/openssl-1.0.1:0 )
+	sqlite? ( dev-db/sqlite:3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+		-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+		-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+		-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+		etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+	# https://github.com/jabberd2/jabberd2/issues/34
+	replace-flags -O[3s] -O2
+
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${P}.init" jabberd
+	newpamd "${FILESDIR}/${P}.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${P}.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+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
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..aecb34c0a813
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql )
+	ssl? ( >=dev-libs/openssl-1.0.1:0 )
+	sqlite? ( dev-db/sqlite:3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+		-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+		-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+		-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+		etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+	# https://github.com/jabberd2/jabberd2/issues/34
+	replace-flags -O[3s] -O2
+
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+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
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/jabberd2-2.3.2.ebuild b/net-im/jabberd2/jabberd2-2.3.2.ebuild
new file mode 100644
index 000000000000..31e378486ea6
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org"
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+	net-libs/udns
+	net-dns/libidn
+	virtual/gsasl
+	berkdb? ( >=sys-libs/db-4.1.25 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql )
+	ssl? ( >=dev-libs/openssl-1.0.1:0 )
+	sqlite? ( dev-db/sqlite:3 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	>=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+	# Fix some default directory locations
+	sed -i \
+		-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+		-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+		-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+		-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+		-e 's,@localstatedir@,/var/spool,g' \
+		-e 's,@package@,jabber,g' \
+		etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!"
+
+	# If the package wasn't merged with sqlite then default to use berkdb
+	use sqlite ||
+		sed -i \
+			-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \
+			etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!"
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	sed -i \
+		-e 's/@jabberd_router_bin@/jabberd2-router/' \
+		-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+		-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+		-e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+		etc/jabberd*.in || die "fixing file collisions failed!"
+
+	# rename pid files wrt #241472
+	sed -i \
+		-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+		-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+		-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+		-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+		etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+	# https://github.com/jabberd2/jabberd2/issues/34
+	replace-flags -O[3s] -O2
+
+	# --enable-pool-debug is currently broken
+	econf \
+		--sysconfdir=/etc/jabber \
+		$(usex debug "--enable-debug" "") \
+		$(usex memdebug "--enable-nad-debug" "") \
+		$(use_enable ssl) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
+		$(use_enable berkdb db) \
+		$(use_enable ldap) \
+		$(use_enable pam) \
+		--enable-pipe \
+		--enable-anon \
+		--enable-fs \
+		$(use_enable experimental) \
+		$(use_enable test tests) \
+		$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+		$(use_with zlib)
+}
+
+src_install() {
+	local i
+
+	default
+	prune_libtool_files --modules
+
+	keepdir /var/spool/jabber/{fs,db}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
+		/var/spool/jabber/{fs,db}
+	fperms 770 /var/spool/jabber/{fs,db}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
+
+	# avoid file collision with x11-misc/screen-message wrt #453994
+	for i in router sm c2s s2s ; do
+		einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}"
+		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
+	done
+
+	newinitd "${FILESDIR}/${PN}-2.3.1.init" jabberd
+	newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-2.3.1.logrotate" jabberd
+
+	docompress -x /usr/share/doc/${PF}/tools
+	docinto tools
+	dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \
+		tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
+
+	# remove useless upstart files wrt #498900
+	rm -rf "${ED%/}"/usr/etc
+}
+
+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
+
+	if use sqlite || use mysql || use postgres; then
+		echo
+		einfo "You will need to setup or update your database using the"
+		einfo "scripts in /usr/share/doc/${PF}/tools/"
+		echo
+	fi
+
+	ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have'
+	ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because'
+	ewarn 'the binaries have been renamed to avoid file collisions!'
+}
diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml
new file mode 100644
index 000000000000..8da71244c21f
--- /dev/null
+++ b/net-im/jabberd2/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>net-im</herd>
+	<use>
+		<flag name='experimental'>Enable experimental features such
+			as TLS Everywhere.</flag>
+		<flag name='memdebug'>Enable nad and pool debug.
+			Requires USE="debug" to be set.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type='github'>jabberd2/jabberd2</remote-id>
+	</upstream>
+</pkgmetadata>