Removed java gen 1 ebuilds, and older versions, quoted vars

Package-Manager: portage-2.1.3.15

9 files changed, 31 insertions, 537 deletions

diff --git a/app-cdr/webcdwriter/ChangeLog b/app-cdr/webcdwriter/ChangeLog
index 7561e3a5b69a..fbe20ad00b59 100644
--- a/app-cdr/webcdwriter/ChangeLog
+++ b/app-cdr/webcdwriter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/webcdwriter
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/ChangeLog,v 1.13 2007/05/19 21:28:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/ChangeLog,v 1.14 2007/10/24 02:00:30 wltjr Exp $
+
+  24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -webcdwriter-2.6.8-r1.ebuild, -webcdwriter-2.7.3.ebuild,
+  -webcdwriter-2.8.0.ebuild, webcdwriter-2.8.0-r1.ebuild:
+  Removed java gen 1 ebuilds, and older versions, quoted vars
 
   19 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   -webcdwriter-2.7.1.ebuild, -webcdwriter-2.7.2.ebuild:
diff --git a/app-cdr/webcdwriter/Manifest b/app-cdr/webcdwriter/Manifest
index 58fc2e3e17c3..5626fe678df0 100644
--- a/app-cdr/webcdwriter/Manifest
+++ b/app-cdr/webcdwriter/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.8.0-javac-flags.patch 2023 RMD160 a4d45b88979dc30fd2f8385fb0bd57b3e91d9064 SHA1 e87a981e00e45b978b49644a1b7e8fe7d20293fa SHA256 7e5e19ea1a64da2d72354b981faf37fca23d6df828c07d5e1ff2187767f83bcb
 MD5 675f4cf2d23565887e7f3a18a07be784 files/2.8.0-javac-flags.patch 2023
 RMD160 a4d45b88979dc30fd2f8385fb0bd57b3e91d9064 files/2.8.0-javac-flags.patch 2023
@@ -17,49 +14,19 @@ AUX webcdwriter.rc 803 RMD160 e9d997a1f030a3c97f90dfed04287efea8b3337d SHA1 110a
 MD5 825a17dfddef56176d77713efd969aec files/webcdwriter.rc 803
 RMD160 e9d997a1f030a3c97f90dfed04287efea8b3337d files/webcdwriter.rc 803
 SHA256 7e7933349d7bf5d6655476cdd94da715b17d28d80a59511ac535c882f4effe71 files/webcdwriter.rc 803
-DIST webCDwriter-2.6.8.tar.bz2 539368 RMD160 0211c21b4ee75be7c7d26dcd1136c7aa5f646251 SHA1 894d9b436e91f761bcd02900b0e063b93d263b89 SHA256 09c82f14240a2df7a84d057be451f33e027c9b78b25229988ae388d1ccb613e3
-DIST webCDwriter-2.7.3.tar.bz2 593194 RMD160 89e6ee4004d2d02d2cb3b2bf736bdf7bee3c2b52 SHA1 f08f3c895385bd255d2259afc8ec783a440d49a9 SHA256 98f3c94e6df714ef9035a6ef65937cb84f2384109a809f25a9cdb4b93958d545
 DIST webCDwriter-2.8.0.tar.bz2 616305 RMD160 9a0bae209290e574aecbabcc5a0907c4db84a140 SHA1 2b64786bbeece9a1539fe737415e2d29aaa1a63c SHA256 bc8b7d167c99ccfe83d144b26e60d3f5be81af45be52e14d6817112d032ba13c
