See bug 61131

6 files changed, 142 insertions, 2 deletions

diff --git a/dev-db/xindice/ChangeLog b/dev-db/xindice/ChangeLog
index d379782c6d00..55d0959b9cbe 100644
--- a/dev-db/xindice/ChangeLog
+++ b/dev-db/xindice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/xindice
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.5 2004/08/23 07:37:23 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.6 2004/08/27 10:16:52 phosphan Exp $
+
+*xindice-1.0-r2 (27 Aug 2004)
+
+  27 Aug 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/xindice-1.0-r2.patch, +files/xindice-r1, +xindice-1.0-r2.ebuild:
+  Compilation problems (bug #61131) force to use external ant.
+  Start script was referring to old location in /usr/lib.
 
   23 Aug 2004; Patrick Kursawe <phosphan@gentoo.org> xindice-1.0-r1.ebuild:
   Warning about JVM in setup now
diff --git a/dev-db/xindice/Manifest b/dev-db/xindice/Manifest
index a15d9aeeb500..efe75faac4c5 100644
--- a/dev-db/xindice/Manifest
+++ b/dev-db/xindice/Manifest
@@ -1,9 +1,13 @@
 MD5 3bb0575316332bcad87459b4ec24cd64 xindice-1.0.ebuild 1669
 MD5 4c1d1a2336e7d392f953f1d61e361e75 xindice-1.0-r1.ebuild 1722
-MD5 0e515ecb088058ff08fbfe86748fc654 ChangeLog 897
+MD5 f6b881b15b7d1e1e782d506c0522ba0d ChangeLog 1177
+MD5 38a8dd51049091e1aabac6f9c5344794 xindice-1.0-r2.ebuild 1740
 MD5 85c1e9e08b30ad9e2e532dc4bd28b4d4 files/xindice 581
+MD5 ff1f2667831428923e23c6cf4da6c01b files/xindice-r1 580
 MD5 e15ba5cda4959873e75d236563c8d461 files/xindice-1.0-r1.patch 1309
 MD5 c87c4724c3cbf94d7c0379589a13ad2b files/21xindice 26
+MD5 e15ba5cda4959873e75d236563c8d461 files/xindice-1.0-r2.patch 1309
 MD5 c2e834a3314f4a4d91fbb3b1df7d7e47 files/xindice-1.0.patch 725
 MD5 7e4600809285fee4636287cb3cffbff9 files/digest-xindice-1.0 309
 MD5 9118e012b53e1f982cf60417ff17f43c files/digest-xindice-1.0-r1 68
+MD5 9118e012b53e1f982cf60417ff17f43c files/digest-xindice-1.0-r2 68
diff --git a/dev-db/xindice/files/digest-xindice-1.0-r2 b/dev-db/xindice/files/digest-xindice-1.0-r2
new file mode 100644
index 000000000000..698604115f93
--- /dev/null
+++ b/dev-db/xindice/files/digest-xindice-1.0-r2
@@ -0,0 +1 @@
+MD5 895bf529f483be5885cf4c963b4111a8 xml-xindice-1.0.tar.gz 5304315
diff --git a/dev-db/xindice/files/xindice-1.0-r2.patch b/dev-db/xindice/files/xindice-1.0-r2.patch
new file mode 100644
index 000000000000..b244206afa18
--- /dev/null
+++ b/dev-db/xindice/files/xindice-1.0-r2.patch
@@ -0,0 +1,39 @@
+--- java/src/org/apache/xindice/core/query/XPathQueryResolver.java	2004-02-23 15:22:10.556196304 -0500
++++ java/src/org/apache/xindice/core/query/XPathQueryResolver.java	2004-02-23 15:23:18.094928856 -0500
+@@ -499,7 +499,7 @@
+       private Object evalFunction(int op, String owner, int pos) throws Exception {
+          int idx = cmp.getFirstChildPos(pos);
+          int id = cmp.getOp(idx);
+-         int endFunc = pos + cmp.getOpMap()[pos+1] - 1;
++         int endFunc = pos + cmp.getOpMap().elementAt(pos+1) - 1;
+ 
+          List args = new ArrayList();
+          int lp = idx+1;
+--- start	2003-04-07 15:44:25.000000000 +0200
++++ start.new	2003-04-07 15:53:39.000000000 +0200
+@@ -11,8 +11,8 @@
+ echo "-----------"
+ echo "XINDICE_HOME = " $XINDICE_HOME
+ 
+-if test -f $XINDICE_HOME/config/xindice.pid; then
+-   echo "A Xindice instance is already running with PID" `cat $XINDICE_HOME/config/xindice.pid`
++if test -f /var/run/xindice/xindice.pid; then
++   echo "A Xindice instance is already running with PID" `cat /var/run/xindice/xindice.pid`
+    exit
+ fi
+ 
+@@ -42,7 +42,7 @@
+ 
+ cd $XINDICE_HOME
+ 
+-echo $$ > $XINDICE_HOME/config/xindice.pid
++echo $$ > /var/run/xindice/xindice.pid
+ 
+ RESTART=1
+ 
+@@ -73,4 +73,4 @@
+ done
+ 
+ trap 1 2 15
+-rm $XINDICE_HOME/config/xindice.pid
++rm /var/run/xindice/xindice.pid
diff --git a/dev-db/xindice/files/xindice-r1 b/dev-db/xindice/files/xindice-r1
new file mode 100644
index 000000000000..f59cbebb6fc4
--- /dev/null
+++ b/dev-db/xindice/files/xindice-r1
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/files/xindice-r1,v 1.1 2004/08/27 10:16:52 phosphan Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting xindice..."
+	start-stop-daemon --pidfile /var/run/xindice/xindice.pid\
+		--start --background --user xindice --chuid xindice\
+		--exec /opt/xindice/start	
+	eend $?
+}
+
+
+stop() {
+	ebegin "Stopping xindice..."
+	start-stop-daemon --pidfile /var/run/xindice/xindice.pid --stop	--retry 10
+	eend $?
+}
diff --git a/dev-db/xindice/xindice-1.0-r2.ebuild b/dev-db/xindice/xindice-1.0-r2.ebuild
new file mode 100644
index 000000000000..fe3d32a3ac65
--- /dev/null
+++ b/dev-db/xindice/xindice-1.0-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r2.ebuild,v 1.1 2004/08/27 10:16:52 phosphan Exp $
+
+inherit eutils
+
+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"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc"
+
+DEPEND=">=dev-java/sun-jdk-1.3
+	dev-java/ant"
+
+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}/${PN}-${PVR}.patch
+}
+
+src_compile() {
+	export XINDICE_HOME=${S}
+	ant || die "compile failed"
+	use doc && ant docs
+}
+
+src_install() {
+	export TARGET=/opt/xindice
+	keepdir /var/run/xindice
+	chown xindice:xindice ${D}/var/run/xindice
+	dodir ${TARGET}
+	dodir ${TARGET}/java
+	cp -Rvdp bin config icons docs logs idl ${D}${TARGET}
+	cd java
+	cp -Rvdp 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}/21xindice
+	dodir /etc/init.d
+	insinto /etc/init.d
+	insopts -m0755
+	newins ${FILESDIR}/xindice-r1 xindice
+	insinto ${TARGET}
+	doins start
+	keepdir /opt/xindice/db
+	chown -R xindice:xindice ${D}/opt/xindice
+}