summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2004-02-24 07:46:32 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2004-02-24 07:46:32 +0000
commit3dbb1d3e5803db2a93648d6de30d395fdca3a3c0 (patch)
tree8a0453bfd22a1f825a5f9d2a7c4361545898d659 /dev-db/xindice
parentfixing Manifest (diff)
downloadgentoo-2-3dbb1d3e5803db2a93648d6de30d395fdca3a3c0.tar.gz
gentoo-2-3dbb1d3e5803db2a93648d6de30d395fdca3a3c0.tar.bz2
gentoo-2-3dbb1d3e5803db2a93648d6de30d395fdca3a3c0.zip
Compile problem fixed, see bug #13244
Diffstat (limited to 'dev-db/xindice')
-rw-r--r--dev-db/xindice/ChangeLog10
-rw-r--r--dev-db/xindice/Manifest9
-rw-r--r--dev-db/xindice/files/digest-xindice-1.0-r11
-rw-r--r--dev-db/xindice/files/xindice4
-rw-r--r--dev-db/xindice/files/xindice-1.0-r1.patch39
-rw-r--r--dev-db/xindice/xindice-1.0-r1.ebuild62
6 files changed, 118 insertions, 7 deletions
diff --git a/dev-db/xindice/ChangeLog b/dev-db/xindice/ChangeLog
index 3583c8a19a33..733529368b8e 100644
--- a/dev-db/xindice/ChangeLog
+++ b/dev-db/xindice/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/xindice
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.2 2003/12/08 04:51:30 mr_bones_ Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.3 2004/02/24 07:46:32 phosphan Exp $
+
+*xindice-1.0-r1 (24 Feb 2004)
+
+ 24 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> xindice-1.0-r1.ebuild,
+ files/xindice, files/xindice-1.0-r1.patch:
+ Compile problem fixed, see bug #13244
07 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> xindice-1.0.ebuild:
chown x.y -> chown x:y (bug 35127)
diff --git a/dev-db/xindice/Manifest b/dev-db/xindice/Manifest
index 96569ecf02c9..ac60fa795eea 100644
--- a/dev-db/xindice/Manifest
+++ b/dev-db/xindice/Manifest
@@ -1,6 +1,9 @@
-MD5 607e676ffda5f3cf2475c45d916db267 ChangeLog 604
MD5 a3a7f1b416176d2437cb2f14b565376d xindice-1.0.ebuild 1679
+MD5 b0a2fb0cabca9734b7322bd8604148e5 xindice-1.0-r1.ebuild 1712
+MD5 2389dc134c1c9722d7511b21e45cd3cc ChangeLog 797
+MD5 f5392aa3ad620eac155a938b628cb260 files/xindice 590
+MD5 e15ba5cda4959873e75d236563c8d461 files/xindice-1.0-r1.patch 1309
MD5 c87c4724c3cbf94d7c0379589a13ad2b files/21xindice 26
-MD5 7e4600809285fee4636287cb3cffbff9 files/digest-xindice-1.0 309
-MD5 e60da088b700fb70b44c177f41325953 files/xindice 586
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
diff --git a/dev-db/xindice/files/digest-xindice-1.0-r1 b/dev-db/xindice/files/digest-xindice-1.0-r1
new file mode 100644
index 000000000000..698604115f93
--- /dev/null
+++ b/dev-db/xindice/files/digest-xindice-1.0-r1
@@ -0,0 +1 @@
+MD5 895bf529f483be5885cf4c963b4111a8 xml-xindice-1.0.tar.gz 5304315
diff --git a/dev-db/xindice/files/xindice b/dev-db/xindice/files/xindice
index b7392ab22d48..e921f2ff913e 100644
--- a/dev-db/xindice/files/xindice
+++ b/dev-db/xindice/files/xindice
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/files/xindice,v 1.1 2003/04/11 20:10:21 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/files/xindice,v 1.2 2004/02/24 07:46:32 phosphan Exp $
depend() {
need net
@@ -11,7 +11,7 @@ start() {
ebegin "Starting xindice..."
start-stop-daemon --pidfile /var/run/xindice/xindice.pid\
--start --background --user xindice --chuid xindice\
- --exec /opt/xindice/start
+ --exec /usr/lib/xindice/start
eend $?
}
diff --git a/dev-db/xindice/files/xindice-1.0-r1.patch b/dev-db/xindice/files/xindice-1.0-r1.patch
new file mode 100644
index 000000000000..b244206afa18
--- /dev/null
+++ b/dev-db/xindice/files/xindice-1.0-r1.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/xindice-1.0-r1.ebuild b/dev-db/xindice/xindice-1.0-r1.ebuild
new file mode 100644
index 000000000000..2995ac41a4b5
--- /dev/null
+++ b/dev-db/xindice/xindice-1.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r1.ebuild,v 1.1 2004/02/24 07:46:32 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"
+
+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"
+ 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}
+ bin/ant || die "compile failed"
+ use doc && bin/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
+ doins ${FILESDIR}/xindice
+ insinto ${TARGET}
+ doins start
+ keepdir /opt/xindice/db
+ chown -R xindice:xindice ${D}/opt/xindice
+}