-EBUILD webcdwriter-2.6.8-r1.ebuild 2975 RMD160 28a8dba4029260e6dcd24eff61804c2db70df0f8 SHA1 51744001765286ce722126ed9a1683ff9e97e999 SHA256 429101b494fd6a0ab07a0c657586d037e1319ae53619b7d4ce5401b427d12885
-MD5 8e1d4d4249c1860891d0ef09cbd39df9 webcdwriter-2.6.8-r1.ebuild 2975
-RMD160 28a8dba4029260e6dcd24eff61804c2db70df0f8 webcdwriter-2.6.8-r1.ebuild 2975
-SHA256 429101b494fd6a0ab07a0c657586d037e1319ae53619b7d4ce5401b427d12885 webcdwriter-2.6.8-r1.ebuild 2975
-EBUILD webcdwriter-2.7.3.ebuild 3835 RMD160 90da085b551e66799a3b948667f8319a54f544e4 SHA1 eb827b19a2c199ffc67d1cc7a50f1226eefb4513 SHA256 a6ce5cde1604fa768957f6f2f65988ed6c020c9dcb5816992d97170f4e389596
-MD5 cb4b2a58ad82fdf5f6c2f02687fbd3c4 webcdwriter-2.7.3.ebuild 3835
-RMD160 90da085b551e66799a3b948667f8319a54f544e4 webcdwriter-2.7.3.ebuild 3835
-SHA256 a6ce5cde1604fa768957f6f2f65988ed6c020c9dcb5816992d97170f4e389596 webcdwriter-2.7.3.ebuild 3835
-EBUILD webcdwriter-2.8.0-r1.ebuild 4290 RMD160 5e12e12a9fd66a6679b9e50caa575c06862bc767 SHA1 9d6a3aacbdccb19d6677083dd2e75fe439ecd395 SHA256 9b3afe759db3445491608b9ced835be407d1a90e4a71b19063f9671d99210a28
-MD5 7458bc5521f216c7a37bcac08b206a29 webcdwriter-2.8.0-r1.ebuild 4290
-RMD160 5e12e12a9fd66a6679b9e50caa575c06862bc767 webcdwriter-2.8.0-r1.ebuild 4290
-SHA256 9b3afe759db3445491608b9ced835be407d1a90e4a71b19063f9671d99210a28 webcdwriter-2.8.0-r1.ebuild 4290
-EBUILD webcdwriter-2.8.0.ebuild 3835 RMD160 9f4c66d3b2cf3640d27ca414913730d180e71721 SHA1 fb32acd77b8497d8f5c064cb7d0375ac08c853f6 SHA256 f4c801d88245657b307d6f08baed600592dbbfa23be054f2765f1cb104039235
-MD5 90b45adb89ecb28de6800a95d972e031 webcdwriter-2.8.0.ebuild 3835
-RMD160 9f4c66d3b2cf3640d27ca414913730d180e71721 webcdwriter-2.8.0.ebuild 3835
-SHA256 f4c801d88245657b307d6f08baed600592dbbfa23be054f2765f1cb104039235 webcdwriter-2.8.0.ebuild 3835
-MISC ChangeLog 2651 RMD160 6eb6276c59878059c26a1359ba5a59af8d7507ed SHA1 2ca35e99080c301d9adcf2a07af582d4880aac00 SHA256 bb61b63a41d1d60d56d7192b7c57f41e02f5bb7e18dc92feafe01aa5a5ce637a
-MD5 b49f87ca696c711167066dcb0d41e921 ChangeLog 2651
-RMD160 6eb6276c59878059c26a1359ba5a59af8d7507ed ChangeLog 2651
-SHA256 bb61b63a41d1d60d56d7192b7c57f41e02f5bb7e18dc92feafe01aa5a5ce637a ChangeLog 2651
+EBUILD webcdwriter-2.8.0-r1.ebuild 4317 RMD160 eca98aecb5908a55cc39708a24398bf9a1144bb8 SHA1 70722d5f03b0df6f9f5d2185094cc66e28efbf0f SHA256 d1cb812d8d2986d4badf6561745e0d83efb9a6bdf3219ac9c713efd6f3c41e24
+MD5 84e97321819ce8373ee06b1cd5f18edf webcdwriter-2.8.0-r1.ebuild 4317
+RMD160 eca98aecb5908a55cc39708a24398bf9a1144bb8 webcdwriter-2.8.0-r1.ebuild 4317
+SHA256 d1cb812d8d2986d4badf6561745e0d83efb9a6bdf3219ac9c713efd6f3c41e24 webcdwriter-2.8.0-r1.ebuild 4317
+MISC ChangeLog 2883 RMD160 6ce7835fa7a2a2ba28506bd80aa4445b8a729ed0 SHA1 790c9316671e98f33ba81cf9847f052772e801bc SHA256 17eb5a602e21025781d65bb487313d8d7cdbe0c6d416024e787927d6aaa3d205
+MD5 61a17f8c20b2ecd246feae968a241b3c ChangeLog 2883
+RMD160 6ce7835fa7a2a2ba28506bd80aa4445b8a729ed0 ChangeLog 2883
+SHA256 17eb5a602e21025781d65bb487313d8d7cdbe0c6d416024e787927d6aaa3d205 ChangeLog 2883
 MISC metadata.xml 676 RMD160 ce6924d943ccda47e4ee1743b17c2105656a7466 SHA1 bdaaa7be79c0be5c71d07454a3fa6a54b57744ae SHA256 fe2246e40a0513506f9fefb071243f844159ee9519cdb7d5b68d561451e9aa9e
 MD5 d5f11b1f5189f0e78edbc4a0dcf5ab86 metadata.xml 676
 RMD160 ce6924d943ccda47e4ee1743b17c2105656a7466 metadata.xml 676
 SHA256 fe2246e40a0513506f9fefb071243f844159ee9519cdb7d5b68d561451e9aa9e metadata.xml 676
