build.xml + ebuild cleanups.

(Portage version: 2.1.2-r2)

3 files changed, 22 insertions, 25 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 06b1133be921..08e547c1fce2 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/projectx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.21 2007/03/11 20:29:42 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.22 2007/03/11 22:11:27 sbriesen Exp $
+
+  11 Mar 2007; Stefan Briesenick <sbriesen@gentoo.org>
+  files/build-0.90.4.xml, projectx-0.90.4.00-r2.ebuild:
+  build.xml + ebuild cleanups.
 
   11 Mar 2007; Stefan Briesenick <sbriesen@gentoo.org>
   -files/build-0.90.3.xml, -projectx-0.90.3.00.ebuild,
diff --git a/media-video/projectx/files/build-0.90.4.xml b/media-video/projectx/files/build-0.90.4.xml
index 7413658ce48f..e8bf9d4071ed 100644
--- a/media-video/projectx/files/build-0.90.4.xml
+++ b/media-video/projectx/files/build-0.90.4.xml
@@ -8,8 +8,7 @@
 	<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="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
 	<property name="target.jdk" value="1.4" />
 
 	<!-- classpath -->
@@ -22,33 +21,26 @@
 	<!-- init -->
 	<target name="init">
 		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${build.dir}" />
 		<mkdir dir="${docs.dir}" />
+		<mkdir dir="${build.dir}" />
 	</target>	
 
 	<!-- compile everything -->
 	<target name="compile" depends="init">
-		<mkdir dir="${build.dir}" />
-		<javac srcdir="${src.dir}" 
+		<javac srcdir="${src.dir}"
 			destdir="${build.dir}"
 			source="${target.jdk}"
 			target="${target.jdk}"
 			classpathref="refcp"
 			encoding="ISO-8859-1"/>
-		
 		<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}">
+	<!-- build the jar files -->
+	<target name="build" depends="compile">
+		<jar jarfile="${project.jar}" basedir="${build.dir}">
 			<manifest>
 				<attribute name="Main-Class" value="${manifest.mainclass}" />
 			</manifest>
@@ -56,7 +48,7 @@
 	</target>
 	
 	<!-- generate javadocs -->
-	<target name="docs" depends="init">
+	<target name="javadoc" depends="init">
 		<javadoc sourcepath="${src.dir}"
 			packagenames="net.*, edu.*"
            		destdir="${docs.dir}"
@@ -73,7 +65,6 @@
 		<delete dir="${build.dir}" />
 		<delete dir="${docs.dir}" />
 		<delete dir="${dist.dir}" />
-		<delete dir="${lib.dir}" />
 	</target>
 
         <!-- zip the sources -->
diff --git a/media-video/projectx/projectx-0.90.4.00-r2.ebuild b/media-video/projectx/projectx-0.90.4.00-r2.ebuild
index 73ccc546d112..d0a22274fab4 100644
--- a/media-video/projectx/projectx-0.90.4.00-r2.ebuild
+++ b/media-video/projectx/projectx-0.90.4.00-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00-r2.ebuild,v 1.3 2006/12/27 13:23:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00-r2.ebuild,v 1.4 2007/03/11 22:11:27 sbriesen Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -23,12 +23,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="X doc source"
 
-RDEPEND=">=virtual/jre-1.4
-	dev-java/commons-net
+COMMON_DEP="dev-java/commons-net
 	=dev-java/jakarta-oro-2.0*"
 
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
 DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
+	${COMMON_DEP}
 	app-arch/unzip
 	dev-java/ant-core
 	source? ( app-arch/zip )"
@@ -62,7 +64,7 @@ src_unpack() {
 }
 
 src_compile() {
-	eant jar $(use_doc docs) -Dmanifest.mainclass=$(mainclass)
+	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
 }
 
 src_install() {
@@ -80,6 +82,6 @@ src_install() {
 	fi
 
 	dodoc *.txt
-	use doc && java-pkg_dohtml -r apidocs/
-	use source && java-pkg_dosrc src/.
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
 }