Version bump for bug 186331, should also close bug 210803.

Package-Manager: portage-2.1.5.4

4 files changed, 263 insertions, 2 deletions

diff --git a/app-cdr/webcdwriter/ChangeLog b/app-cdr/webcdwriter/ChangeLog
index 7294c415b87b..99bbcebeeb7d 100644
--- a/app-cdr/webcdwriter/ChangeLog
+++ b/app-cdr/webcdwriter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/webcdwriter
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/ChangeLog,v 1.15 2008/06/06 21:00:37 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/ChangeLog,v 1.16 2008/06/07 11:13:50 drac Exp $
+
+*webcdwriter-2.8.2 (07 Jun 2008)
+
+  07 Jun 2008; Samuli Suominen <drac@gentoo.org>
+  +files/2.8.2-javac-flags.patch, +webcdwriter-2.8.2.ebuild:
+  Version bump for bug 186331, should also close bug 210803.
 
   06 Jun 2008; Samuli Suominen <drac@gentoo.org>
   webcdwriter-2.8.0-r1.ebuild:
diff --git a/app-cdr/webcdwriter/Manifest b/app-cdr/webcdwriter/Manifest
index 2af251898441..05a54ffd4763 100644
--- a/app-cdr/webcdwriter/Manifest
+++ b/app-cdr/webcdwriter/Manifest
@@ -1,8 +1,11 @@
 AUX 2.8.0-javac-flags.patch 2023 RMD160 a4d45b88979dc30fd2f8385fb0bd57b3e91d9064 SHA1 e87a981e00e45b978b49644a1b7e8fe7d20293fa SHA256 7e5e19ea1a64da2d72354b981faf37fca23d6df828c07d5e1ff2187767f83bcb
+AUX 2.8.2-javac-flags.patch 1990 RMD160 98a8c755d0e423451b2161502cfc0f19194c8b7a SHA1 0eab86068592c64ed1b98824f8f28c59b66e0cd4 SHA256 3e14ec8fdacddd4c4c040acb8e1848ee268de42bce484decf8bd1c1c9cbc350c
 AUX config-root.patch 260 RMD160 81f47dcfa96700ecfe2b848f7e2b4d846daa6546 SHA1 05602c460bff8b7fe19ca033aaa4ab4cfe747f9e SHA256 6171bb43781a206897a257ffbf14f8654aaabc81a8202f1a789f1c26fdc0ce73
 AUX configure.patch 397 RMD160 ff252dd9b2caad21b6d15351e8ca78de975a2160 SHA1 8f75acda959ac7dfb14308f28ab0dc54f200c8ef SHA256 09c4be09edbb2fa43d6c2e821b88b920e7235d7bf78092336ab88c088f111c72
 AUX webcdwriter.rc 803 RMD160 e9d997a1f030a3c97f90dfed04287efea8b3337d SHA1 110a0acd496eb4b479815d2bc58454cf17f10b47 SHA256 7e7933349d7bf5d6655476cdd94da715b17d28d80a59511ac535c882f4effe71
 DIST webCDwriter-2.8.0.tar.bz2 616305 RMD160 9a0bae209290e574aecbabcc5a0907c4db84a140 SHA1 2b64786bbeece9a1539fe737415e2d29aaa1a63c SHA256 bc8b7d167c99ccfe83d144b26e60d3f5be81af45be52e14d6817112d032ba13c
+DIST webCDwriter-2.8.2.tar.bz2 619761 RMD160 d932d7bdfccd1ff8047bf02bef495e7c5956ca10 SHA1 3c1785c83f018c0c61e97ae0cbab9ffbb983f2ad SHA256 52dd4792ec80b3bd8b6c96e42a00c43d0f73bda5c4277cd065333d279f3f5cf3
 EBUILD webcdwriter-2.8.0-r1.ebuild 4312 RMD160 d13093a933621d35c4cab5365c7a2f729ea33f99 SHA1 3f5a4008d76c583f8e23db037f4425a92b17e2d5 SHA256 20442cea528de23b243ed7e43014947d1df3689526212cc554d49946cedfea8e