-MD5 9789fd1d4d894cecafbe50bfdb8717b5 files/digest-webcdwriter-2.6.8-r1 256
-RMD160 31947f181ce1f5084628e33900897fe1ffa336b8 files/digest-webcdwriter-2.6.8-r1 256
-SHA256 c9203c293186512bebb21805f4b1a8f36a2ca51d29bc20fb0ac95a6697cc804d files/digest-webcdwriter-2.6.8-r1 256
-MD5 66fcef592be19d570b2c345f94a1396a files/digest-webcdwriter-2.7.3 256
-RMD160 5a768ab48fb1e7c3a5a2ee9150c14f5c2c4a6a83 files/digest-webcdwriter-2.7.3 256
-SHA256 e63515d48692e8ce94cac4d764fdea7cce451f4632d98c1642054f32a1aca235 files/digest-webcdwriter-2.7.3 256
-MD5 1e835a90b3385320f25f468102350789 files/digest-webcdwriter-2.8.0 256
-RMD160 67db1925cff096613b0e3760a263d37422fe5d73 files/digest-webcdwriter-2.8.0 256
-SHA256 dc2a4c6392db4b61353fe6d583f0822215a9e684ce514f36652d4d86a12e2e61 files/digest-webcdwriter-2.8.0 256
 MD5 1e835a90b3385320f25f468102350789 files/digest-webcdwriter-2.8.0-r1 256
 RMD160 67db1925cff096613b0e3760a263d37422fe5d73 files/digest-webcdwriter-2.8.0-r1 256
 SHA256 dc2a4c6392db4b61353fe6d583f0822215a9e684ce514f36652d4d86a12e2e61 files/digest-webcdwriter-2.8.0-r1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGT2vkcxLzpIGCsLQRAmWXAJ9WelmH3IAXn3XPBpJCLVMiblGvmQCfTL71
