Fixing #66465, cleaning up, declaring new version stable for x86

8 files changed, 2 insertions, 98 deletions

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() {