build.xml + ebuild cleanups.

Package-Manager: portage-2.1.2-r2

4 files changed, 34 insertions, 37 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/Manifest b/media-video/projectx/Manifest
index d729db00d618..1532b4b97b66 100644
--- a/media-video/projectx/Manifest
+++ b/media-video/projectx/Manifest
@@ -1,17 +1,17 @@
-AUX build-0.90.4.xml 2256 RMD160 9ec47bf02544542f35ee63ca939b95ce081ce315 SHA1 d35f8503c4ed777c5b61be7a1cbfdf3ec4550329 SHA256 ed4ca5545ee8ade4fd5cb2d8ce6000e40f05c1e6cbfeb03079d11f8942876849
-MD5 eb72efa3ebfc180c4ecd9334b6e7fa00 files/build-0.90.4.xml 2256
-RMD160 9ec47bf02544542f35ee63ca939b95ce081ce315 files/build-0.90.4.xml 2256
-SHA256 ed4ca5545ee8ade4fd5cb2d8ce6000e40f05c1e6cbfeb03079d11f8942876849 files/build-0.90.4.xml 2256
+AUX build-0.90.4.xml 2037 RMD160 31314f6bae4df3a011c0bc33d15e5ae5dc914988 SHA1 834f950385ceb83f2ef816eb060f6be1d5af3724 SHA256 fc25b4d5dad59cb1d30614879ef26f2ab689be145da9ff90d6995b3085d240c5
+MD5 08b113adfeaaceca34d51f4241eb5555 files/build-0.90.4.xml 2037
+RMD160 31314f6bae4df3a011c0bc33d15e5ae5dc914988 files/build-0.90.4.xml 2037
+SHA256 fc25b4d5dad59cb1d30614879ef26f2ab689be145da9ff90d6995b3085d240c5 files/build-0.90.4.xml 2037
 DIST ProjectX_LanguagePack_0.90.4.00.zip 124257 RMD160 09f63b0761568f5934960663e52a0043a48727ee SHA1 9887c7d9a81384e006efb6dd8ef2925add7def3f SHA256 eff00b1b623e8a0c986eb79472622fd771c1c44b9d9d83062e6cc0772e9fd841
 DIST ProjectX_Source_eng_0.90.4.00.zip 825784 RMD160 8914557a5e04f02ba574a48711ecb6b24e651482 SHA1 ef7be92217c276204fff290add0a9080c77b7eec SHA256 fe41e409381a988201404338bb3dd178caa71ab6058151ae49a1e97b0aa58537
-EBUILD projectx-0.90.4.00-r2.ebuild 1976 RMD160 eb025c6e4863dc66c1d757e25d172a16e3f7ee04 SHA1 cc3783f897ab6e08bd1869eda3337f87ac5f31c0 SHA256 02a5be2c295e7371d6a5de7c5d8a0bc9938900005f65266e856ebe9ebe1eb066
-MD5 4b76f07cba1f08838a805a64d7a2a78b projectx-0.90.4.00-r2.ebuild 1976
-RMD160 eb025c6e4863dc66c1d757e25d172a16e3f7ee04 projectx-0.90.4.00-r2.ebuild 1976
-SHA256 02a5be2c295e7371d6a5de7c5d8a0bc9938900005f65266e856ebe9ebe1eb066 projectx-0.90.4.00-r2.ebuild 1976
-MISC ChangeLog 1896 RMD160 d62c9ac7c4649c62b0be79a7f423c27a473c8877 SHA1 176db3380e6fb64bcd628fd1f9f8595c06241fe1 SHA256 26b9fa617a8393235fb7c74f3534fa5174f8ea377576a64b6d4ed61f2066d4c8
-MD5 9508939090c57a1fb900bea7875c2778 ChangeLog 1896
-RMD160 d62c9ac7c4649c62b0be79a7f423c27a473c8877 ChangeLog 1896
-SHA256 26b9fa617a8393235fb7c74f3534fa5174f8ea377576a64b6d4ed61f2066d4c8 ChangeLog 1896
+EBUILD projectx-0.90.4.00-r2.ebuild 2002 RMD160 bedde55130f2c795952d93d1d4a782ed6ce99eeb SHA1 b999e07f4a7bb4410323bc28bc68b925425f8e05 SHA256 41a1a6614a0b4ee270c0f1ffb268c65d789df172499bfb6f9620f243bfe49757
+MD5 cf5a560c6b5a35c87d268b736556c18a projectx-0.90.4.00-r2.ebuild 2002
+RMD160 bedde55130f2c795952d93d1d4a782ed6ce99eeb projectx-0.90.4.00-r2.ebuild 2002
+SHA256 41a1a6614a0b4ee270c0f1ffb268c65d789df172499bfb6f9620f243bfe49757 projectx-0.90.4.00-r2.ebuild 2002
+MISC ChangeLog 2039 RMD160 49d2fa06aa5bb8128db328b75554a18a0d31a888 SHA1 33c60d23721ae027ab9017932ef7e811cf04a710 SHA256 46a82519597319b454313ad8793e70432d7e44f57770203503cd3cdbb69ab576
+MD5 4a261b987b97d6a214ac626fdeb6d46a ChangeLog 2039
+RMD160 49d2fa06aa5bb8128db328b75554a18a0d31a888 ChangeLog 2039
+SHA256 46a82519597319b454313ad8793e70432d7e44f57770203503cd3cdbb69ab576 ChangeLog 2039
 MISC metadata.xml 552 RMD160 e64d43298a7062ee3524be66149d4189e0a54138 SHA1 376eadcfc81a41cff52b15c0a2a90f530660171f SHA256 594f8951dcebe3c7e750e8ac9e2ae008f55c01d0d06b39865c9f682bb8bbfa8f
 MD5 a5bc554bd20390118527a75f399aca04 metadata.xml 552
 RMD160 e64d43298a7062ee3524be66149d4189e0a54138 metadata.xml 552
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
 }