Remove old.

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

6 files changed, 6 insertions, 372 deletions

diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 241a399a28b4..7d24ffd73088 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/openfire
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.67 2015/06/01 09:26:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.68 2015/06/01 10:51:13 mrueg Exp $
+
+  01 Jun 2015; Manuel Rüger <mrueg@gentoo.org> -files/buildxml-ant.patch,
+  -files/openfire-3.8.0-buildxml.patch, -openfire-3.9.2-r1.ebuild,
+  -openfire-3.9.3-r1.ebuild, -openfire-3.9.3.ebuild:
+  Remove old.
 
   01 Jun 2015; Agostino Sarubbo <ago@gentoo.org> openfire-3.10.0.ebuild:
   Stable for x86, wrt bug #547552
diff --git a/net-im/openfire/files/buildxml-ant.patch b/net-im/openfire/files/buildxml-ant.patch
deleted file mode 100644
index e93cb11bd0dd..000000000000
--- a/net-im/openfire/files/buildxml-ant.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/build.xml	2010-06-27 23:37:11.000000000 +0200
-+++ build/build.xml	2010-06-27 23:37:29.000000000 +0200
-@@ -235,7 +235,6 @@
-                 </or>
-             </not>
-         </condition>
--        <fail if="ant.not.ok" message="Must use Ant 1.6.x or 1.7.x to build Openfire"/>
-         <fail if="java.not.ok" message="Must use JDK 1.5.x or higher to build Openfire"/>
- 
-         <tstamp/>
diff --git a/net-im/openfire/files/openfire-3.8.0-buildxml.patch b/net-im/openfire/files/openfire-3.8.0-buildxml.patch
deleted file mode 100644
index ce2c8b38abff..000000000000
--- a/net-im/openfire/files/openfire-3.8.0-buildxml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build/build.xml b/build/build.xml
-index fc3b75f..4eacc95 100644
---- a/build/build.xml
-+++ b/build/build.xml
-@@ -1244,6 +1244,7 @@
-     </target>
-     <target name="-plugins-impl" if="dirlist">
- 
-+        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
-         <!-- For each plugin in the main src dir, call the 'buildplugin' macro -->
-         <for list="${dirlist}" param="plugin" trim="true">
-             <sequential>
-@@ -1262,6 +1263,7 @@
-     </target>
-     <target name="-plugins-impl-dev" if="plugin.dev.dir" depends="anttasks">
- 
-+        <taskdef classname="net.sf.antcontrib.logic.For" name="for"/>
-         <!-- Get a list of plugins in the optional dev dir -->
-         <subdirinfo dir="${plugin.dev.dir}" property="dirlist2" ifexists="plugin.xml"/>
- 
diff --git a/net-im/openfire/openfire-3.9.2-r1.ebuild b/net-im/openfire/openfire-3.9.2-r1.ebuild
deleted file mode 100644
index 147a363a2e43..000000000000
--- a/net-im/openfire/openfire-3.9.2-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.9.2-r1.ebuild,v 1.3 2014/05/18 10:16:07 ago Exp $
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.5"
-
-S=${WORKDIR}/${PN}_src
-
-QA_PREBUILT="opt/openfire/resources/nativeAuth/*.so"
-
-pkg_setup() {
-	if [ -f /etc/env.d/98openfire ]; then
-		einfo "This is an upgrade"
-		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
-		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
-		ewarn "they can be downloaded via Admin Console or at"
-		ewarn "    ${HOMEPAGE}"
-	else
-		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
-		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
-		ewarn "For more info see bug #139708"
-		sleep 11
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.8.0-buildxml.patch
-	epatch "${FILESDIR}"/buildxml-ant.patch
-
-	# TODO should replace jars in build/lib with ones packaged by us -nichoj
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}
diff --git a/net-im/openfire/openfire-3.9.3-r1.ebuild b/net-im/openfire/openfire-3.9.3-r1.ebuild
deleted file mode 100644
index e2a423b8ca37..000000000000
--- a/net-im/openfire/openfire-3.9.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.9.3-r1.ebuild,v 1.1 2015/04/01 20:13:31 slyfox Exp $
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.5"
-
-S=${WORKDIR}/${PN}_src
-
-pkg_setup() {
-	if [ -f /etc/env.d/98openfire ]; then
-		einfo "This is an upgrade"
-		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
-		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
-		ewarn "they can be downloaded via Admin Console or at"
-		ewarn "    ${HOMEPAGE}"
-	else
-		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
-		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
-		ewarn "For more info see bug #139708"
-		sleep 11
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.8.0-buildxml.patch
-	epatch "${FILESDIR}"/buildxml-ant.patch
-
-	# TODO should replace jars in build/lib with ones packaged by us -nichoj
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-
-	# delete nativeAuth prebuilt libs:
-	#    uses outdated unmaintained libshaj, does not support amd64
-	rm -rfv target/openfire/resources/nativeAuth || dir
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}
diff --git a/net-im/openfire/openfire-3.9.3.ebuild b/net-im/openfire/openfire-3.9.3.ebuild
deleted file mode 100644
index 2dfa9ad3f088..000000000000
--- a/net-im/openfire/openfire-3.9.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.9.3.ebuild,v 1.1 2014/05/06 20:45:30 slyfox Exp $
-
-inherit eutils java-pkg-2 java-ant-2 systemd
-
-MY_P=${PN}_src_${PV//./_}
-DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
-HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
-SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND="net-im/jabber-base
-	~dev-java/ant-contrib-1.0_beta2
-	>=virtual/jdk-1.5"
-
-S=${WORKDIR}/${PN}_src
-
-QA_PREBUILT="opt/openfire/resources/nativeAuth/*.so"
-
-pkg_setup() {
-	if [ -f /etc/env.d/98openfire ]; then
-		einfo "This is an upgrade"
-		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
-		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
-		ewarn "they can be downloaded via Admin Console or at"
-		ewarn "    ${HOMEPAGE}"
-	else
-		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
-		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
-		ewarn "For more info see bug #139708"
-		sleep 11
-	fi
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.8.0-buildxml.patch
-	epatch "${FILESDIR}"/buildxml-ant.patch
-
-	# TODO should replace jars in build/lib with ones packaged by us -nichoj
-}
-
-src_compile() {
-	# Jikes doesn't support -source 1.5
-	java-pkg_filter-compiler jikes
-
-	ANT_TASKS="ant-contrib"
-	eant -f build/build.xml openfire plugins $(use_doc)
-}
-
-src_install() {
-	dodir /opt/openfire
-
-	newinitd "${FILESDIR}"/openfire-initd openfire
-	newconfd "${FILESDIR}"/openfire-confd openfire
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodir /opt/openfire/conf
-	insinto /opt/openfire/conf
-	newins target/openfire/conf/openfire.xml openfire.xml.sample
-	newins target/openfire/conf/security.xml security.xml.sample
-
-	dodir /opt/openfire/logs
-	keepdir /opt/openfire/logs
-
-	dodir /opt/openfire/lib
-	insinto /opt/openfire/lib
-	doins target/openfire/lib/*
-
-	dodir /opt/openfire/plugins
-	insinto /opt/openfire/plugins
-	doins -r target/openfire/plugins/*
-
-	dodir /opt/openfire/resources
-	insinto /opt/openfire/resources
-	doins -r target/openfire/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	dodir /etc/env.d/
-	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
-}
-
-pkg_postinst() {
-	local src
-	local dst
-
-	# http://community.igniterealtime.org/thread/52289
-	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
-	do
-		src="${dst}".sample
-		if [[ -f "${dst}" ]]; then
-			einfo "Leaving old '${dst}'"
-		else
-			einfo "Created default '${dst}'. Please edit."
-			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
-			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
-		fi
-	done
-	chown -R jabber:jabber "${ROOT}"/opt/openfire
-}