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.

Package-Manager: portage-2.1.2.7

6 files changed, 291 insertions, 13 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/Manifest b/app-cdr/webcdwriter/Manifest
index bf5e28153fb9..371dd2938f45 100644
--- a/app-cdr/webcdwriter/Manifest
+++ b/app-cdr/webcdwriter/Manifest
@@ -1,6 +1,10 @@
 -----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
+SHA256 7e5e19ea1a64da2d72354b981faf37fca23d6df828c07d5e1ff2187767f83bcb files/2.8.0-javac-flags.patch 2023
 AUX config-root.patch 260 RMD160 81f47dcfa96700ecfe2b848f7e2b4d846daa6546 SHA1 05602c460bff8b7fe19ca033aaa4ab4cfe747f9e SHA256 6171bb43781a206897a257ffbf14f8654aaabc81a8202f1a789f1c26fdc0ce73
 MD5 de11fda53f812cf8a6bccc2f4df4cff5 files/config-root.patch 260
 RMD160 81f47dcfa96700ecfe2b848f7e2b4d846daa6546 files/config-root.patch 260
@@ -34,18 +38,22 @@ EBUILD webcdwriter-2.7.3.ebuild 3835 RMD160 90da085b551e66799a3b948667f8319a54f5
 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 2148 RMD160 1dfd9cad046c0c55452b41c82e087415f3dd81b2 SHA1 8fbc365116175a4a216db6a1c4b72c3dda16decb SHA256 d325d7c19dfb66bb2a948cc7fb0df4fbe812cb2bf75862638e2e405e22dd7e82
-MD5 320142ff16217c0cb2459a5ce514deb0 ChangeLog 2148
-RMD160 1dfd9cad046c0c55452b41c82e087415f3dd81b2 ChangeLog 2148
-SHA256 d325d7c19dfb66bb2a948cc7fb0df4fbe812cb2bf75862638e2e405e22dd7e82 ChangeLog 2148
-MISC metadata.xml 656 RMD160 67c2635127918e8b467fc92553dd25e63ed6d5e2 SHA1 4eddb3d630cc5e3555b8d3cee6342b17ba06b42a SHA256 4b28f35928721df0d53b1a7f9f7e325dd00dff655ec6e8242b5f78a1085e7af7
-MD5 cfe975200ea41b14081dcb465baaf0c4 metadata.xml 656
-RMD160 67c2635127918e8b467fc92553dd25e63ed6d5e2 metadata.xml 656
-SHA256 4b28f35928721df0d53b1a7f9f7e325dd00dff655ec6e8242b5f78a1085e7af7 metadata.xml 656
+MISC ChangeLog 2506 RMD160 2a316c097781672ea65be6135cc0821f90d423c7 SHA1 861a924c62a99e0d9d6d43582389a773bc31be6e SHA256 f9d5a6b016daa0d4b9a5d267938764120fb35e7831378a5617640ae24222f1e3
+MD5 57106bd4e6030cedd46c6558adb3bfd2 ChangeLog 2506
+RMD160 2a316c097781672ea65be6135cc0821f90d423c7 ChangeLog 2506
+SHA256 f9d5a6b016daa0d4b9a5d267938764120fb35e7831378a5617640ae24222f1e3 ChangeLog 2506
+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
@@ -61,10 +69,13 @@ SHA256 e63515d48692e8ce94cac4d764fdea7cce451f4632d98c1642054f32a1aca235 files/di
 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)
 
-iD8DBQFGM77XV3J2n04EauwRAiwQAKCGGL+MLwXgYx37s6QBuPmOn5RGmACfaSwd
-nNfX4DwVQ/Mg02y40h3CenM=
-=XDqN
+iD8DBQFGT2r8cxLzpIGCsLQRAooCAJ4p6B7j4ZI/kEe5ZGyIyE2M9cE//ACfR2b2
+hFZB85i7hbJ9Ff3CgL2a6uA=
+=8W5v
 -----END PGP SIGNATURE-----
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"
+}