4 files changed, 5 insertions, 191 deletions
diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 907ea6dfecdd..575b7c531a9e 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.56 2014/01/06 09:29:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.57 2014/01/06 14:44:42 hasufell Exp $
+
+  06 Jan 2014; Julian Ospald <hasufell@gentoo.org> -files/jabberd2-2.2.8.init,
+  -files/jabberd2-2.2.8.pamd, -jabberd2-2.2.14-r1.ebuild:
+  clean up wrt #432936
 
   06 Jan 2014; Agostino Sarubbo <ago@gentoo.org> jabberd2-2.3.1-r1.ebuild:
   Stable for sparc, wrt bug #432936
diff --git a/net-im/jabberd2/files/jabberd2-2.2.8.init b/net-im/jabberd2/files/jabberd2-2.2.8.init
deleted file mode 100644
index 2a838267e300..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.8.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.8.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 /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.8.pamd b/net-im/jabberd2/files/jabberd2-2.2.8.pamd
deleted file mode 100644
index 2c5a5347ad6a..000000000000
--- a/net-im/jabberd2/files/jabberd2-2.2.8.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.14-r1.ebuild b/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
deleted file mode 100644
index 5a9686319d86..000000000000
--- a/net-im/jabberd2/jabberd2-2.2.14-r1.ebuild
+++ /dev/null
@@ -1,103 +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.14-r1.ebuild,v 1.6 2013/09/14 10:40:21 ago Exp $
-
-EAPI=5
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-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"
-
-S="${WORKDIR}/jabberd-${PV}"
-
-REQUIRED_USE="memdebug? ( debug )"
-
-DOCS=( AUTHORS README UPGRADE )
-
-src_configure() {
-	# 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)"
-
-	# --enable-pool-debug is currently broken
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-fs --enable-pipe --enable-anon \
-		${myconf} \
-		$(use debug && echo '--enable-debug') \
-		$(use memdebug && echo '--enable-nad-debug') \
-		$(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)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	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
-	newpamd "${FILESDIR}/${PN}-2.2.8.pamd" jabberd
-
-	docinto tools
-	dodoc tools/db-setup{.mysql,.pgsql,.sqlite}
-	dodoc tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl}
-
-	pushd "${D}/etc/jabber/" &>/dev/null || die
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/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"
-	popd
-}
-
-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
-
-}