Fix building when root.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 195 insertions, 7 deletions

diff --git a/dev-java/dynalang/ChangeLog b/dev-java/dynalang/ChangeLog
index eb0d01e54f29..a69f826f271e 100644
--- a/dev-java/dynalang/ChangeLog
+++ b/dev-java/dynalang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/dynalang
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dynalang/ChangeLog,v 1.1 2010/06/05 08:24:22 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dynalang/ChangeLog,v 1.2 2010/06/06 21:50:32 ali_bush Exp $
+
+  06 Jun 2010; Alistair Bush <ali_bush@gentoo.org> dynalang-0.4.ebuild,
+  +files/build.xml:
+  Fix issue when builting as root.
 
 *dynalang-0.4 (05 Jun 2010)
 
diff --git a/dev-java/dynalang/Manifest b/dev-java/dynalang/Manifest
index 40abf855a8de..e250395df921 100644
--- a/dev-java/dynalang/Manifest
+++ b/dev-java/dynalang/Manifest
@@ -1,4 +1,5 @@
+AUX build.xml 6787 RMD160 8b30a2a3b2cfc5f685a5022aeb14a7a7ae206e08 SHA1 d14043c62ad86d94c2d9ea13b7779a6f597fafbf SHA256 cc3c0ede12ca39b0304e11055f7dba7411e38032f0190d7856c1ce61daf754bb
 DIST dynalang-mop-0.4.tgz 227338 RMD160 de4b1b364124b45b0847f00689a395e0e8bf1f9c SHA1 046d0962d7dca64a364f8ff26c487798c9cf603b SHA256 b241b763d8178f7ba74123ed6145df4f255f78df39757665f3569e3ccd11d5cb
-EBUILD dynalang-0.4.ebuild 1276 RMD160 64f7b23023aae52be1b92e42f01e349b05c4337f SHA1 b35785dc5530e0f87d237399949b50d57dde0838 SHA256 4380160597bb7810a738dc83d95030dda4b836062fab2e57ebe10eb3938a634d
-MISC ChangeLog 344 RMD160 1b102681a1afcc6161b5126ea8221162a514efc3 SHA1 dc6098fe4310c18d554806298ae9e9cb68832ca2 SHA256 f273ef48c861af8b02f5a848704b53abe0d0c0bcf967ce186aa94e96814ca276
+EBUILD dynalang-0.4.ebuild 1390 RMD160 a0fdb58943662499f16f107b43a9f133430ee372 SHA1 47245ea8b0e3b2358a6bf93580cd95aa97a5ed8f SHA256 34944dc7df5f1fd86a9bd44985e39f7bb5e9fdd6a782ac8e8b02d9ebeeca7d6f
+MISC ChangeLog 472 RMD160 673a2c928644e760665c78ec73ef8e2512518775 SHA1 fd1e04fcc88d15b9bdf5dad460d344513e50831e SHA256 3779aa67dcbe28a4930f446834e9b8bf03af25bb3951d3f9b692a707194fb7b6
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
diff --git a/dev-java/dynalang/dynalang-0.4.ebuild b/dev-java/dynalang/dynalang-0.4.ebuild
index a1fe5f4ac0a3..8f30b5c9509d 100644
--- a/dev-java/dynalang/dynalang-0.4.ebuild
+++ b/dev-java/dynalang/dynalang-0.4.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/dynalang/dynalang-0.4.ebuild,v 1.3 2010/06/06 04:46:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/dynalang/dynalang-0.4.ebuild,v 1.4 2010/06/06 21:50:32 ali_bush Exp $
 
 EAPI=3
 
 JAVA_PKG_IUSE="doc source"
+JAVA_PKG_BSFIX="off"
 
 inherit java-pkg-2 java-ant-2
 
