media-gfx/sweethome3d: bumped to version 3.2

(Portage version: 2.1.9.49/svn/Linux x86_64)

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

3 files changed, 117 insertions, 1 deletions

diff --git a/media-gfx/sweethome3d/ChangeLog b/media-gfx/sweethome3d/ChangeLog
index b21dcefc..918946b6 100644
--- a/media-gfx/sweethome3d/ChangeLog
+++ b/media-gfx/sweethome3d/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*sweethome3d-3.2 (14 May 2011)
+
+  14 May 2011; Miroslav Šulc <fordfrog@gentoo.org> +sweethome3d-3.2.ebuild:
+  Bumped to version 3.2
+
 *sweethome3d-3.1 (10 Mar 2011)
 
   10 Mar 2011; Miroslav Šulc <fordfrog@gentoo.org> +sweethome3d-3.1.ebuild:
diff --git a/media-gfx/sweethome3d/Manifest b/media-gfx/sweethome3d/Manifest
index f4799da0..7cfef29b 100644
--- a/media-gfx/sweethome3d/Manifest
+++ b/media-gfx/sweethome3d/Manifest
@@ -1,8 +1,10 @@
 DIST SweetHome3D-3.0-src.zip 17143307 RMD160 63db57604a95ca10c860786bf758b4eb604c3975 SHA1 2569567017ab81755bb5b9e19ce6ef430e521387 SHA256 ca76c6b89f621d43dce76309b7a616bfbdd88b18524df45e5b802324e61f5dce
 DIST SweetHome3D-3.1-src.zip 17466751 RMD160 4f39483c61f3c51791146cec58489ce4295792a7 SHA1 884eabaea7c716e76ccab5f66c50307ffd4a8c84 SHA256 3eadc33f6db2bcf65da7f0f529dc3436b56b9da0fbd8fd482818b758ed07184e
+DIST SweetHome3D-3.2-src.zip 17739101 RMD160 f9e7993cff07c8b71a07ae01d746f3e8f08d198d SHA1 736e029a3d44b3afe6d8c57543a749eaed692bdc SHA256 ec50250dcd60a804d7d00d7ded6421e3d3c10e95ee25ebc14b7b9969ffd3f8fc
 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-r2.ebuild 2851 RMD160 838d535b8e0a1b210a6b0ed4170347021487b647 SHA1 b299ddde0d53fbd508ea5afaeeda67cd6acf24ec SHA256 e6607d85a8cf491cc09e96742198227614ff67b4ff4cfe99a7c2bf805fc6a088
 EBUILD sweethome3d-3.1.ebuild 2853 RMD160 75c9fb01dc39573992b7048a53f665882058ce8c SHA1 cf00ad9172a2132fe34eaaf1c3f0c0186aa1790b SHA256 24b29d631891d1bcb9abd6248e6c466ebc893dc20c87bf24a4dcc59ab7efefd2
-MISC ChangeLog 1277 RMD160 3f8fc4e05425016a4c0aca8237e9fb5120110680 SHA1 20878304670456b97844c07f56f22cb812eebadf SHA256 eccdc4f29fe7895779a0e14e81b332745716c0eee608206efad88817c460d1c6
+EBUILD sweethome3d-3.2.ebuild 2853 RMD160 2b68cc3b37cd52fa2f8a9b36d32907fe1e223269 SHA1 48786f600323aa0186f569117b621b75b448fe83 SHA256 3fd3dc78dad78f38fb790e6669bd0c884d134fca02e5830555506d57b908e888
+MISC ChangeLog 1411 RMD160 744bcbb8404008d0354f9254725226457aa492a6 SHA1 e62986fa666be3966e0b4b5d5079e971490c9d62 SHA256 5538a7e0b8d46eebe03d02fc689aa48fa82ade4fe4e357ee77673ab1c2c1b934
 MISC metadata.xml 146 RMD160 204468a395c66c3476c0d3c6793e06d17c04f11d SHA1 57f13e066b456ca072923d16784fdeb05374e56d SHA256 a04f0525e90bc81f0aa09200eef9c1a5c43f1bd7e2c06d66dc501bf5bb3e94f0
diff --git a/media-gfx/sweethome3d/sweethome3d-3.2.ebuild b/media-gfx/sweethome3d/sweethome3d-3.2.ebuild
new file mode 100644
index 00000000..69cfaae6
--- /dev/null
+++ b/media-gfx/sweethome3d/sweethome3d-3.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+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://www.polyquark.com/opensource/download/binariesAndSources.zip -> sunflow-0.7.3.zip"
+LICENSE="GPL-3"
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-java/apple-java-extensions-bin-1.5:0
+	dev-java/freehep-graphics2d:0
+	dev-java/freehep-graphicsio:0
+	dev-java/freehep-graphicsio-svg:0
+	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"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}-src"
+SUNFLOW_PATCH="sunflow-0.07.3g-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
+
+	# 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-${PV}-src/${SUNFLOW_PATCH}.zip
+
+	einfo "Removing bundled jars..."
+	find -name "*.jar" -type f | xargs rm -v
+}
+
+java_prepare() {
+	# add dependencies into the lib dir
+	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
+	java-pkg_jar-from freehep-util
+	java-pkg_jar-from itext iText.jar
+	java-pkg_jar-from j3d-core
+	java-pkg_jar-from java3dsloader
+	java-pkg_jar-from jmf-bin
+	java-pkg_jar-from vecmath
+	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_dojar lib/sunflow.jar
+
+	# create SweetHome3D wrapper script
+	java-pkg_dolauncher ${MY_PN} --main com.eteks.sweethome3d.SweetHome3D \
+		-Djava.library.path=/usr/$(get_libdir)/${PN} -Xmx256m
+
+	doicon "${DISTDIR}"/${PN}.png || die
+	make_desktop_entry SweetHome3D "Sweet Home 3D" ${PN} Graphics
+}