14 files changed, 41 insertions, 236 deletions
diff --git a/dev-db/xindice/ChangeLog b/dev-db/xindice/ChangeLog
index 7852ac5cc2f6..4c66c77bb473 100644
--- a/dev-db/xindice/ChangeLog
+++ b/dev-db/xindice/ChangeLog
@@ -1,6 +1,24 @@
 # 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.7 2004/09/03 17:31:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.8 2004/10/06 06:58:49 phosphan Exp $
+
+*xindice-1.0-r3 (06 Oct 2004)
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +metadata.xml,
+  -files/xindice, -files/xindice-1.0-r1.patch, -files/xindice-1.0-r2.patch,
+  +files/xindice-1.0-r3.patch, -files/xindice-1.0.patch, -files/xindice-r1,
+  +files/xindice-r2, -xindice-1.0-r1.ebuild, -xindice-1.0-r2.ebuild,
+  +xindice-1.0-r3.ebuild, -xindice-1.0.ebuild:
+  More cleanup: -r3 was a trivial change and -r2 was ok to got stable -> -r3 is
+  stable now.
+
+*xindice-1.0-r3 (06 Oct 2004)
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  -files/xindice-1.0-r1.patch, -files/xindice-1.0-r2.patch,
+  +files/xindice-1.0-r3.patch, -files/xindice-r1, +files/xindice-r2,
+  -xindice-1.0-r1.ebuild, -xindice-1.0-r2.ebuild, +xindice-1.0-r3.ebuild:
+  Substituting "need net" by "use net" in init script. Cleanup.
 
   03 Sep 2004; David Holm <dholm@gentoo.org> xindice-1.0-r2.ebuild:
   Added to ~ppc.
diff --git a/dev-db/xindice/Manifest b/dev-db/xindice/Manifest
index 8720178ffc21..e511f18f2b11 100644
--- a/dev-db/xindice/Manifest
+++ b/dev-db/xindice/Manifest
@@ -1,13 +1,14 @@
-MD5 51325ec37653d382a4a440cceaeaeb79 ChangeLog 1260
-MD5 4c1d1a2336e7d392f953f1d61e361e75 xindice-1.0-r1.ebuild 1722
 MD5 3bb0575316332bcad87459b4ec24cd64 xindice-1.0.ebuild 1669
+MD5 2ab494bad82aae9e5e6c47760565a5c5 xindice-1.0-r3.ebuild 1737
+MD5 51325ec37653d382a4a440cceaeaeb79 ChangeLog 1260
 MD5 1d32576491ff9b4ea3f7b4f55a4450e8 xindice-1.0-r2.ebuild 1737
-MD5 c87c4724c3cbf94d7c0379589a13ad2b files/21xindice 26
-MD5 7e4600809285fee4636287cb3cffbff9 files/digest-xindice-1.0 309
-MD5 9118e012b53e1f982cf60417ff17f43c files/digest-xindice-1.0-r1 68
 MD5 85c1e9e08b30ad9e2e532dc4bd28b4d4 files/xindice 581
+MD5 ff1f2667831428923e23c6cf4da6c01b files/xindice-r1 580
+MD5 3cc9d5a486fe4ab472b37a787c6e4f91 files/xindice-r2 579
 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-r2 68