-MISC ChangeLog 2997 RMD160 5374f64a3835d0b84ee5bd9ffe2703196e1ab18a SHA1 ae5a6f449670d3d6c6e0fa25b6a113fbc4b2b0d1 SHA256 0516dea298cf9822a3465249f7022a43872035151b4a70ddd0c0311086127710
+EBUILD webcdwriter-2.8.2.ebuild 4383 RMD160 ced8265feea36b1c85fdcea0ea0bf5ca50d376d3 SHA1 807d7b3d14a135d9a17a4d4de6cc7542846877e6 SHA256 900be6bfb0fc5e0ea8253a0c735115203aa5cbf5375a28083a25b590669ce3c8
+MISC ChangeLog 3203 RMD160 ae8753921d3d1c83eeb91fd0393f8b95b2548479 SHA1 9b0ef18e38eb1a54eebad1742ff1b76ae691b86a SHA256 4af95347ab7d28269cef8c17f01fb454e4b5ac9eed5b1c005e1ae18e09de84cb
 MISC metadata.xml 676 RMD160 ce6924d943ccda47e4ee1743b17c2105656a7466 SHA1 bdaaa7be79c0be5c71d07454a3fa6a54b57744ae SHA256 fe2246e40a0513506f9fefb071243f844159ee9519cdb7d5b68d561451e9aa9e
diff --git a/app-cdr/webcdwriter/files/2.8.2-javac-flags.patch b/app-cdr/webcdwriter/files/2.8.2-javac-flags.patch
new file mode 100644
index 000000000000..3236d74a4b2b
--- /dev/null
+++ b/app-cdr/webcdwriter/files/2.8.2-javac-flags.patch
@@ -0,0 +1,67 @@
+diff -ur webCDwriter-2.8.2.orig/configure webCDwriter-2.8.2/configure
+--- webCDwriter-2.8.2.orig/configure	2007-03-20 15:14:30.000000000 +0200
++++ webCDwriter-2.8.2/configure	2008-06-07 13:56:36.000000000 +0300
+@@ -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 for javac
++
+ --doNotCompileCDWserver  if you want to install CDWserver Pro
+ 
+ --doNotCompileWebCDcreator  use the precompiled and signed webCDcreator
+@@ -152,7 +157,7 @@
+ 	}
+ }
+ EOF
+-javac Test.java 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,12 +289,15 @@
+ 	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
+ 
+ 
+diff -ur webCDwriter-2.8.2.orig/webCDcreator/Makefile.in webCDwriter-2.8.2/webCDcreator/Makefile.in
+--- webCDwriter-2.8.2.orig/webCDcreator/Makefile.in	2007-04-21 01:22:20.000000000 +0300
++++ webCDwriter-2.8.2/webCDcreator/Makefile.in	2008-06-07 13:57:56.000000000 +0300
+@@ -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 -encoding ISO-8859-1 -source 1.4 -target 1.4 *.java
++	javac -encoding ISO-8859-1 ${JAVACFLAGS} *.java netscape/security/*.java
+ 	jar cfm webCDcreator.jar Manifest \
+ 		gpl.html \
+ 		*.class \
diff --git a/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild b/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild
new file mode 100644
index 000000000000..1e2552111119
--- /dev/null
+++ b/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/webcdwriter/webcdwriter-2.8.2.ebuild,v 1.1 2008/06/07 11:13:50 drac Exp $
+
+inherit eutils java-pkg-2 pam
+
+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"
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	virtual/cdrtools
+	mp3? ( virtual/mpg123 )
+	sox? ( media-sound/sox )
+	vorbis? ( media-sound/vorbis-tools )
+	>=virtual/jre-1.4
+	app-misc/openjnlp"
+
+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}"/${PV}-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
+
+	use pam && pamd_mimic system-auth cdwserver auth account password session
+}
+
+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"
+}