Fix S path, prune older ebuilds

8 files changed, 18 insertions, 115 deletions

diff --git a/dev-java/snipsnap-bin/ChangeLog b/dev-java/snipsnap-bin/ChangeLog
index 83928708155d..2da0434cf1d0 100644
--- a/dev-java/snipsnap-bin/ChangeLog
+++ b/dev-java/snipsnap-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/snipsnap
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/ChangeLog,v 1.1 2004/07/30 21:52:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/ChangeLog,v 1.2 2004/08/21 12:03:15 axxo Exp $
+
+*snipsnap-bin-0.5.1a-r1 (21 Aug 2004)
+
+  21 Aug 2004; Thomas Matthijs <axxo@gentoo.org>
+  +snipsnap-bin-0.5.1a-r1.ebuild:
+  fix S path
 
 *snipsnap-bin-0.4.2a (30 Jul 2004)
 
diff --git a/dev-java/snipsnap-bin/Manifest b/dev-java/snipsnap-bin/Manifest
index e6a4450f7fce..59f38ddddba8 100644
--- a/dev-java/snipsnap-bin/Manifest
+++ b/dev-java/snipsnap-bin/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 93689b9f7567874d95b6d4c41610cf94 snipsnap-bin-0.4.2a.ebuild 664
-MD5 d9c922e590c32d9da5bb59dc069dd9cc ChangeLog 900
+MD5 f7470283de7a71d9c1c305966c6eedad snipsnap-bin-0.5.1a-r1.ebuild 704
+MD5 26ff16a27e86d178a4011d9f4f3d4ebe ChangeLog 1036
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 e4858ee636d1cc0677350d82e8edfcf8 snipsnap-bin-0.5.1a.ebuild 667
-MD5 cc134e4e6259afd24f6813ccb42939de files/0.4.2a-snipsnap 568
 MD5 3277b2bd71b9b75a519d72b099cc03cf files/0.5.1a-snipsnap 568
-MD5 0a1abd3a75a98c94389512eb4bd9a1ea files/0.4.2a-run.sh 1844
-MD5 36af28823473d41a150d20fbceba3ba0 files/digest-snipsnap-bin-0.4.2a 74
-MD5 5b47f6680b38ea95f097319cab50a00a files/digest-snipsnap-bin-0.5.1a 74
 MD5 ab4b8d9f503c24fb0b5f16479e373aca files/0.5.1a-run.sh 1763
+MD5 5b47f6680b38ea95f097319cab50a00a files/digest-snipsnap-bin-0.5.1a-r1 74
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.2.5 (GNU/Linux)
 
-iD8DBQFBCsOM/rLF9B432nYRAtAaAJ9oA7Vkmjvl0iezvj76chfuRM2ROwCfQIVA
-hEvAPI0ZyUYQfSPQscUuANU=
-=nXUO
+iD8DBQFBJzos/rLF9B432nYRAvUEAKC84OuUl78ylQZW/APaxmMf7/ACrwCgli39
+psCDGZqWe5GHOGA7keDKvkk=
+=s0OI
 -----END PGP SIGNATURE-----
