continuing opendx renovation

6 files changed, 44 insertions, 72 deletions

diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
index 600558d2f..a08eb49f9 100644
--- a/sci-visualization/opendx/ChangeLog
+++ b/sci-visualization/opendx/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.15 2008/09/14 11:25:38 spock Exp $
 
+  19 Apr 2009; François Bissey <f.r.bissey@massey.ac.nz>
+  +files/opendx-4.4.4-dx-errno.patch,
+  +files/opendx-4.4.4-gcc43-fedora.patch, +files/opendx-4.4.4-open.patch,
+  -files/dx-errno.patch, -files/dx-gcc43-fedora.patch, -files/dx-open.patch,
+  opendx-4.4.4-r1.ebuild:
+  rename patches to something nicer. some cleaning of the ebuild structure.
+  introduce the smp keyword and simplify greatly the associated logic.
+
 *opendx-4.4.4-r1 (17 Apr 2009)
 
   17 Apr 2009; François Bissey <f.r.bissey@massey.ac.nz>
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index 770014629..aecc45562 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -1,12 +1,12 @@
 AUX 20-opendx-revdep 44 RMD160 9b68b96b8f513a78a51249c7705d93d665bb3d2b SHA1 9389ea70249fe8149a33944a07466dddc9c1ae8d SHA256 fa96c22f9e7870a60c27c02cceb6bb3782d40c07ac53f19d7be7941a12347a01
-AUX dx-errno.patch 340 RMD160 39928c8d031394cf59dd6dd06d25f26cd56482b7 SHA1 7be653fb8303a49a5788dee27323192c2127d199 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4
-AUX dx-gcc43-fedora.patch 13310 RMD160 b98f8034d26db8440be8c8e02a06aaf24fb7030a SHA1 513a64535c04da9ab65db6b89318002171ef2e4c SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d
-AUX dx-open.patch 1671 RMD160 9c4ba9d2735049c841c32ab2efa2d778ce80044a SHA1 f59ba51b5e301f4bf20512835adadd3c65f2fd29 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403
 AUX opendx-4.3.2-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c8 SHA1 b4eed91d8ad2df57241a74d4ef8452ad0d171296 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b
 AUX opendx-4.4.4-concurrent-make-fix.patch 1191 RMD160 3baec5669230df96def294192eea372e59303537 SHA1 ec7b128b46bbf897ffbf0f08a12d36fb499f7241 SHA256 5c1cdc25105815a944cde02550aa7196155be6c07ac4fe697e7ff2ee7d4a6d14
+AUX opendx-4.4.4-dx-errno.patch 340 RMD160 39928c8d031394cf59dd6dd06d25f26cd56482b7 SHA1 7be653fb8303a49a5788dee27323192c2127d199 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4
+AUX opendx-4.4.4-gcc43-fedora.patch 13310 RMD160 b98f8034d26db8440be8c8e02a06aaf24fb7030a SHA1 513a64535c04da9ab65db6b89318002171ef2e4c SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d
 AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f
+AUX opendx-4.4.4-open.patch 1671 RMD160 9c4ba9d2735049c841c32ab2efa2d778ce80044a SHA1 f59ba51b5e301f4bf20512835adadd3c65f2fd29 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403
 AUX opendx-compressed-man.patch 496 RMD160 670de4ea728a3f9b5c02f7950ce88c58d1073a7b SHA1 56dd8a6d9710264ae3b45358ad2eb48ad00d6d98 SHA256 2877bd95b592548c1a0a532b49131b84f5ab1077714ef16d768f3e33f50d6aab
 DIST dx-4.4.4.tar.gz 9676049 RMD160 db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b SHA1 c8e4d72d169675c66acd2135599b211d80810f76 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff
-EBUILD opendx-4.4.4-r1.ebuild 3415 RMD160 3896de2740bf726cd6234c3dfae79ba82460afe5 SHA1 b6630bd26ca841e41cd3d649db01e592e79555f0 SHA256 9e0883cdd2d840aebd00d0dfa20c721692c5df3f2db4b5a4b80c9781a4a645b0
-MISC ChangeLog 4503 RMD160 a5936dedee47edec43a4c906bfeef5e45ed78321 SHA1 5ef4938b5ec0cb2583783a057d62144c8365f8f9 SHA256 78390e2c9e9e72dab493e7686355eef72cf03e65dafcf7d59e8b3f0c83464fa1
+EBUILD opendx-4.4.4-r1.ebuild 2402 RMD160 b54251d75954388868f635d6562297dcc526e990 SHA1 4da39d1cb036bb3318b04f15f69f8d2d053a02ac SHA256 b76fd099f6df17bb236f9cd03c4c23e1f153a6c46b386aa9f95bda68d36138c5
+MISC ChangeLog 5171 RMD160 9ca08ef1bf644b71b8bbccdfcb317f0b35decdb6 SHA1 5be25579b9dae5d6c12a0b09eaae81d520ee1759 SHA256 b6e5b68124f5dbc33151045fc55f4291008ce898305ae9f6a6ebacdd007b112a
 MISC metadata.xml 361 RMD160 404d4eb0602277959498f65685d76eb4350a470d SHA1 f683e24f437dc6a5254d2d4c814c48cfd7d3740e SHA256 1be0f8158e35295c498714d8ad1b780a6fc749bee37bdbb13ad9eb163bbf38f0
