new upstream version, fixes #91963. marked 0.82.0.00 stable on amd64, ppc and x86

(Portage version: 2.0.51.21)

8 files changed, 156 insertions, 68 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 645d8175092c..11630c43ac3a 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/projectx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.11 2005/05/04 09:30:12 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.12 2005/05/13 12:37:30 luckyduck Exp $
+
+*projectx-0.82.1.00 (13 May 2005)
+
+  13 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/0.82.1.00-build.xml, -projectx-0.81.7.ebuild,
+  projectx-0.82.0.00.ebuild, +projectx-0.82.1.00.ebuild:
+  new upstream version, fixes #91963. marked 0.82.0.00 stable on amd64, ppc
+  and x86
 
   04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> projectx-0.81.7.ebuild,
   projectx-0.82.0.00.ebuild:
diff --git a/media-video/projectx/Manifest b/media-video/projectx/Manifest
index 9a1d9b5c9ae4..a93747d5c7fd 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d129178929cd4d8985e8dd7bd00e3932 projectx-0.81.7.ebuild 1243
-MD5 fd72e14329ca20280582b73355cc8ebe ChangeLog 1912
+MD5 c79f6ffb6bf6ef2d5cfc7dbc45d77416 projectx-0.82.1.00.ebuild 1413
+MD5 921bb8aedc4bd59233f612fda1b7a978 ChangeLog 2198
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 b52b98c15ddd395ed2a6a6a2fe651ef9 projectx-0.82.0.00.ebuild 1401
+MD5 47f454325e4f91cec69741682460b2c4 projectx-0.82.0.00.ebuild 1398
+MD5 b4ae51238511bfc67e1a8cdec24ab3eb files/0.82.1.00-build.xml 2213
 MD5 b4ae51238511bfc67e1a8cdec24ab3eb files/0.82.0.00-build.xml 2213
-MD5 af303240d6ff60c3c83a323ea2f4ab73 files/digest-projectx-0.81.7 71
 MD5 66747c7e41172eca650581213ea161d5 files/build.xml 1069
 MD5 6a180b8fda8939d8800a994fa0b2ca2e files/digest-projectx-0.82.0.00 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCeJYz06ebR+OMO78RAkd8AJ4kKTtSF0g7NEladfm+gjnZxMGu/ACfUOEh
