media-gfx/sweethome3d: unbundled sunflow

(Portage version: 2.1.9.35/svn/Linux x86_64)

svn path=/java-overlay/; revision=8302

3 files changed, 51 insertions, 16 deletions

diff --git a/media-gfx/sweethome3d/ChangeLog b/media-gfx/sweethome3d/ChangeLog
index 0d94f0bb..000970ed 100644
--- a/media-gfx/sweethome3d/ChangeLog
+++ b/media-gfx/sweethome3d/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sweethome3d-3.0-r2 (31 Jan 2011)
+
+  31 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> -sweethome3d-3.0-r1.ebuild,
+  +sweethome3d-3.0-r2.ebuild:
+  Unbundled sunflow
+
 *sweethome3d-3.0-r1 (31 Jan 2011)
 
   31 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> -sweethome3d-3.0.ebuild,
diff --git a/media-gfx/sweethome3d/Manifest b/media-gfx/sweethome3d/Manifest
index dcd6e58d..252374bc 100644
--- a/media-gfx/sweethome3d/Manifest
+++ b/media-gfx/sweethome3d/Manifest
@@ -1,5 +1,6 @@
 DIST SweetHome3D-3.0-src.zip 17143307 RMD160 63db57604a95ca10c860786bf758b4eb604c3975 SHA1 2569567017ab81755bb5b9e19ce6ef430e521387 SHA256 ca76c6b89f621d43dce76309b7a616bfbdd88b18524df45e5b802324e61f5dce
+DIST sunflow-0.7.3.zip 1202475 RMD160 168cf3df556999961cf0ead8b0043600907598f4 SHA1 338756fea942772fc7456c47b36dd1df1772954b SHA256 38e7778c7fc3c8ef98ae779a4cc578e568ffe17a3743c48ba4ae653f862df41d
 DIST sweethome3d.png 6828 RMD160 a8d30eda10cde6718e8cc9a66f665ac16731e58c SHA1 00b36f75957eac4209415c4c5c0aad635f406fc6 SHA256 5cc20b9b82b84d1d85dc776e77d1399bfad136fc032d3f6c9fe1f06cdba33855
-EBUILD sweethome3d-3.0-r1.ebuild 2268 RMD160 5e28df08dcd62839c6ac08123b426442144f6c5a SHA1 8be611547aa9afcba61169cd2430478e842649ce SHA256 4bce9916c981d988966be0f6dd17b56764aa6be7b06c9ce90cc24a9a5e6c3399
-MISC ChangeLog 986 RMD160 7f8e17ad2d46dd1dc442aabd4e6f09d177be4cf0 SHA1 fee084c133f21313db8f761cbe1a126e2a553c6f SHA256 c57dd73f789995a6d897e3d1018b36b1a996549a58d67fc55e4f6389419ecf8f
+EBUILD sweethome3d-3.0-r2.ebuild 2851 RMD160 838d535b8e0a1b210a6b0ed4170347021487b647 SHA1 b299ddde0d53fbd508ea5afaeeda67cd6acf24ec SHA256 e6607d85a8cf491cc09e96742198227614ff67b4ff4cfe99a7c2bf805fc6a088
+MISC ChangeLog 1152 RMD160 9423a7a6b808baad3593a27c9e264c6466d18d6c SHA1 1510f5531aba6b8932fc2e4ec81852915bae1fe6 SHA256 ac767f19e5c96a38ebe038cdeca3a362e2f48eabc19cf8d55bfb2169eb79ec21
 MISC metadata.xml 146 RMD160 204468a395c66c3476c0d3c6793e06d17c04f11d SHA1 57f13e066b456ca072923d16784fdeb05374e56d SHA256 a04f0525e90bc81f0aa09200eef9c1a5c43f1bd7e2c06d66dc501bf5bb3e94f0
diff --git a/media-gfx/sweethome3d/sweethome3d-3.0-r1.ebuild b/media-gfx/sweethome3d/sweethome3d-3.0-r2.ebuild
index f6aadae1..05b2081a 100644
--- a/media-gfx/sweethome3d/sweethome3d-3.0-r1.ebuild
+++ b/media-gfx/sweethome3d/sweethome3d-3.0-r2.ebuild
@@ -3,14 +3,15 @@
 # $Header: $
 
 EAPI="3"