@@ -30,11 +31,13 @@ DEPEND=">=virtual/jdk-1.5
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
+java_prepare() {
+	cp "${FILESDIR}/build.xml" build.xml || die
+
 	find . -iname '*.jar' -delete
 
 	sed -i -e '/ivy:retrieve/d' build.xml || die
-
+	sed -i -e 's_\.\./ivy_ivy_' build.xml || die
 	sed -i -e \
 		's/clazz.getConstructors/(Constructor<T>[])clazz.getConstructors/' \
 		src/org/dynalang/mop/beans/BeanMetaobjectProtocol.java || die
@@ -53,5 +56,5 @@ src_test() {
 src_install() {
 	java-pkg_newjar "build/${MY_P}.jar"
 	use doc && java-pkg_dojavadoc build/doc/javadoc
-	use source && java-pkg_dosrc src/*
+	use source && java-pkg_dosrc src/org
 }
diff --git a/dev-java/dynalang/files/build.xml b/dev-java/dynalang/files/build.xml
new file mode 100644
index 000000000000..1fbad95e23aa
--- /dev/null
+++ b/dev-java/dynalang/files/build.xml
@@ -0,0 +1,180 @@
+<project name="org.dynalang.mop" basedir=".">

+<!--

+   Copyright 2007 Attila Szegedi

+

+   Licensed under the Apache License, Version 2.0 (the "License");

+   you may not use this file except in compliance with the License.

+   You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

+-->

+<!-- $Id: build.xml,v 1.1 2010/06/06 21:50:33 ali_bush Exp $ -->

+	<property name="project.name" value="JVM Dynamic Languages Metaobject Protocol"/>

+	<property name="artifact.name" value="dynalang-mop"/>

+	<property name="revision" value="0.4"/>

+	<property name="build.dir" location="build"/>

+

+	<target name="clean">

+		<mkdir dir="${build.dir}"/>

+		<delete dir="${build.dir}"/>

+	</target>

+

+        <target name="resolve">

+        </target>

+

+	<path id="compile.classpath">

+                <fileset dir="build/lib/default"/>

+	</path>

+

+	<target name="compile" depends="resolve">

+	        <mkdir dir="build/lib/default"/>

+		<property name="classes.dir" location="${build.dir}/classes"/>

+		<mkdir dir="${classes.dir}"/>

+		<javac srcdir="src" destdir="${classes.dir}" deprecation="off" 

+	               debug="on" optimize="off" target="1.5" source="1.5"

+	               classpathref="compile.classpath"/>

+		<copy toDir="${classes.dir}">

+			<fileset dir="src"

+	            excludes="**/CVS/**,**/*.bak,**/*.java,**/*.jj,**/package.html,overview.html"/>

+		</copy>

+	</target>

+	

+	<target name="jar" depends="compile">

+		<property name="jarfile" location="build/${artifact.name}-${revision}.jar"/>

+		<jar destfile="${jarfile}" basedir="${classes.dir}">

+	        	<manifest>

+	        		<attribute name="Implementation-Vendor" value="Attila Szegedi"/>

+	        		<attribute name="Implementation-Version" value="${revision}"/>

+	        		<attribute name="Implementation-Title" value="${project.name}"/>

+	        		<attribute name="Implementation-URL" value="http://sourceforge.net/projects/dynalang"/>

+	            </manifest>

+		</jar>

+	</target>

+

+	<target depends="" name="doc">

+		<mkdir dir="${build.dir}/doc/javadoc"/>

+		<delete includeEmptyDirs="yes">

+			<fileset dir="${build.dir}/doc/javadoc" includes="**/*" />

+		</delete>

+		<javadoc author="true"

+	                destdir="${build.dir}/doc/javadoc"

+	                doctitle="${project.name} ${revision}"

+	                packagenames="org.dynalang.*"

+	                sourcepath="src"

+	                version="true"

+	                windowtitle="${project.name} ${revision} API"

+			overview="src/overview.html"

+	                use="true">

+		</javadoc>

+		<copy todir="${build.dir}/doc">

+			<fileset dir="src/doc" includes="**/*"/>

+		</copy>

+	</target>

+

+	<target name="coverage-instrument" depends="compile">

+		<property name="coverage.dir" location="${build.dir}/coverage"/>

+		<property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/>

+		<mkdir dir="${coverage.classes.dir}"/>

+		<path id="emma.lib">

+			<pathelement location="build/lib/test/emma.jar" />

+			<pathelement location="build/lib/test/emma_ant.jar" />

+		</path>

+		<taskdef resource="emma_ant.properties" classpathref="emma.lib" />

+		<property name="coverage.instrumentationfile" location="${coverage.dir}/instrumentation"/>

+		<emma enabled="true">

+			<instr 

+	        instrpath="${classes.dir}" outdir="${coverage.classes.dir}" 

+	        outfile="${coverage.instrumentationfile}" mode="copy"/>

+		</emma>

+		<copy todir="${coverage.classes.dir}">

+			<fileset dir="src" excludes="**/*.java"/>

+		</copy>

+		<copy todir="${coverage.classes.dir}">

+			<fileset dir="${classes.dir}"/>

+		</copy>

+		<property name="coverage.outfile" location="${coverage.dir}/coverage"/>

+	</target>

+

+	<target name="test-compile" depends="compile">

+		<property name="test.classes.dir" location="${build.dir}/test/classes"/>

+		<mkdir dir="${test.classes.dir}"/>

+		<javac srcdir="testsrc" destdir="${test.classes.dir}" deprecation="off" 

+	               debug="on" optimize="off" target="1.5" source="1.5">

+			<classpath>

+				<pathelement path="${classes.dir}" />

+				<pathelement path="build/lib/test/junit.jar" />

+			</classpath>

+		</javac>

+		<copy toDir="${test.classes.dir}">

+			<fileset dir="testsrc"

+	            excludes="**/CVS/**,**/*.bak,**/*.java,**/*.jj,**/package.html"/>

+		</copy>

+	</target>

+

+	<target name="test-run" depends="test-compile, coverage-instrument">

+		<junit printsummary="on" fork="true" forkmode="once" 

+			showoutput="true" haltonerror="true" haltonfailure="true">

+			<sysproperty key="emma.coverage.out.file" value="${coverage.outfile}"/>

+			<classpath>

+				<pathelement path="${coverage.classes.dir}" />

+				<pathelement path="${test.classes.dir}" />

+				<pathelement path="build/lib/test/emma.jar"/>

+				<pathelement path="build/lib/test/junit.jar"/>

+			</classpath>

+			<batchtest todir="build/test">

+				<fileset dir="${test.classes.dir}" includes="**/Test*.class"/>

+			</batchtest>

+			<formatter type="plain" usefile="false" />

+			<formatter type="xml"/>

+		</junit>

+		<mkdir dir="build/test/report"/>

+		<junitreport todir="build/test">

+			<fileset dir="build/test" includes="TEST-*.xml"/>

+			<report todir="build/test/report"/>

+		</junitreport>

+	</target>

+

+	<target name="test" depends="test-run">

+		<property name="coverage.report.dir" location="${build.dir}/coverage/report"/>

+		<mkdir dir="${coverage.report.dir}"/>

+		<delete dir="${coverage.report.dir}"/>

+		<mkdir dir="${coverage.report.dir}"/>

+		<emma enabled="true">

+			<report>

+				<fileset dir="${basedir}">

+					<include name="build/coverage/instrumentation"/>

+					<include name="build/coverage/coverage"/>

+				</fileset>

+				<sourcepath>

+					<dirset dir="${basedir}">

+						<include name="src"/>

+					</dirset>

+				</sourcepath>

+				<html outfile="${coverage.report.dir}/index.html"/>

+			</report>

+		</emma>

+	</target>

+	

+	<target name="dist" depends="clean,test-run,jar,doc">

+		<mkdir dir="build/${artifact.name}-${revision}"/>

+		<copy todir="build/${artifact.name}-${revision}">

+			<fileset dir="." excludes="build/**/*"/>

+		</copy>

+		<copy todir="build/${artifact.name}-${revision}">

+			<fileset dir="." 

+				includes="

+					build/doc/**/* 

+					build/${artifact.name}-${revision}.jar"

+			/>

+		</copy>

+		<tar destfile="build/${artifact.name}-${revision}.tgz" 

+			compression="gzip" basedir="build" 

+			includes="${artifact.name}-${revision}/**/*"/>

+	</target>

+</project>