-zuNHv5Es6Vexd2PHPN+4UPw=
-=eLP5
------END PGP SIGNATURE-----
+MD5 a9f5f57962fa9f8b9a3b87e6d6ee2397 files/digest-projectx-0.82.1.00 74
diff --git a/media-video/projectx/files/0.82.1.00-build.xml b/media-video/projectx/files/0.82.1.00-build.xml
new file mode 100644
index 000000000000..aeee07f29985
--- /dev/null
+++ b/media-video/projectx/files/0.82.1.00-build.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+
+<project name="projectx" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="apidocs" />
+	<property name="dist.dir" value="dist" />
+	<property name="lib.dir" value="lib" />
+	<property name="resources.dir" value="resources" />
+	<property name="htmls.dir" value="htmls" />
+	<property name="jarfile" value="${dist.dir}/${ant.project.name}.jar" />
+	<property name="target.jdk" value="1.4" />
+
+	<!-- classpath -->
+	<path id="refcp">
+		<fileset dir="${lib.dir}">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+	
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${build.dir}" />
+		<mkdir dir="${docs.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<mkdir dir="${build.dir}" />
+		<javac srcdir="${src.dir}" 
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"
+			classpathref="refcp"/>
+		
+		<copy todir="${build.dir}">
+			<fileset dir="${resources.dir}" />
+			<fileset file="${htmls.dir}" />
+		</copy>
+
+		<copy todir="${build.dir}/${htmls.dir}">
+			<fileset dir="${htmls.dir}" />
+		</copy>
+	</target>
+
+	<!-- build the jar file -->
+	<target name="jar" depends="compile">
+		<jar jarfile="${jarfile}" basedir="${build.dir}">
+			<manifest>
+				<attribute name="Main-Class" value="net.sourceforge.dvb.projectx.common.X" />
+			</manifest>
+		</jar>
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="docs" depends="init">
+		<javadoc sourcepath="${src.dir}"
+			packagenames="net.*, edu.*"
+           		destdir="${docs.dir}"
+           		author="true"
+           		version="true"
+           		use="true"
+           		windowtitle="${ant.project.name} API" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+		<delete dir="${lib.dir}" />
+	</target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>
diff --git a/media-video/projectx/files/digest-projectx-0.81.7 b/media-video/projectx/files/digest-projectx-0.81.7
deleted file mode 100644
index b65a8e63c93c..000000000000
--- a/media-video/projectx/files/digest-projectx-0.81.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 69b21178c03d4049360b49650f2a7368 ProjectX_Source_0.81.7.zip 213644
diff --git a/media-video/projectx/files/digest-projectx-0.82.1.00 b/media-video/projectx/files/digest-projectx-0.82.1.00
new file mode 100644
index 000000000000..e0f7906bb689
--- /dev/null
+++ b/media-video/projectx/files/digest-projectx-0.82.1.00
@@ -0,0 +1 @@
+MD5 95b87eafb547ff75df75d07b31f7355d ProjectX_Source_0.82.1.00.zip 700265
diff --git a/media-video/projectx/projectx-0.81.7.ebuild b/media-video/projectx/projectx-0.81.7.ebuild
deleted file mode 100644
index 3e1d04c6ca30..000000000000
--- a/media-video/projectx/projectx-0.81.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.81.7.ebuild,v 1.8 2005/05/04 09:30:12 luckyduck Exp $
-
-inherit java-pkg
-
-MY_PN=ProjectX
-
-DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
-HOMEPAGE="http://www.lucike.info/"
-SRC_URI="http://www.lucike.info/download/software/projectx/${MY_PN}_Source_${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc amd64"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	>=dev-java/ant-1.4.1"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_PN}_Source"
-
-src_unpack() {
-	unpack "${A}"
-	cd ${S}
-	# fix html help location
-	sed -i "s|htmls/index.html|/usr/share/doc/${P}/html/index.html|g" src/Html.java
-	# copy selfmade ant build.xml
-	cp "${FILESDIR}/build.xml" .
-}
-
-src_compile() {
-	local antflags="dist -DJARNAME=${P}"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	# create shellscript wrapper
-	echo -e "#!/bin/sh\nexec \${JAVA_HOME}/bin/java -Xms32m -Xmx512m -jar /usr/share/${PN}/${P}.jar \"\$@\"" > ${MY_PN}
-
-	insinto "/usr/share/${PN}"
-	doins dist/lib/*.jar ac3.bin
-
-	dodoc Copying *.txt
-
-	java-pkg_dohtml -r htmls/
-	dobin ${MY_PN}
-}
-
diff --git a/media-video/projectx/projectx-0.82.0.00.ebuild b/media-video/projectx/projectx-0.82.0.00.ebuild
index 7ca9ceaef4f9..b8b10bc41c51 100644
--- a/media-video/projectx/projectx-0.82.0.00.ebuild
+++ b/media-video/projectx/projectx-0.82.0.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.82.0.00.ebuild,v 1.5 2005/05/04 09:30:12 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.82.0.00.ebuild,v 1.6 2005/05/13 12:37:30 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project-x/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc amd64"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
 	jikes? ( dev-java/jikes )
diff --git a/media-video/projectx/projectx-0.82.1.00.ebuild b/media-video/projectx/projectx-0.82.1.00.ebuild
new file mode 100644
index 000000000000..933dbb9a8b6b
--- /dev/null
+++ b/media-video/projectx/projectx-0.82.1.00.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.82.1.00.ebuild,v 1.1 2005/05/13 12:37:30 luckyduck Exp $
+
+inherit eutils java-pkg
+
+MY_PN="ProjectX"
+MY_P="${MY_PN}_Source_${PV}"
+
+DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
+HOMEPAGE="http://sourceforge.net/projects/project-x/"
+SRC_URI="mirror://sourceforge/project-x/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-net
+	=dev-java/jakarta-oro-2.0*"
+
+IUSE="doc jikes source"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/${PV}-build.xml ./build.xml
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} docs"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	# generate a startup script
+	echo "#!/bin/sh" > ${PN}
+	echo "\$(java-config -J) -Xms32m -Xmx512m -cp \$(java-config -p	projectx,jakarta-oro-2.0,commons-net) net.sourceforge.dvb.projectx.common.X \"\$@\"" >> ${PN}
+
+	dobin ${PN}
+
+	if use doc; then
+		java-pkg_dohtml -r apidocs/
+		dodoc *.txt
+	fi
+	use source && java-pkg_dosrc src/*
+}