Claiming for java herd. Revision bump to support new Java system. Should address bug #132765

(Portage version: 2.1.1_pre1)

6 files changed, 91 insertions, 27 deletions

diff --git a/dev-db/xindice/ChangeLog b/dev-db/xindice/ChangeLog
index 3f3635be9eec..aceaa6cd7543 100644
--- a/dev-db/xindice/ChangeLog
+++ b/dev-db/xindice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/xindice
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.10 2005/09/05 13:05:43 phosphan Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.11 2006/07/01 18:46:15 nichoj Exp $
+
+  01 Jul 2006; Joshua Nichols <nichoj@gentoo.org> metadata.xml,
+  xindice-1.0-r3.ebuild:
+  Claiming for java herd. Revision bump to support new Java system. Should
+  address bug #132765
 
   05 Sep 2005; Patrick Kursawe <phosphan@gentoo.org> xindice-1.0-r3.ebuild:
   Using POSIX options for cp
diff --git a/dev-db/xindice/files/digest-xindice-1.0-r3 b/dev-db/xindice/files/digest-xindice-1.0-r3
index 698604115f93..ff289e6dede3 100644
--- a/dev-db/xindice/files/digest-xindice-1.0-r3
+++ b/dev-db/xindice/files/digest-xindice-1.0-r3
@@ -1 +1,3 @@
 MD5 895bf529f483be5885cf4c963b4111a8 xml-xindice-1.0.tar.gz 5304315
+RMD160 1253aa693340cd3c7d5210050adb53cf842069f3 xml-xindice-1.0.tar.gz 5304315
+SHA256 d81c418dacc86d5cfa66c422e12a2438280b784150d99152e7bd287ab3403cb1 xml-xindice-1.0.tar.gz 5304315
diff --git a/dev-db/xindice/files/digest-xindice-1.0-r4 b/dev-db/xindice/files/digest-xindice-1.0-r4
new file mode 100644
index 000000000000..ff289e6dede3
--- /dev/null
+++ b/dev-db/xindice/files/digest-xindice-1.0-r4
@@ -0,0 +1,3 @@
+MD5 895bf529f483be5885cf4c963b4111a8 xml-xindice-1.0.tar.gz 5304315
+RMD160 1253aa693340cd3c7d5210050adb53cf842069f3 xml-xindice-1.0.tar.gz 5304315
+SHA256 d81c418dacc86d5cfa66c422e12a2438280b784150d99152e7bd287ab3403cb1 xml-xindice-1.0.tar.gz 5304315
diff --git a/dev-db/xindice/metadata.xml b/dev-db/xindice/metadata.xml
index 0caa769b0ee9..838c00a4a448 100644
--- a/dev-db/xindice/metadata.xml
+++ b/dev-db/xindice/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>phosphan@gentoo.org</email>
-<description>Feel free to take this if you want it.</description>
-</maintainer>
+<herd>java</herd>
 </pkgmetadata>
diff --git a/dev-db/xindice/xindice-1.0-r3.ebuild b/dev-db/xindice/xindice-1.0-r3.ebuild
index 3afeb2885eab..8c2df34fc333 100644
--- a/dev-db/xindice/xindice-1.0-r3.ebuild
+++ b/dev-db/xindice/xindice-1.0-r3.ebuild
@@ -1,49 +1,43 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r3.ebuild,v 1.4 2005/09/05 13:05:43 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r3.ebuild,v 1.5 2006/07/01 18:46:15 nichoj Exp $
 
-inherit eutils
+inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="A native java XML database"
 HOMEPAGE="http://xml.apache.org/xindice"
-SRC_URI="http://xml.apache.org/xindice/dist/xml-xindice-${PV}.tar.gz"
+SRC_URI="http://xml.apache.org/xindice/dist/xml-${P}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~x86 ~ppc"
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.3
 	dev-java/ant"
 
-S=${WORKDIR}/xml-${P}
+S="${WORKDIR}/xml-${P}"
 
 pkg_preinst() {
 	enewgroup xindice || die "Adding group xindice failed"
 	enewuser xindice -1 /bin/sh /var/run/xindice xindice || die "Adding user xindice failed"
 }
 
