Migrate to generation 2 eclasses for bug #175525. Add java to metadata.xml for future updates. Java is now mandatory because it was just installing then bundled stuff before.

(Portage version: 2.1.2.7)

5 files changed, 269 insertions, 2 deletions

diff --git a/app-cdr/webcdwriter/ChangeLog b/app-cdr/webcdwriter/ChangeLog
index 837db837ebaa..7df8b0fdc42c 100644
--- a/app-cdr/webcdwriter/ChangeLog
+++ b/app-cdr/webcdwriter/ChangeLog
@@ -1,6 +1,15 @@
 # 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.11 2007/04/28 21:38:23 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/ChangeLog,v 1.12 2007/05/19 21:24:08 betelgeuse Exp $
+
+*webcdwriter-2.8.0-r1 (19 May 2007)
+
+  19 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/2.8.0-javac-flags.patch, metadata.xml,
+  +webcdwriter-2.8.0-r1.ebuild:
+  Migrate to generation 2 eclasses for bug #175525. Add java to metadata.xml
+  for future updates. Java is now mandatory because it was just installing
+  then bundled stuff before.
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> webcdwriter-2.6.8-r1.ebuild,
   webcdwriter-2.7.1.ebuild, webcdwriter-2.7.2.ebuild,
diff --git a/app-cdr/webcdwriter/files/2.8.0-javac-flags.patch b/app-cdr/webcdwriter/files/2.8.0-javac-flags.patch
new file mode 100644
index 000000000000..e8f6432b3554
--- /dev/null
+++ b/app-cdr/webcdwriter/files/2.8.0-javac-flags.patch
@@ -0,0 +1,70 @@
+diff -Naur webCDwriter-2.8.0.orig/configure webCDwriter-2.8.0/configure
+--- webCDwriter-2.8.0.orig/configure	2007-04-29 23:23:42.000000000 +1200
++++ webCDwriter-2.8.0/configure	2007-04-30 18:43:42.000000000 +1200
+@@ -47,6 +47,9 @@
+ 	--destDir=*)
+ 		DESTDIR=`echo $1 | sed "s:--destDir=::g"`
+ 		;;
++	--javac-flags=*)
++		JAVACFLAGS=`echo $1 | sed "s:--javac-flags=::g"`
++		;;
+ 	--doNotCompileCDWserver)
+ 		doNotCompileCDWserver="on"
+ 		;;
+@@ -105,6 +108,8 @@
+ 
+ --destDir              use a prefix invisible to the installed files
+ 
++--javac-flags		Flags to pass to javac
++
+ --doNotCompileCDWserver  if you want to install CDWserver Pro
+ 
+ --doNotCompileWebCDcreator  use the precompiled and signed webCDcreator
+@@ -152,7 +157,8 @@
+ 	}
+ }
+ EOF
+-javac Test.java 2> /dev/null \
++#2> /dev/null
++javac ${JAVACFLAGS} Test.java Test0.java \
+ 	&& webCDcreator="webCDcreator.jar $webCDcreator" \
+ 	&& echo " OK -> will build webCDcreator.jar" \
+ 	|| echo " not found -> will use precompiled webCDcreator.jar"
+@@ -284,13 +290,17 @@
+ 	forPluginRSA=""
+ fi
+ 
++echo "JAVACFLAGS=${JAVACFLAGS}"
++
+ cat webCDcreator/Makefile.in \
+ 	| sed s/@nosCert@/"$nosCert"/g \
+ 	| sed s/@sunCert@/"$sunCert"/g \
+ 	| sed s/@all@/"$webCDcreator"/g \
+ 	| sed s/@4pi@/"$forPlugin"/g \
+ 	| sed s/@4ns@/"$forPluginRSA"/g \
++	| sed s_@JAVACFLAGS@_"$JAVACFLAGS"_g \
+ 	> webCDcreator/Makefile
++#| sed s_@JAVACFLAGS@_"\"$JAVACFLAGS\""_g \
+ 
+ 
+ echo "Creating config"
+diff -Naur webCDwriter-2.8.0.orig/webCDcreator/Makefile.in webCDwriter-2.8.0/webCDcreator/Makefile.in
+--- webCDwriter-2.8.0.orig/webCDcreator/Makefile.in	2007-04-29 23:23:42.000000000 +1200
++++ webCDwriter-2.8.0/webCDcreator/Makefile.in	2007-04-30 20:16:01.000000000 +1200
+@@ -14,6 +14,7 @@
+ 
+ nosCert=@nosCert@
+ sunCert=@sunCert@
++JAVACFLAGS=@JAVACFLAGS@
+ 
+ all: @all@
+ 
+@@ -21,7 +22,7 @@
+ 	$(MAKE) -C icons
+ 
+ webCDcreator.jar: *.java icons/up.jpg
+-	javac -target 1.4 *.java
++	javac ${JAVACFLAGS} *.java netscape/security/*.java
+ 	jar cfm webCDcreator.jar Manifest \
+ 		gpl.html \
+ 		*.class \
diff --git a/app-cdr/webcdwriter/files/digest-webcdwriter-2.8.0-r1 b/app-cdr/webcdwriter/files/digest-webcdwriter-2.8.0-r1
new file mode 100644
index 000000000000..559bce9d5452
--- /dev/null
+++ b/app-cdr/webcdwriter/files/digest-webcdwriter-2.8.0-r1
@@ -0,0 +1,3 @@
+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/metadata.xml b/app-cdr/webcdwriter/metadata.xml
index 7d7f3e27203e..44bbb0fe9738 100644
--- a/app-cdr/webcdwriter/metadata.xml
+++ b/app-cdr/webcdwriter/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
+	<herd>media-optical</herd>
+	<herd>java</herd>
 <longdescription>webCDwriter can be used to make the CD- and DVD-writer(s)
 	connected to a Linux box available to all users in your network. It consists
 	of the server CDWserver and the clients webCDcreator and rcdrecord.
diff --git a/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild b/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..607e6ef397ef
--- /dev/null
+++ b/app-cdr/webcdwriter/webcdwriter-2.8.0-r1.ebuild
@@ -0,0 +1,184 @@
+# 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 $
+
+inherit eutils java-pkg-2
+
+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="pam mp3 sox vorbis"
+
+RDEPEND="
+	app-cdr/cdrdao
+	virtual/cdrtools
+	mp3? ( media-sound/mpg123 )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )
+	>=virtual/jre-1.4
+	app-misc/openjnlp"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	rm -v "${S}"/MD5Verify/*.jar "${S}"/webCDcreator/4plugin/*.jar || die
+}
+
+src_compile() {
+	epatch "${FILESDIR}/configure.patch" "${FILESDIR}/2.8.0-javac-flags.patch"
+
+	local myconf
+
+	local java_conf="$(java-pkg_javac-args) -classpath $(java-pkg_getjar openjnlp jnlp.jar)"
+	java_conf="${java_conf} -encoding ISO-8859-1"
+	use pam || myconf="--pam"
+	myconf="${myconf} --user=root --group=root"
+	./configure ${myconf} --javac-flags="${java_conf}" || 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
+
+	# back to defaults from -m700
+	diropts -m755
+	java-pkg_regjar "${D}"/var/CDWserver/http/webCDcreator/*.jar
+
+	java-pkg_jarinto /var/CDWserver/export/Server/tools
+	java-pkg_dojar "${S}/MD5Verify/MD5Verify.jar"
+
+	dodoc COPYING ChangeLog README CREDITS || die
+	dohtml *.html || die
+}
+
+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"
+}