-MD5 e15ba5cda4959873e75d236563c8d461 files/xindice-1.0-r2.patch 1309
-MD5 ff1f2667831428923e23c6cf4da6c01b files/xindice-r1 580
+MD5 9118e012b53e1f982cf60417ff17f43c files/digest-xindice-1.0-r3 68
diff --git a/dev-db/xindice/files/digest-xindice-1.0 b/dev-db/xindice/files/digest-xindice-1.0
deleted file mode 100644
index 928a119929fc..000000000000
--- a/dev-db/xindice/files/digest-xindice-1.0
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 e60da088b700fb70b44c177f41325953 /files/xindice 586
-MD5 c87c4724c3cbf94d7c0379589a13ad2b /files/21xindice 26
-MD5 c2e834a3314f4a4d91fbb3b1df7d7e47 /files/xindice-1.0.patch 725
-MD5 adb46b55e2bc4515eab01c4a6bed4df6 /xindice-1.0.ebuild 1676
-MD5 895bf529f483be5885cf4c963b4111a8 xml-xindice-1.0.tar.gz 5304315
diff --git a/dev-db/xindice/files/digest-xindice-1.0-r2 b/dev-db/xindice/files/digest-xindice-1.0-r2
deleted file mode 100644
index 698604115f93..000000000000
--- a/dev-db/xindice/files/digest-xindice-1.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 895bf529f483be5885cf4c963b4111a8 xml-xindice-1.0.tar.gz 5304315
diff --git a/dev-db/xindice/files/digest-xindice-1.0-r1 b/dev-db/xindice/files/digest-xindice-1.0-r3
index 698604115f93..698604115f93 100644
--- a/dev-db/xindice/files/digest-xindice-1.0-r1
+++ b/dev-db/xindice/files/digest-xindice-1.0-r3
diff --git a/dev-db/xindice/files/xindice b/dev-db/xindice/files/xindice
deleted file mode 100644
index 2086f4ec5da2..000000000000
--- a/dev-db/xindice/files/xindice
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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,v 1.3 2004/07/14 21:42:52 agriffis Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting xindice..."
-	start-stop-daemon --pidfile /var/run/xindice/xindice.pid\
-		--start --background --user xindice --chuid xindice\
-		--exec /usr/lib/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/files/xindice-1.0-r2.patch b/dev-db/xindice/files/xindice-1.0-r2.patch
deleted file mode 100644
index b244206afa18..000000000000
--- a/dev-db/xindice/files/xindice-1.0-r2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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-1.0-r1.patch b/dev-db/xindice/files/xindice-1.0-r3.patch
index b244206afa18..b244206afa18 100644
--- a/dev-db/xindice/files/xindice-1.0-r1.patch
+++ b/dev-db/xindice/files/xindice-1.0-r3.patch
diff --git a/dev-db/xindice/files/xindice-1.0.patch b/dev-db/xindice/files/xindice-1.0.patch
deleted file mode 100644
index aaae16545888..000000000000
--- a/dev-db/xindice/files/xindice-1.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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-r2
index f59cbebb6fc4..683ce9f82f3d 100644
--- a/dev-db/xindice/files/xindice-r1
+++ b/dev-db/xindice/files/xindice-r2
@@ -1,10 +1,10 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/files/xindice-r2,v 1.1 2004/10/06 06:58:49 phosphan Exp $
 
 depend() {
-	need net
+	use net
 }
 
 start() {
diff --git a/dev-db/xindice/metadata.xml b/dev-db/xindice/metadata.xml
new file mode 100644
index 000000000000..0caa769b0ee9
--- /dev/null
+++ b/dev-db/xindice/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-db/xindice/xindice-1.0-r1.ebuild b/dev-db/xindice/xindice-1.0-r1.ebuild
deleted file mode 100644
index 90420f5aa0b4..000000000000
--- a/dev-db/xindice/xindice-1.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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-r1.ebuild,v 1.3 2004/08/23 07:37:23 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"
-}
-
-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}
-	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
-}
diff --git a/dev-db/xindice/xindice-1.0-r2.ebuild b/dev-db/xindice/xindice-1.0-r3.ebuild
index e92cdd1c410b..108c3c17a18f 100644
--- a/dev-db/xindice/xindice-1.0-r2.ebuild
+++ b/dev-db/xindice/xindice-1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2004/09/03 17:31:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r3.ebuild,v 1.1 2004/10/06 06:58:49 phosphan Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://xml.apache.org/xindice/dist/xml-xindice-${PV}.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="doc"
 
 DEPEND=">=virtual/jdk-1.3
@@ -58,7 +58,7 @@ src_install() {
 	dodir /etc/init.d
 	insinto /etc/init.d
 	insopts -m0755
-	newins ${FILESDIR}/xindice-r1 xindice
+	newins ${FILESDIR}/xindice-r2 xindice
 	insinto ${TARGET}
 	doins start
 	keepdir /opt/xindice/db
diff --git a/dev-db/xindice/xindice-1.0.ebuild b/dev-db/xindice/xindice-1.0.ebuild
deleted file mode 100644
index d8699d20f89b..000000000000
--- a/dev-db/xindice/xindice-1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.ebuild,v 1.8 2004/06/24 22:02:29 agriffis 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}/${P}.patch
-}
-
-src_compile() {
-	export XINDICE_HOME=${S}
-	bin/ant
-	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
-}