Remove extras

6 files changed, 9 insertions, 188 deletions

diff --git a/net-p2p/freenet/ChangeLog b/net-p2p/freenet/ChangeLog
index 366adcde94a1..a8d5bffb5e07 100644
--- a/net-p2p/freenet/ChangeLog
+++ b/net-p2p/freenet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/freenet
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.20 2003/07/24 18:38:20 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/ChangeLog,v 1.21 2003/07/24 18:43:03 lostlogic Exp $
+
+  24 Jul 2003; Brandon Low <lostlogic@gentoo.org> freenet-0.5.2.1-r2.ebuild,
+  freenet-0.5.2.1-r3.ebuild, files/rc.freenet:
+  Remove insecure ebuilds
 
   24 Jul 2003; Brandon Low <lostlogic@gentoo.org> freenet-0.5.2.1-r3.ebuild:
   add einfo
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 8a583ea6708c..a2e6f2a87e41 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -1,8 +1,5 @@
-MD5 b3e7df1dc4beefa0ef16e53bb8587f13 freenet-0.5.2.1-r3.ebuild 4359
-MD5 d1394b4f85a2365cc8dbd840949e406b freenet-0.5.2.1-r2.ebuild 3600
-MD5 2b6468d7a15cf13b62377fe6823a96a3 ChangeLog 4642
+MD5 c5967f9cb5af4bfc5fbbce1f9928fa08 freenet-0.5.2.1-r3.ebuild 4358
+MD5 8fef772fcbbea721ea508c07801e76ca ChangeLog 4793
 MD5 2102c07c25f233d96f3ee92f4d075704 files/rc.freenet2 1713
 MD5 169efe0f216ade927538fab48315ecc7 files/conf.freenet 323
-MD5 3a391b52e5e7740c7bdafcba7a9ee4d3 files/digest-freenet-0.5.2.1-r2 68
 MD5 3a391b52e5e7740c7bdafcba7a9ee4d3 files/digest-freenet-0.5.2.1-r3 68