diff --git a/sci-visualization/opendx/files/dx-errno.patch b/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch
index 70c1b28f0..70c1b28f0 100644
--- a/sci-visualization/opendx/files/dx-errno.patch
+++ b/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch
diff --git a/sci-visualization/opendx/files/dx-gcc43-fedora.patch b/sci-visualization/opendx/files/opendx-4.4.4-gcc43-fedora.patch
index 64a3d91fe..64a3d91fe 100644
--- a/sci-visualization/opendx/files/dx-gcc43-fedora.patch
+++ b/sci-visualization/opendx/files/opendx-4.4.4-gcc43-fedora.patch
diff --git a/sci-visualization/opendx/files/dx-open.patch b/sci-visualization/opendx/files/opendx-4.4.4-open.patch
index b62ebd094..b62ebd094 100644
--- a/sci-visualization/opendx/files/dx-open.patch
+++ b/sci-visualization/opendx/files/opendx-4.4.4-open.patch
diff --git a/sci-visualization/opendx/opendx-4.4.4-r1.ebuild b/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
index 95e6fd4ac..9f1bfaf80 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
@@ -6,28 +6,19 @@
 # Set SMP="yes" to force enable of SMP compilation.
 # Otherwise it will be autodetected from /usr/src/linux.
 
-inherit eutils flag-o-matic linux-info autotools
+inherit eutils flag-o-matic autotools
 
 EAPI=2
 DESCRIPTION="A 3D data visualization tool"
 HOMEPAGE="http://www.opendx.org/"
 SRC_URI="http://opendx.sdsc.edu/source/${P/open}.tar.gz"
 
-#	There are a few jar files that can be added to enhance JX.
-#	These are java40.jar from the Netscape libraries
-#	(we've provided them in the OpenDX.org lib area) nscosmop211.jar
-#	from the Cosmo Player libs.
-#	http://opendx.npaci.edu/libs/
-#SRC_URI="${SRC_URI}
-#	http://opendx.npaci.edu/libs/netscape-java40.tar.gz
-#	http://opendx.npaci.edu/libs/cosmoplayer-jar.tar.gz"
-
 LICENSE="IPL-1"
 SLOT="0"
-# Should work on x86, ppc, alpha at least
+
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="hdf cdf netcdf tiff imagemagick szip" # java doc"
+IUSE="hdf cdf netcdf tiff imagemagick szip smp"
 
 DEPEND="x11-libs/libXmu
 	x11-libs/libXi
@@ -43,58 +34,24 @@ DEPEND="x11-libs/libXmu
 
 RDEPEND="${DEPEND}"
 # waiting on bug #36349 for media-libs/jasper in imagemagick
-# java support gives some trouble - deprecated api and other unresolved symbols
-#		java? ( virtual/jdk
-#				dev-java/java-config )"
 
 S="${WORKDIR}/${P/open}"
 
-smp() {
-	has "$1" "${SMP}"
-}
-
-smp_check() {
-	linux_chkconfig_present SMP
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
 src_prepare() {
 
-	epatch "${FILESDIR}"/${PN}-4.3.2-sys.h.patch || die "Failed to apply sys.h patch."
+	epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
 	epatch "${FILESDIR}/${PN}-compressed-man.patch"
-	epatch "${FILESDIR}/dx-gcc43-fedora.patch"
-	epatch "${FILESDIR}/dx-errno.patch"
+	epatch "${FILESDIR}/${P}-gcc43-fedora.patch"
+	epatch "${FILESDIR}/${P}-dx-errno.patch"
 	epatch "${FILESDIR}/${P}-libtool.patch"
 	epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
-	epatch "${FILESDIR}/dx-open.patch"
+	epatch "${FILESDIR}/${P}-open.patch"
 
-	eautoreconf || die "Failed running eautoreconf."
+	eautoreconf
 }
 
-src_compile() {
-
-	local myconf="--with-x \
-		--host=${CHOST}"
-
-	# Check for SMP
-	# This needs to be done for /usr/src/linux, NOT the running kernel
-	# Allow override using smp().
-	if smp no
-	then
-		myconf="${myconf} --disable-smp-linux"
-		einfo "Disabling SMP capabilities"
-	elif smp yes || smp_check
-	then
-		myconf="${myconf} --enable-smp-linux"
-		einfo "Enabling SMP capabilities"
-	else
-		myconf="${myconf} --disable-smp-linux"
-		einfo "Disabling SMP capabilities"
-	fi
-
+src_configure() {
+	# check flag filtering
 	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
 	append-flags -fno-strength-reduce
 
@@ -108,30 +65,37 @@ src_compile() {
 
 	local morelibs=""
 	use szip && morelibs="-lsz"
-	# use java && myconf="${myconf} JNIPATH=$(java-config -O)/include:$(java-config -O)/include/linux"
 	econf LIBS="${morelibs}" \
-		`use_with cdf` \
-		`use_with netcdf` \
-		`use_with hdf` \
-		`use_with tiff` \
-		`use_with imagemagick magick` \
-		${myconf} || die
+		"--with-x" \
+		$(use_with cdf) \
+		$(use_with netcdf) \
+		$(use_with hdf) \
+		$(use_with tiff) \
+		$(use_with imagemagick magick) \
+		$(use_enable smp smp-linux)
 
-	#		`use_with java javadx`
-	# This is broken
-	#	`use_enable doc installhtml`
+	ARCH="${GENTOOARCH}"
+#	javadx is currently broken. we may try to fix it someday.
+}
+
+src_compile() {
+	local GENTOOARCH="${ARCH}"
+	unset ARCH
 
 	emake || die
 	ARCH="${GENTOOARCH}"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
-
-	echo "MANPATH=/usr/dx/man" > 50opendx
-	doenvd 50opendx
+	emake DESTDIR="${D}" install || die
 
 	# inform revdep-rebuild about binary locations
 	insinto /etc/revdep-rebuild
 	doins "${FILESDIR}"/20-${PN}-revdep
 }
+
+pkg_postinst() {
+	elog "This version of the opendx ebuild is still under development."
+	elog "suggestions, comments and offer of help welcome"
+	elog "post a message in gentoo-science or pop up on irc on #gentoo-science"
+}