diff --git a/dev-java/snipsnap-bin/files/0.4.2a-run.sh b/dev-java/snipsnap-bin/files/0.4.2a-run.sh
deleted file mode 100644
index 24340f9e3fec..000000000000
--- a/dev-java/snipsnap-bin/files/0.4.2a-run.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-
-base=/opt/snipsnap
-jar=$base/lib
-
-if [ -f $HOME/.gentoo/java-env ] ; then
-  source $HOME/.gentoo/java-env
-else
-  JAVA_HOME=`java-config --jdk-home`
-  if [ -z $JAVA_HOME ] ; then
-    JAVA_HOME=`java-config --jre-home`
-  fi
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  echo "Please set JAVA_HOME environment variable!"
-  echo "A Java SDK of at least version 1.3 is required!"
-  exit
-fi
-
-# check whether the java compiler is available
-if [ ! -f $JAVA_HOME/lib/tools.jar -a ! -f /System/Library/Frameworks/JavaVM.framework/Classes/classes.jar ]; then
-  echo "$JAVA_HOME/lib/tools.jar or MacOS X pendant not found, cannot compile jsp files"
-  echo "Make sure tools.jar or similar from the Java SDK is in the classpath!"
-  exit 
-else
-  if [ -f /System/Library/Frameworks/JavaVM.framework/Classes/classes.jar ]; then
-    TOOLS=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar
-  else
-    TOOLS=$JAVA_HOME/lib/tools.jar
-  fi
-fi
-
-if [ ! -f $jar/snipsnap.jar ]; then
-  echo "$jar/snipsnap.jar missing, please compile application first"
-  exit
-fi
-
-# put classpath together (this is a script-local variable)
-CLASSPATH=$jar/org.mortbay.jetty.jar:$jar/javax.servlet.jar:$jar/org.apache.crimson.jar:$jar/org.apache.jasper.jar:$jar/jdbcpool.jar:$jar/mckoidb.jar:$TOOLS
-
-if [ "$1" = "admin" ]; then
-  $JAVA_HOME/bin/java -cp $CLASSPATH:$jar/snipsnap.jar org.snipsnap.server.AppServer -admin "$2" "$3" 
-  exit
-fi
-
-if [ "$1" = "-debug" ]; then
-  DBG="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5000"
-fi
-
-# execute application server
-[ -f $base/server.log ] && mv $base/server.log $base/server.log.old
-cd $base
-$JAVA_HOME/bin/java -server $DBG -cp $CLASSPATH:$jar/snipsnap.jar -Duser.dir=$base org.snipsnap.server.AppServer $cmdline > $base/server.log 2>&1 &
-echo "$!" > /var/run/snipsnap.pid  
diff --git a/dev-java/snipsnap-bin/files/0.4.2a-snipsnap b/dev-java/snipsnap-bin/files/0.4.2a-snipsnap
deleted file mode 100644
index 1de042489474..000000000000
--- a/dev-java/snipsnap-bin/files/0.4.2a-snipsnap
+++ /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-java/snipsnap-bin/files/0.4.2a-snipsnap,v 1.1 2004/07/30 21:52:34 axxo Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting snipsnap"
-	start-stop-daemon -o --quiet --start --startas /opt/snipsnap/run.sh \
-	    --pidfile /var/run/snipsnap.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping snipsnap"
-	start-stop-daemon -o --quiet --stop --pidfile /var/run/snipsnap.pid
-	rm /var/run/snipsnap.pid
-	eend $?
-}
-
diff --git a/dev-java/snipsnap-bin/files/digest-snipsnap-bin-0.4.2a b/dev-java/snipsnap-bin/files/digest-snipsnap-bin-0.4.2a
deleted file mode 100644
index b40d321bf135..000000000000
--- a/dev-java/snipsnap-bin/files/digest-snipsnap-bin-0.4.2a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9483948e906b108e74cc321ba815e94a snipsnap-0.4.2a-20030326.tgz 8585100
diff --git a/dev-java/snipsnap-bin/files/digest-snipsnap-bin-0.5.1a b/dev-java/snipsnap-bin/files/digest-snipsnap-bin-0.5.1a-r1
index d52e618a7d7b..d52e618a7d7b 100644
--- a/dev-java/snipsnap-bin/files/digest-snipsnap-bin-0.5.1a
+++ b/dev-java/snipsnap-bin/files/digest-snipsnap-bin-0.5.1a-r1
diff --git a/dev-java/snipsnap-bin/snipsnap-bin-0.4.2a.ebuild b/dev-java/snipsnap-bin/snipsnap-bin-0.4.2a.ebuild
deleted file mode 100644
index 5c79b5c8b02a..000000000000
--- a/dev-java/snipsnap-bin/snipsnap-bin-0.4.2a.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/snipsnap-bin-0.4.2a.ebuild,v 1.1 2004/07/30 21:52:34 axxo Exp $
-
-DESCRIPTION="A blog/wiki personal content management system"
-HOMEPAGE="http://snipsnap.org"
-SRC_URI="mirror://sourceforge/${PN/-bin}/${P/-bin}-20030326.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND=">=virtual/jre-1.3"
-
-src_install() {
-	dodir /opt/${PN/-bin}
-	cp -pR * ${D}/opt/${PN/-bin}
-
-	exeinto /opt/${PN/-bin}
-	newexe ${FILESDIR}/${PV}-run.sh run.sh
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PV}-snipsnap snipsnap
-}
diff --git a/dev-java/snipsnap-bin/snipsnap-bin-0.5.1a.ebuild b/dev-java/snipsnap-bin/snipsnap-bin-0.5.1a-r1.ebuild
index 4411723b8c29..42607a204023 100644
--- a/dev-java/snipsnap-bin/snipsnap-bin-0.5.1a.ebuild
+++ b/dev-java/snipsnap-bin/snipsnap-bin-0.5.1a-r1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/snipsnap-bin-0.5.1a.ebuild,v 1.1 2004/07/30 21:52:34 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/snipsnap-bin/snipsnap-bin-0.5.1a-r1.ebuild,v 1.1 2004/08/21 12:03:15 axxo Exp $
 
 DESCRIPTION="A blog/wiki personal content management system"
 HOMEPAGE="http://snipsnap.org"
-SRC_URI="ftp://snipsnap.org/${PN/-bin}/${P/-bin}-20040123.tgz"
+MY_P=${P/-bin}
+SRC_URI="ftp://snipsnap.org/${PN/-bin}/${MY_P}-20040123.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 DEPEND=">=virtual/jre-1.3"
+S=${WORKDIR}/${MY_P}
 
 src_install() {
 	dodir /opt/${PN/-bin}