-pkg_setup() {
-	ewarn "This has only been tested with Sun's JDK!"
-	ewarn "Good luck if you use another VM"
-}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PF}.patch
+	epatch ${FILESDIR}/${P}-r3.patch
 }
 
 src_compile() {
 	export XINDICE_HOME=${S}
-	ant || die "compile failed"
-	use doc && ant docs
+	eant main $(use_doc docs)
 }
 
 src_install() {
-	export TARGET=/opt/xindice
-	keepdir /var/run/xindice
-	chown xindice:xindice ${D}/var/run/xindice
+	export TARGET=/opt/${PN}
+	keepdir /var/run/${PN}
+	chown ${PN}:${PN} ${D}/var/run/${PN}
 	dodir ${TARGET}
 	dodir ${TARGET}/java
 	cp -pPR bin config icons docs logs idl ${D}${TARGET}
@@ -54,13 +48,13 @@ src_install() {
 	dohtml docs/AdministratorsGuide.html docs/DevelopersGuide.html docs/UsersGuide.html docs/ToolsReference.html docs/feather.gif docs/index.html docs/xindice.jpg
 	dodir /etc/env.d
 	insinto /etc/env.d
-	doins ${FILESDIR}/21xindice
+	doins ${FILESDIR}/21${PN}
 	dodir /etc/init.d
 	insinto /etc/init.d
 	insopts -m0755
-	newins ${FILESDIR}/xindice-r2 xindice
+	newins ${FILESDIR}/${PN}-r2 ${PN}
 	insinto ${TARGET}
 	doins start
-	keepdir /opt/xindice/db
+	keepdir /opt/${PN}/db
 	chown -R xindice:xindice ${D}/opt/xindice
 }
diff --git a/dev-db/xindice/xindice-1.0-r4.ebuild b/dev-db/xindice/xindice-1.0-r4.ebuild
new file mode 100644
index 000000000000..ec212100fc2d
--- /dev/null
+++ b/dev-db/xindice/xindice-1.0-r4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r4.ebuild,v 1.1 2006/07/01 18:46:15 nichoj Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A native java XML database"
+HOMEPAGE="http://xml.apache.org/xindice"
+SRC_URI="http://xml.apache.org/${PN}/dist/xml-${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc"
+
+# breaks with XML apis of Java 1.5
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.3* )
+	dev-java/ant"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )"
+
+S=${WORKDIR}/xml-${P}
+
+pkg_setup() {
+	enewgroup ${PN} || die "Adding group ${PN} failed"
+	enewuser ${PN} -1 /bin/sh /var/run/${PN} ${PN} || die "Adding user ${PN} failed"
+
+	java-pkg-2_pkg_setup
+}
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-r3.patch
+}
+
+src_compile() {
+	export XINDICE_HOME=${S}
+	eant $(use doc docs)
+}
+
+src_install() {
+	export TARGET=/opt/${PN}
+	keepdir /var/run/${PN}
+	chown ${PN}:${PN} ${D}/var/run/${PN}
+	dodir ${TARGET}
+	dodir ${TARGET}/java
+	cp -pPR bin config icons docs logs idl ${D}${TARGET}
+	cd java
+	cp -pPR lib tests examples ${D}${TARGET}/java
+	cd ..
+	dodoc docs/LICENSE docs/README docs/FAQ docs/TODO docs/VERSIONS docs/AUTHORS
+	dohtml docs/AdministratorsGuide.html docs/DevelopersGuide.html docs/UsersGuide.html docs/ToolsReference.html docs/feather.gif docs/index.html docs/xindice.jpg
+	dodir /etc/env.d
+	insinto /etc/env.d
+	doins ${FILESDIR}/21${PN}
+	dodir /etc/init.d
+	insinto /etc/init.d
+	insopts -m0755
+	newins ${FILESDIR}/${PN}-r2 ${PN}
+	insinto ${TARGET}
+	doins start
+	keepdir /opt/${PN}/db
+	chown -R ${PN}:${PN} ${D}/opt/${PN}
+}