-MD5 ff721c9a73980dc222ff10c07b53162f files/rc.freenet 1729
diff --git a/net-p2p/freenet/files/digest-freenet-0.5.2.1-r2 b/net-p2p/freenet/files/digest-freenet-0.5.2.1-r2
deleted file mode 100644
index a9b4651be0e9..000000000000
--- a/net-p2p/freenet/files/digest-freenet-0.5.2.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59270ee48d889e0be9cae584b67d2743 freenet-0.5.2.1.tar.gz 2118774
diff --git a/net-p2p/freenet/files/rc.freenet b/net-p2p/freenet/files/rc.freenet
deleted file mode 100644
index 3bd803a56712..000000000000
--- a/net-p2p/freenet/files/rc.freenet
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/sbin/runscript
-# Freenet init.d-script 
-# Gentoo Maintainer: Brandon Low <lostlogic@gentoo.org>
-# Authors: Per Wigren <wigren@home.se>
-
-depend() {
-	need net
-}
-
-check_config() {
-	if [ -z "${FREENET_NICENESS}" ] || [ -z "${JAVA_OPTIONS}" ]; then
-		eerror "Please set all options in /etc/conf.d/freenet"
-		return 1
-	fi
-	if [ ! -f /etc/freenet.conf ]; then
-		eerror "To configure freenet, please run:"
-		eerror "# ebuild /usr/portage/net-p2p/freenet/freenet-[version].ebuild"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	JAVA="$(java-config --java)"
-	#The JVMs don't support NPTL yet, so this is necessary
-	export LD_ASSUME_KERNEL=2.4.1
-
-	check_config || return 1
-
-	ebegin "Starting Freenet now"
-	if [ ! -f /usr/lib/freenet/freenet-ext.jar ]; then
-		 ewarn "freenet-ext.jar not found.  It can be downloaded from"
-		 ewarn "http://freenetproject.org/snapshots/freenet-ext.jar"
-		 eend 1
-		 return 1
-	fi
-	if [ ! -f /var/freenet/seednodes.ref ]; then
-		 ewarn "seednodes.ref not found, you can download some seeds"
-		 ewarn "from http://hawk.freenetproject.org/~freenet4/seednodes.ref"
-		 eend 1
-		 return 1
-	fi
-
-	CLASSPATH=/usr/lib/freenet/freenet.jar:/usr/lib/freenet/freenet-ext.jar:$CLASSPATH 
-	
-	# if Sun JDK set -server option as suggested on mailing list
-	if [ ! -z "`${JAVA} -help 2>&1 | grep '[-]server'`" ]; then
-		JAVA_ARGS="-server"
-	else
-		JAVA_ARGS=""
-	fi
-	JAVA_ARGS="${JAVA_ARGS} ${JAVA_OPTIONS}"
-	ulimit -n 4096
-	start-stop-daemon --start --quiet --pidfile \
-		/var/run/freenet.pid -m --background -N ${FREENET_NICENESS} \
-		--exec ${JAVA} -- \
-		${JAVA_ARGS} freenet.node.Main -p /etc/freenet.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Freenet"
-	start-stop-daemon --stop --quiet --pidfile /var/run/freenet.pid
-	eend $?
-}
diff --git a/net-p2p/freenet/freenet-0.5.2.1-r2.ebuild b/net-p2p/freenet/freenet-0.5.2.1-r2.ebuild
deleted file mode 100644
index 4c28cf3ab571..000000000000
--- a/net-p2p/freenet/freenet-0.5.2.1-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.5.2.1-r2.ebuild,v 1.2 2003/07/24 16:15:09 lostlogic Exp $
-
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="large-scale peer-to-peer network that creates a massive virtual information store open to anyone"
-SRC_URI="mirror://sourceforge/freenet/${P}.tar.gz"
-HOMEPAGE="http://freenetproject.org/"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-
-DEPEND="virtual/jre
-	>=sys-apps/sed-4"
-
-src_install() {
-	dodoc README
-
-        dodir /var/freenet/stats /var/freenet/store
-	keepdir /var/freenet/stats /var/freenet/store
-
-        insinto /usr/lib/freenet
-        doins freenet.jar freenet-ext.jar
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/conf.freenet freenet
-
-        exeinto /etc/init.d
-        newexe ${FILESDIR}/rc.freenet freenet
-}
-
-pkg_postinst() {
-	einfo "Congratulations on merging freenet, please run"
-        einfo "# ebuild ${EBUILD} config"
-	einfo "to update freenet to the latest jars and seednodes."
-	einfo "This step is also necessary to configure freenet for"
-	einfo "first use.  You may also run this step again at any time"
-	einfo "to get any updates available to freenet"
-}
-
-pkg_postrm() {
-	if [ -z has_version ]; then
-	        einfo "Please remove /var/freenet manually if you are't going to"
-	        einfo "continue to use Freenet on this machine!"
-	fi
-}
-
-pkg_config() {
-	YN="X"
-	while [ "${YN}" != "y" -a "${YN}" != "Y" -a "${YN}" != "n" -a "${YN}" != "N" -a "${YN}" != "" ]; do
-		einfo "Would you like to update freenet files now? [Y/n]"
-		read YN
-	done
-	if [ -z "$(echo ${YN}|sed -e s/y//i)" ];then
-		einfo "Press U within 2 seconds to try an unstable snapshot"
-		read -n 1 -t 2 YN
-		if [ "${YN}" == "U" ] || [ "${YN}" == "u" ]; then
-			wget http://freenetproject.org/snapshots/freenet-exp-latest.jar -O /usr/lib/freenet/freenet.jar
-		else
-			wget http://freenetproject.org/snapshots/freenet-latest.jar -O /usr/lib/freenet/freenet.jar
-		fi
-		wget http://freenetproject.org/snapshots/seednodes.ref -O /var/freenet/seednodes.ref
-		touch -d "1/1/1970" /var/freenet/seednodes.ref
-	fi
-
-	if [ -f /etc/freenet.conf ]; then
-		einfo "Press C within 2 seconds to force reconfiguration of freenet"
-		read -n 1 -t 2 YN
-	fi
-	if [ ! -f /etc/freenet.conf ] || [ "${YN}" == C ] || [ "${YN}" == "c" ]; then
-		einfo "Preparing to configure freenet..."
-		# Pre-determine IP address
-		IP="$(hostname -i)"
-		declare -i DEFLP
-		if [ "${RANDOM}" ]; then
-			DEFLP=${RANDOM}%30000+2000
-		else
-			echo "no random in shell, enter a FNP port number + <ENTER>"
-			read DEFLP
-		fi
-	
-		cat << EOF > freenet.conf
-ipAddress=${IP}
-listenPort=${DEFLP}
-seedFile=/var/freenet/seednodes.ref
-logFile=/var/log/freenet.log
-storeFile=/var/freenet/store
-diagnosticsPath=/var/freenet/stats
-routingDir=/var/freenet
-nodeFile=/var/freenet/node
-EOF
-	
-		CLASSPATH="/usr/lib/freenet/freenet.jar:/usr/lib/freenet/freenet-ext.jar:${CLASSPATH}"
-		$(java-config --java) freenet.node.Main --config
-		mv freenet.conf /etc
-		sed -i -e "s/^%\(ipAddress\)/\1/" \
-		       -e "s/^%\(listenPort\)/\1/" \
-		       -e "s/^%\(seedFile\)/\1/" \
-		       -e "s/^%\(logFile\)/\1/" \
-		       -e "s/^%\(storeFile\)/\1/" \
-		       -e "s/^%\(diagnosticsPath\)/\1/" \
-		       -e "s/^%\(routingDir\)/\1/" \
-		       -e "s/^%\(nodeFile\)/\1/" /etc/freenet.conf
-
-	fi
-	einfo "Congratulations, freenet is configured and up to date"
-	einfo "use '/etc/init.d/freenet start' to start it"
-	einfo "You can always re-update/reconfigure  your freenet with:"
-	einfo "# ebuild ${EBUILD} config"
-}
diff --git a/net-p2p/freenet/freenet-0.5.2.1-r3.ebuild b/net-p2p/freenet/freenet-0.5.2.1-r3.ebuild
index 6cd053d99d09..c238c94dbc9f 100644
--- a/net-p2p/freenet/freenet-0.5.2.1-r3.ebuild
+++ b/net-p2p/freenet/freenet-0.5.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.5.2.1-r3.ebuild,v 1.2 2003/07/24 18:38:20 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/freenet/freenet-0.5.2.1-r3.ebuild,v 1.3 2003/07/24 18:43:03 lostlogic Exp $
 
 IUSE=""
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/freenet/${P}.tar.gz"
 HOMEPAGE="http://freenetproject.org/"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 
 DEPEND="virtual/jre