-inherit eutils java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2 java-pkg-simple
 
 MY_PN="SweetHome3D"
 
 DESCRIPTION="Sweet Home 3D is a free interior design application."
 HOMEPAGE="http://${PN}.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-src.zip
-	http://dev.gentoo.org/~fordfrog/distfiles/${PN}.png"
+	http://dev.gentoo.org/~fordfrog/distfiles/${PN}.png
+	http://www.polyquark.com/opensource/download/binariesAndSources.zip -> sunflow-0.7.3.zip"
 LICENSE="GPL-3"
 IUSE=""
 SLOT="0"
@@ -24,10 +25,10 @@ COMMON_DEPEND="
 	dev-java/freehep-util:0
 	dev-java/itext:0
 	dev-java/j3d-core:0
+	dev-java/janino:0
 	dev-java/java3dsloader:0
 	dev-java/jmf-bin:0
 	dev-java/vecmath:0"
-#	>=media-gfx/sunflow-0.7.3e:0
 
 DEPEND=">=virtual/jdk-1.5
 	app-arch/unzip
@@ -37,23 +38,32 @@ RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}-src"
+SUNFLOW_PATCH="sunflow-0.07.3e-src-diff"
 
+# sunflow variables
+JAVA_GENTOO_CLASSPATH="janino"
+JAVA_SRC_DIR="${WORKDIR}/${SUNFLOW_PATCH}/src"
+
+# sweethome variables
 EANT_BUILD_TARGET="build furniture textures help"
 
 src_unpack() {
 	unpack ${MY_PN}-${PV}-src.zip
 
-	cd "${S}" || die "Can not change directory to ${S}"
+	# prepare modified sources of sunflow
+	mkdir ${SUNFLOW_PATCH} || die
+	pushd ${SUNFLOW_PATCH} >/dev/null || die
+	unpack sunflow-0.7.3.zip
+	popd >/dev/null || die
+	unpack ./SweetHome3D-3.0-src/${SUNFLOW_PATCH}.zip
 
-	# clean lib directory
-	# keeping sunflow*jar as we do not have any replacement for it for now
-	cp lib/sunflow*.jar "${T}" || die
-	rm -frv lib/* || die "Cannot remove files in lib directory"
-	rm -frv libtest/*.jar || die "Cannot remove files in libtest directory"
-	cp "${T}"/sunflow*.jar lib/ || die
+	einfo "Removing bundled jars..."
+	find -name "*.jar" -type f | xargs rm -v
+}
 
+java_prepare() {
 	# add dependencies into the lib dir
-	cd "${S}"/lib || die "Cannot cd to lib directory"
+	pushd "${S}"/lib >/dev/null || die
 	java-pkg_jar-from freehep-graphics2d
 	java-pkg_jar-from freehep-graphicsio
 	java-pkg_jar-from freehep-graphicsio-svg
@@ -62,15 +72,33 @@ src_unpack() {
 	java-pkg_jar-from j3d-core
 	java-pkg_jar-from java3dsloader
 	java-pkg_jar-from jmf-bin
-	#java-pkg_jar-from sunflow
 	java-pkg_jar-from vecmath
-	cd "${S}"/libtest || die "Cannot cd to libtest directory"
+	popd >/dev/null || die
+	pushd "${S}"/libtest >/dev/null || die
 	java-pkg_jar-from apple-java-extensions-bin
+	popd >/dev/null || die
+
+	# add dependency for sunflow
+	java-pkg_jar-from --into "${WORKDIR}"/${SUNFLOW_PATCH} janino
+}
+
+src_compile() {
+	# to prevent QA warning, renaming build.xml for a while
+	mv build.xml build.xml.bak || die
+
+	# compile and link sunflow
+	java-pkg-simple_src_compile
+	mv "${S}"/${PN}.jar "${S}"/lib/sunflow.jar || die
+
+	# rename build.xml back
+	mv build.xml.bak build.xml || die
+
+	java-pkg-2_src_compile
 }
 
 src_install() {
 	java-pkg_dojar build/*.jar
-	java-pkg_newjar lib/sunflow*.jar sunflow.jar
+	java-pkg_dojar lib/sunflow.jar
 
 	# create SweetHome3D wrapper script
 	java-pkg_dolauncher ${MY_PN} --main com.eteks.sweethome3d.SweetHome3D \