fix init script and revbump wrt #494302, remove old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

7 files changed, 22 insertions, 284 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 394b41f4e003..498e813e6dc4 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,15 @@
 # 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.50 2013/12/13 14:41:32 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.51 2013/12/15 12:48:59 hasufell Exp $
+
+*jabberd2-2.3.1-r1 (15 Dec 2013)
+
+  15 Dec 2013; Julian Ospald <hasufell@gentoo.org> -jabberd2-2.2.17.ebuild,
+  -jabberd2-2.2.17-r1.ebuild, -files/jabberd2-2.2.17.init,
+  -files/jabberd2-2.2.17.logrotate, -jabberd2-2.3.1.ebuild,
+  +jabberd2-2.3.1-r1.ebuild, +files/jabberd2-2.3.1.init,
+  +files/jabberd2-2.3.1.logrotate, +files/jabberd2-2.3.1.pamd:
+  fix init script and revbump wrt #494302, remove old
 
 *jabberd2-2.3.1 (13 Dec 2013)
 
diff --git a/net-im/jabberd2/files/jabberd2-2.2.17.init b/net-im/jabberd2/files/jabberd2-2.3.1.init
index 32cb1777dd60..d56c7f76e133 100644
--- a/net-im/jabberd2/files/jabberd2-2.2.17.init
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.init
@@ -1,7 +1,7 @@
 #!/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.17.init,v 1.1 2013/11/01 21:50:22 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.3.1.init,v 1.1 2013/12/15 12:48:59 hasufell Exp $
 
 depend() {
 	need net
@@ -64,7 +64,7 @@ start() {
 			--start  \
 			--user jabber:jabber \
 			--exec /usr/bin/${service} \
-			--pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \
+			--pid /var/run/jabber/jabberd2-$(basename ${cfgfile%.xml}).pid \
 			-- -c ${cfgfile}
 		eend $?
 
diff --git a/net-im/jabberd2/files/jabberd2-2.2.17.logrotate b/net-im/jabberd2/files/jabberd2-2.3.1.logrotate
index 0ce109263fbe..0ce109263fbe 100644
--- a/net-im/jabberd2/files/jabberd2-2.2.17.logrotate
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.logrotate
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/jabberd2-2.2.17-r1.ebuild b/net-im/jabberd2/jabberd2-2.2.17-r1.ebuild
deleted file mode 100644
index ed36818ff953..000000000000
--- a/net-im/jabberd2/jabberd2-2.2.17-r1.ebuild
+++ /dev/null
@@ -1,152 +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.17-r1.ebuild,v 1.2 2013/11/03 12:52:04 hasufell Exp $
-
-EAPI=5
-
-inherit db-use eutils flag-o-matic pam
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.org"
-SRC_URI="mirror://github/jabberd2/jabberd2/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-base )
-	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 UPGRADE )
-
-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() {
-	local i
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
-	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() {
-	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.2.17.init" jabberd
-	newpamd "${FILESDIR}/${PN}-2.2.8.pamd" jabberd
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.2.17.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}
-}
-
-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.2.17.ebuild b/net-im/jabberd2/jabberd2-2.2.17.ebuild
deleted file mode 100644
index 63cad8b99d1b..000000000000
--- a/net-im/jabberd2/jabberd2-2.2.17.ebuild
+++ /dev/null
@@ -1,125 +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.17.ebuild,v 1.4 2013/11/01 22:11:47 hasufell Exp $
-
-EAPI=5
-
-inherit db-use eutils flag-o-matic pam
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.org"
-SRC_URI="mirror://github/jabberd2/jabberd2/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-base )
-	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 UPGRADE )
-
-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
-
-	# 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
-}
-
-src_configure() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
-	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() {
-	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}
-
-	newinitd "${FILESDIR}/${PN}-2.2.17.init" jabberd
-	newpamd "${FILESDIR}/${PN}-2.2.8.pamd" jabberd
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.2.17.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}
-}
-
-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
-
-}
diff --git a/net-im/jabberd2/jabberd2-2.3.1.ebuild b/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild
index 726661b3f05a..3439a8f288a9 100644
--- a/net-im/jabberd2/jabberd2-2.3.1.ebuild
+++ b/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1.ebuild,v 1.1 2013/12/13 14:41:32 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild,v 1.1 2013/12/15 12:48:59 hasufell Exp $
 
 EAPI=5
 
@@ -119,10 +119,10 @@ src_install() {
 		mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die
 	done
 
-	newinitd "${FILESDIR}/${PN}-2.2.17.init" jabberd
-	newpamd "${FILESDIR}/${PN}-2.2.8.pamd" jabberd
+	newinitd "${FILESDIR}/${P}.init" jabberd
+	newpamd "${FILESDIR}/${P}.pamd" jabberd
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-2.2.17.logrotate" jabberd
+	newins "${FILESDIR}/${P}.logrotate" jabberd
 
 	docompress -x /usr/share/doc/${PF}/tools
 	docinto tools