-FwrRxUvqOsdiMi79EJ1t8ow=
-=XmZp
------END PGP SIGNATURE-----
diff --git a/app-cdr/webcdwriter/files/digest-webcdwriter-2.6.8-r1 b/app-cdr/webcdwriter/files/digest-webcdwriter-2.6.8-r1
deleted file mode 100644
index 22fbd5715daa..000000000000
--- a/app-cdr/webcdwriter/files/digest-webcdwriter-2.6.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fb17bcc03dcdcd720f771ea3909fbc33 webCDwriter-2.6.8.tar.bz2 539368
-RMD160 0211c21b4ee75be7c7d26dcd1136c7aa5f646251 webCDwriter-2.6.8.tar.bz2 539368
-SHA256 09c82f14240a2df7a84d057be451f33e027c9b78b25229988ae388d1ccb613e3 webCDwriter-2.6.8.tar.bz2 539368
diff --git a/app-cdr/webcdwriter/files/digest-webcdwriter-2.7.3 b/app-cdr/webcdwriter/files/digest-webcdwriter-2.7.3
deleted file mode 100644
index 2566d488f166..000000000000
--- a/app-cdr/webcdwriter/files/digest-webcdwriter-2.7.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21360681b4c731978aac28967d0819de webCDwriter-2.7.3.tar.bz2 593194
-RMD160 89e6ee4004d2d02d2cb3b2bf736bdf7bee3c2b52 webCDwriter-2.7.3.tar.bz2 593194
-SHA256 98f3c94e6df714ef9035a6ef65937cb84f2384109a809f25a9cdb4b93958d545 webCDwriter-2.7.3.tar.bz2 593194
diff --git a/app-cdr/webcdwriter/files/digest-webcdwriter-2.8.0 b/app-cdr/webcdwriter/files/digest-webcdwriter-2.8.0
deleted file mode 100644
index 559bce9d5452..000000000000
--- a/app-cdr/webcdwriter/files/digest-webcdwriter-2.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 400c26a9f2c623f2f642eb081d60fb79 webCDwriter-2.8.0.tar.bz2 616305
-RMD160 9a0bae209290e574aecbabcc5a0907c4db84a140 webCDwriter-2.8.0.tar.bz2 616305
-SHA256 bc8b7d167c99ccfe83d144b26e60d3f5be81af45be52e14d6817112d032ba13c webCDwriter-2.8.0.tar.bz2 616305
diff --git a/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild b/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild
deleted file mode 100644
index 568061f34e54..000000000000
--- a/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.6.8-r1.ebuild,v 1.5 2007/04/28 21:38:23 tove Exp $
-
-inherit eutils java-pkg
-
-MY_P="${P/cd/CD}"
-DESCRIPTION="Make a single CD-writer available to the users in your network"
-HOMEPAGE="http://joerghaeger.de/webCDwriter/index.html"
-SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="java pam mp3 sox vorbis"
-
-RDEPEND="
-	app-cdr/cdrdao
-	virtual/cdrtools
-	mp3? ( media-sound/mpg123 )
-	sox? ( media-sound/sox )
-	vorbis? ( media-sound/vorbis-tools )
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	epatch ${FILESDIR}/configure.patch
-	epatch ${FILESDIR}/config-root.patch
-
-	local myconf
-
-	use pam || myconf="--pam"
-	myconf="${myconf} --user=root --group=root"
-	./configure ${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-
-	newinitd ${FILESDIR}/${PN}.rc CDWserver
-
-	diropts -m700
-	dodir /etc/CDWserver
-	keepdir /var/CDWserver/bin
-	dodir /var/CDWserver/export/Server/tools
-	dodir /var/CDWserver/http/rcdrecord
-	keepdir /var/CDWserver/projects
-	keepdir /var/log/CDWserver
-	keepdir /var/spool/CDWserver
-
-	insinto /etc/CDWserver
-
-	mv ${S}/webCDcreator/start.html ${S}/webCDcreator/index.html
-
-	cd ${S}/CDWserver/config
-	for name in `find -name '[!M]*' -type f`
-	do
-		doins ${name}
-	done
-
-	cd ${S}/CDWserver/http
-	for dirname in `find -type d`
-	do
-		cd ${S}/CDWserver/http/${dirname}
-		dodir /var/CDWserver/http/${dirname}
-		insinto /var/CDWserver/http/${dirname}
-		for name in `find -name '[!M]*' -type f`
-		do
-			doins ${name}
-		done
-	done
-
-	insinto /var/CDWserver/http/rcdrecord
-
-	cd ${S}/rcdrecord
-	for name in `find -name '*.html'`
-	do
-	    doins ${name}
-	done
-
-	cd ${S}/webCDcreator
-	for dirname in `find -type d`
-	do
-		cd ${S}/webCDcreator/${dirname}
-		dodir /var/CDWserver/http/webCDcreator/${dirname}
-		insinto /var/CDWserver/http/webCDcreator/${dirname}
-		for name in `find -name '[!Mak]*' -type f`
-		do
-			doins ${name}
-		done
-	done
-
-	cd ${S}
-
-	dosbin ${S}/CDWserver/CDWserver
-	dobin ${S}/CDWserver/CDWrootGate
-	dobin ${S}/CDWserver/CDWverify
-	dobin ${S}/CDWserver/setScheduler
-	dobin ${S}/rcdrecord/rcdrecord
-
-	dosym /usr/sbin/CDWserver /usr/sbin/CDWpasswd
-	dosym /usr/sbin/CDWserver /usr/sbin/CDWuseradd
-	dosym /usr/bin/rcdrecord /usr/bin/files2cd
-	dosym /usr/bin/rcdrecord /usr/bin/image2cd
-
-	insinto /var/CDWserver/export/Server/tools
-	doins ${S}/MD5Verify/MD5Verify.jar
-
-	dodoc COPYING ChangeLog README CREDITS
-	dohtml *.html
-}
-
-pkg_postinst() {
-	# ripped from the makefile
-	elog "Now you can start CDWserver by"
-	elog "   /etc/init.d/CDWserver start"
-	elog "Then visit"
-	elog "   http://localhost:12411"
-	elog "or try rcdrecord or files2cd on the command line."
-	echo
-	ewarn "Remember to setup /etc/CDWserver/config"
-}
diff --git a/app-cdr/webcdwriter/webcdwriter-2.7.3.ebuild b/app-cdr/webcdwriter/webcdwriter-2.7.3.ebuild
deleted file mode 100644
index 4f75f4260727..000000000000
--- a/app-cdr/webcdwriter/webcdwriter-2.7.3.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.7.3.ebuild,v 1.5 2007/04/28 21:38:23 tove Exp $
-
-inherit eutils java-pkg
-
-MY_P="${P/cd/CD}"
-DESCRIPTION="Make CD-writer(s) available to all users in your network"
-HOMEPAGE="http://joerghaeger.de/webCDwriter/index.html"
-SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="java pam mp3 sox vorbis"
-
-RDEPEND="
-	app-cdr/cdrdao
-	virtual/cdrtools
-	mp3? ( media-sound/mpg123 )
-	sox? ( media-sound/sox )
-	vorbis? ( media-sound/vorbis-tools )
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	epatch ${FILESDIR}/configure.patch
-
-	local myconf
-
-	use pam || myconf="--pam"
-	myconf="${myconf} --user=root --group=root"
-	./configure ${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-
-	newinitd ${FILESDIR}/${PN}.rc CDWserver
-
-	diropts -m700
-	dodir /etc/CDWserver
-	keepdir /var/CDWserver/bin
-	dodir /var/CDWserver/export/Server/tools
-	dodir /var/CDWserver/http/rcdrecord
-	keepdir /var/CDWserver/projects
-	keepdir /var/log/CDWserver
-	keepdir /var/spool/CDWserver
-
-	insinto /etc/CDWserver
-
-	PORT="12411"
-	if use mp3
-	then
-		MP3="on"
-	else
-		MP3="off"
-	fi
-	if use vorbis
-	then
-		OGG="on"
-	else
-		OGG="off"
-	fi
-	if use sox
-	then
-		AUDIO="on"
-	else
-		AUDIO="off"
-	fi
-
-	cd ${S}/CDWserver/config
-	cat config.default \
-		| sed s*#portNo=12411*portNo=${PORT}*g \
-		| sed s*#MP3decoding=on*MP3decoding=${MP3}*g \
-		| sed s*"# ogg123"*oggDecoding=${OGG}*g \
-		| sed s*#audioCDSupport=on*audioCDSupport=${AUDIO}*g \
-		> config
-	for name in `find -name '[!M]*' -type f`
-	do
-		doins ${name}
-	done
-
-	cd ${S}/CDWserver/http
-	for dirname in `find -type d`
-	do
-		cd ${S}/CDWserver/http/${dirname}
-		dodir /var/CDWserver/http/${dirname}
-		insinto /var/CDWserver/http/${dirname}
-		for name in `find -name '[!M]*' -type f`
-		do
-			doins ${name}
-		done
-	done
-
-	cd ${S}/CDWserver/test
-	make || die "make -C CDWserver/test failed"
-	for name in `find -type f -perm -111`
-	do
-		dobin ${name}
-	done
-
-	insinto /var/CDWserver/http/rcdrecord
-
-	cd ${S}/rcdrecord
-	for name in `find -name '*.html'`
-	do
-	    doins ${name}
-	done
-
-	cd ${S}/webCDcreator
-	cp start.html index.html
-	for dirname in `find -type d`
-	do
-		cd ${S}/webCDcreator/${dirname}
-		dodir /var/CDWserver/http/webCDcreator/${dirname}
-		insinto /var/CDWserver/http/webCDcreator/${dirname}
-		for name in `find -type f`
-		do
-			if test "${name}" != Makefile
-			then
-				doins ${name}
-			fi
-		done
-	done
-
-	cd ${S}/tools
-	make || die "make -C tools failed"
-	mv CDWconfig.sh.tmp ${S}/CDWserver/CDWconfig.sh
-
-	cd ${S}
-
-	dosbin ${S}/CDWserver/CDWconfig.sh
-	dosbin ${S}/CDWserver/CDWserver
-	dobin ${S}/CDWserver/CDWrootGate
-	dobin ${S}/CDWserver/CDWverify
-	dobin ${S}/CDWserver/setScheduler
-	dobin ${S}/rcdrecord/rcdrecord
-
-	dosym /usr/sbin/CDWserver /usr/sbin/CDWpasswd
-	dosym /usr/sbin/CDWserver /usr/sbin/CDWuseradd
-	dosym /usr/bin/rcdrecord /usr/bin/files2cd
-	dosym /usr/bin/rcdrecord /usr/bin/image2cd
-
-	insinto /var/CDWserver/export/Server/tools
-	doins ${S}/MD5Verify/MD5Verify.jar
-
-	dodoc COPYING ChangeLog README CREDITS
-	dohtml *.html
-}
-
-pkg_postinst() {
-	# ripped from the makefile
-	local PORTEXT
-	if [ "${PORT}" == "80" ]
-	then
-		PORTEXT=""
-	else
-		PORTEXT=":${PORT}"
-	fi
-	elog "To do:"
-	elog "1. Enter \"/etc/init.d/CDWserver start\" to start your webCDwriter"
-	elog "2. Open your web browser and try"
-	elog "   \"http://127.0.0.1${PORTEXT}\" or \"http://`hostname`${PORTEXT}\""
-	elog "to check the status of your webCDwriter"
-#	elog "3. Run \"/usr/sbin/CDWconfig.sh\" to set the rights of CDWserver"
-	echo
-	ewarn "Remember to setup /etc/CDWserver/config"
-}
diff --git a/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild b/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild
index 607e6ef397ef..617c1b88c1aa 100644
--- a/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild
+++ b/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild,v 1.1 2007/05/19 21:24:08 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild,v 1.2 2007/10/24 02:00:30 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -80,7 +80,7 @@ src_install() {
 		AUDIO="off"
 	fi
 
-	cd ${S}/CDWserver/config
+	cd "${S}"/CDWserver/config
 	cat config.default \
 		| sed s*#portNo=12411*portNo=${PORT}*g \
 		| sed s*#MP3decoding=on*MP3decoding=${MP3}*g \
@@ -92,10 +92,10 @@ src_install() {
 		doins ${name}
 	done
 
-	cd ${S}/CDWserver/http
+	cd "${S}"/CDWserver/http
 	for dirname in `find -type d`
 	do
-		cd ${S}/CDWserver/http/${dirname}
+		cd "${S}"/CDWserver/http/${dirname}
 		dodir /var/CDWserver/http/${dirname}
 		insinto /var/CDWserver/http/${dirname}
 		for name in `find -name '[!M]*' -type f`
@@ -104,7 +104,7 @@ src_install() {
 		done
 	done
 
-	cd ${S}/CDWserver/test
+	cd "${S}"/CDWserver/test
 	make || die "make -C CDWserver/test failed"
 	for name in `find -type f -perm -111`
 	do
@@ -113,17 +113,17 @@ src_install() {
 
 	insinto /var/CDWserver/http/rcdrecord
 
-	cd ${S}/rcdrecord
+	cd "${S}"/rcdrecord
 	for name in `find -name '*.html'`
 	do
 		doins ${name}
 	done
 
-	cd ${S}/webCDcreator
+	cd "${S}"/webCDcreator
 	cp start.html index.html
 	for dirname in `find -type d`
 	do
-		cd ${S}/webCDcreator/${dirname}
+		cd "${S}"/webCDcreator/${dirname}
 		dodir /var/CDWserver/http/webCDcreator/${dirname}
 		insinto /var/CDWserver/http/webCDcreator/${dirname}
 		for name in `find -type f`
@@ -135,18 +135,18 @@ src_install() {
 		done
 	done
 
-	cd ${S}/tools
+	cd "${S}"/tools
 	make || die "make -C tools failed"
-	mv CDWconfig.sh.tmp ${S}/CDWserver/CDWconfig.sh
+	mv CDWconfig.sh.tmp "${S}"/CDWserver/CDWconfig.sh
 
-	cd ${S}
+	cd "${S}"
 
-	dosbin ${S}/CDWserver/CDWconfig.sh
-	dosbin ${S}/CDWserver/CDWserver
-	dobin ${S}/CDWserver/CDWrootGate
-	dobin ${S}/CDWserver/CDWverify
-	dobin ${S}/CDWserver/setScheduler
-	dobin ${S}/rcdrecord/rcdrecord
+	dosbin "${S}"/CDWserver/CDWconfig.sh
+	dosbin "${S}"/CDWserver/CDWserver
+	dobin "${S}"/CDWserver/CDWrootGate
+	dobin "${S}"/CDWserver/CDWverify
+	dobin "${S}"/CDWserver/setScheduler
+	dobin "${S}"/rcdrecord/rcdrecord
 
 	dosym /usr/sbin/CDWserver /usr/sbin/CDWpasswd
 	dosym /usr/sbin/CDWserver /usr/sbin/CDWuseradd
diff --git a/app-cdr/webcdwriter/webcdwriter-2.8.0.ebuild b/app-cdr/webcdwriter/webcdwriter-2.8.0.ebuild
deleted file mode 100644
index cfe680c57ccb..000000000000
--- a/app-cdr/webcdwriter/webcdwriter-2.8.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.0.ebuild,v 1.4 2007/04/28 21:38:23 tove Exp $
-
-inherit eutils java-pkg
-
-MY_P="${P/cd/CD}"
-DESCRIPTION="Make CD-writer(s) available to all users in your network"
-HOMEPAGE="http://joerghaeger.de/webCDwriter/index.html"
-SRC_URI="http://joerghaeger.de/webCDwriter/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="java pam mp3 sox vorbis"
-
-RDEPEND="
-	app-cdr/cdrdao
-	virtual/cdrtools
-	mp3? ( media-sound/mpg123 )
-	sox? ( media-sound/sox )
-	vorbis? ( media-sound/vorbis-tools )
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="java? ( >=virtual/jdk-1.4 )
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	epatch ${FILESDIR}/configure.patch
-
-	local myconf
-
-	use pam || myconf="--pam"
-	myconf="${myconf} --user=root --group=root"
-	./configure ${myconf} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-
-	newinitd ${FILESDIR}/${PN}.rc CDWserver
-
-	diropts -m700
-	dodir /etc/CDWserver
-	keepdir /var/CDWserver/bin
-	dodir /var/CDWserver/export/Server/tools
-	dodir /var/CDWserver/http/rcdrecord
-	keepdir /var/CDWserver/projects
-	keepdir /var/log/CDWserver
-	keepdir /var/spool/CDWserver
-
-	insinto /etc/CDWserver
-
-	PORT="12411"
-	if use mp3
-	then
-		MP3="on"
-	else
-		MP3="off"
-	fi
-	if use vorbis
-	then
-		OGG="on"
-	else
-		OGG="off"
-	fi
-	if use sox
-	then
-		AUDIO="on"
-	else
-		AUDIO="off"
-	fi
-
-	cd ${S}/CDWserver/config
-	cat config.default \
-		| sed s*#portNo=12411*portNo=${PORT}*g \
-		| sed s*#MP3decoding=on*MP3decoding=${MP3}*g \
-		| sed s*"# ogg123"*oggDecoding=${OGG}*g \
-		| sed s*#audioCDSupport=on*audioCDSupport=${AUDIO}*g \
-		> config
-	for name in `find -name '[!M]*' -type f`
-	do
-		doins ${name}
-	done
-
-	cd ${S}/CDWserver/http
-	for dirname in `find -type d`
-	do
-		cd ${S}/CDWserver/http/${dirname}
-		dodir /var/CDWserver/http/${dirname}
-		insinto /var/CDWserver/http/${dirname}
-		for name in `find -name '[!M]*' -type f`
-		do
-			doins ${name}
-		done
-	done
-
-	cd ${S}/CDWserver/test
-	make || die "make -C CDWserver/test failed"
-	for name in `find -type f -perm -111`
-	do
-		dobin ${name}
-	done
-
-	insinto /var/CDWserver/http/rcdrecord
-
-	cd ${S}/rcdrecord
-	for name in `find -name '*.html'`
-	do
-	    doins ${name}
-	done
-
-	cd ${S}/webCDcreator
-	cp start.html index.html
-	for dirname in `find -type d`
-	do
-		cd ${S}/webCDcreator/${dirname}
-		dodir /var/CDWserver/http/webCDcreator/${dirname}
-		insinto /var/CDWserver/http/webCDcreator/${dirname}
-		for name in `find -type f`
-		do
-			if test "${name}" != Makefile
-			then
-				doins ${name}
-			fi
-		done
-	done
-
-	cd ${S}/tools
-	make || die "make -C tools failed"
-	mv CDWconfig.sh.tmp ${S}/CDWserver/CDWconfig.sh
-
-	cd ${S}
-
-	dosbin ${S}/CDWserver/CDWconfig.sh
-	dosbin ${S}/CDWserver/CDWserver
-	dobin ${S}/CDWserver/CDWrootGate
-	dobin ${S}/CDWserver/CDWverify
-	dobin ${S}/CDWserver/setScheduler
-	dobin ${S}/rcdrecord/rcdrecord
-
-	dosym /usr/sbin/CDWserver /usr/sbin/CDWpasswd
-	dosym /usr/sbin/CDWserver /usr/sbin/CDWuseradd
-	dosym /usr/bin/rcdrecord /usr/bin/files2cd
-	dosym /usr/bin/rcdrecord /usr/bin/image2cd
-
-	insinto /var/CDWserver/export/Server/tools
-	doins ${S}/MD5Verify/MD5Verify.jar
-
-	dodoc COPYING ChangeLog README CREDITS
-	dohtml *.html
-}
-
-pkg_postinst() {
-	# ripped from the makefile
-	local PORTEXT
-	if [ "${PORT}" == "80" ]
-	then
-		PORTEXT=""
-	else
-		PORTEXT=":${PORT}"
-	fi
-	elog "To do:"
-	elog "1. Enter \"/etc/init.d/CDWserver start\" to start your webCDwriter"
-	elog "2. Open your web browser and try"
-	elog "   \"http://127.0.0.1${PORTEXT}\" or \"http://`hostname`${PORTEXT}\""
-	elog "to check the status of your webCDwriter"
-#	elog "3. Run \"/usr/sbin/CDWconfig.sh\" to set the rights of CDWserver"
-	echo
-	ewarn "Remember to setup /etc/CDWserver/config"
-}