First working version

(Portage version: 2.1.9.24/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

4 files changed, 48 insertions, 106 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index d2d7fc8..d628b7c 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  opencascade-6.3-r3.ebuild, metadata.xml:
+  First complete and working version
+
 *opencascade-6.3-r3 (06 Nov 2010)
 
   06 Nov 2010; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/sci-libs/opencascade/Manifest b/sci-libs/opencascade/Manifest
index c80fde1..b465a01 100644
--- a/sci-libs/opencascade/Manifest
+++ b/sci-libs/opencascade/Manifest
@@ -5,23 +5,23 @@ AUX env.ksh.template 1412 RMD160 aaf7c74e1aef841d669cf44c279e747cb336fd2b SHA1 e
 AUX opencascade-6.3-fixed-DESTDIR.patch 16811 RMD160 4cecc900ec5b3835f7d6f9b14e6655e82d496d1a SHA1 298df55796e208aee3e04798d69b5079b1ea8fce SHA256 84743f54bb8b8b9568b5a32b5af0384efe746d20500972c66050c3a1d5ebe814
 AUX opencascade-6.3-missing-mode.patch 625 RMD160 a2c7b729a121c4b25aaa7f1ee3e42020af5b58f8 SHA1 b3b95a8a93a2f14513ce8222f0e3a695e9c513b5 SHA256 4aa7338175c7b2dbbcb12eef72c61eb55ade58ad2c698c94ae16e1bc4b451e0a
 DIST opencascade-6.3.tgz 105877329 RMD160 b71f1b9a57d9624d2f079d4f7a8090f700c6126f SHA1 21a177fae5fa73263517aedbe60a4ee4926156f2 SHA256 1f1fc8d8be1d4ff6fe8df1059f856eec156385887880f3f69d147824957c2411
-EBUILD opencascade-6.3-r3.ebuild 6912 RMD160 9ff6620b4e8e97e16c534f46e02dc1ffcfb11b06 SHA1 2feb59a95841d3063ec82f40c2b557576c3f6cf0 SHA256 36189a5881ff2a2ce879322e5a70409297af136fda5bf53620619387a35a9ca1
-MISC ChangeLog 3259 RMD160 72d87786e38b77bf5e6a03584bac9949225914d3 SHA1 dc96d44598ecb3846e8100fca52d2a26ff2b2851 SHA256 a312f59c6fc5b09437daf3e4a24b209cfd2868705f3c0b7a9dc9d9a8e3268d10
-MISC metadata.xml 290 RMD160 9f3cbbdab5e81cf6052e862b9dffc93fe6d05ab4 SHA1 c0d19faadb38c6efc60196ecc33c6133ab327cec SHA256 59bf761b4ccacd0a58db45fd1368c2069f2db4022a52ed3300f1fd95bd41f7b6
+EBUILD opencascade-6.3-r3.ebuild 4788 RMD160 e5b37ffd863624f1a472dc95daa8ac6c26239a47 SHA1 b8aff566afca4173b9b1a3094e86486ec44dd975 SHA256 f029a8bbca443500391022df94c1293585d7174b8655ff7955d38231f7619f60
+MISC ChangeLog 3397 RMD160 d42ebde816b3f3747e893d01d74abc8247a747f5 SHA1 e00dc95fb5c5f04867ed3ae82415239dbd62f354 SHA256 e32286779ba5405b1163dafbdbb45ed8311a47e582c11a61cc6190237163ed77
+MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM1dLdAAoJENwGBM22xffeJ64P/iL+JCgTceeMUl9MOAKXNARe
-8rGOR/0+4+B0hBSzpKtbinKN/BTxYh3zHdt5MVnk+BaLazEJJWjB5LvD/YIT0kuI
-VeNDew6ZVd/dAOtOJMvHox7rEr931GKlMQqp52nsJvNcraR9GOI61vOI1JfJJCNt
-u2A5IKxsz314XKezKOmq2K/DXWoLLY2lh6QrcIZb1yWwE6WyZ8UIQQYrinMdS8Lh
-qmGW7Btp8YTmiqoPVPrl07lZjUsMU3SfUw0oQO83kr8/IdkCHbfFlYnwpe1AW/K9
-v+WMiSQKmZ2IICo9pBVDK0BiQYWqd/ce/2U9ks1RrduNL/jz+TipJpTslE7tN0Ur
-iN0COS4qC9E4ZDQ8niDe0RZ1k0By2zdw1Tr8MNaR6qA7/phXtF4X8lZ0BtD0isb0
-WkvvYOVraNUQw/tn9llRtj5bJheRIboQy1/oteEEj8ab4jQZWPNPZJoGD4xIw2d4
-17FkikJRvpdEtnHen89re842etO4epmTAfC6qW/JkWkrcD+8Xe3Mx4k3E1JFPawp
-jAtyN6Ykw1jzudnyQg2cQZFzH5cBFz0cFn+/fIZEKC20R9gVC7qPPtXJ7mAfF/5M
-iAR9KSc8VWS/zif55/MrRDRKWq3DlbJ+42zmwJlEnbdufHr39UaDafCq+tmiGtmR
-9V3nMP4XoubtdXwYOjWs
-=A9rX
+iQIcBAEBAgAGBQJM1vj/AAoJENwGBM22xffeRvMQAIFaJnVIJfHzFXacqXFQU00p
+fYk85XhM4FpCn1a6/OWhGzvbrjIYQZHClg1o+DZ5CXSoUEf1nDHg9KBN1NloALCd
+Fr4Ny09qJzUkvzhwH9gBUQ5SoasJnbtBYYJs6hphvqLdI3aTVs2ufUTcjQBt+Dnx
+vzRamcmsD/BQdQzDSVx2oYGWOlJNpTkDifNXMwMiwjJ1JL4UhdRNVMPM5mnaFkZu
+aUN2U9siFsfgU5fPoclTxl1WVJNqFcNeOeaO6l2ubZU6YLPeXROKVRFtac/1YnG6
+VHBcL1q/oFBbszrgwIx8byZJNDZM1lYRC6aNc8Sk02O1cnuZLrwqJu5AmtoOwNRk
+K6RTSReTtk9zCws6GNhYjOP1pHMYXzOcptIxWPBpb/bWpOqXK8rNVj+tdiwtpEJb
+PCetWyBN1MyCPzF+nQqB/fq0HtP4HQKB5zOAwg5mD/qKQYw2HXs7AMMku/meH39B
+MBsZhx00o10D0OX73EVv/TTuRYs5rw7/RAsi2HDJ1XQ28FiF97LpqwTJjSSBcVph
+fvC5BjwkULWAMKvVcmhJbvx+Br/1+J/ygKM7bKa5twN6mCEDfRDzs3vuTBJr0za6
+m79pBVDUevbseq6783DyCAF1slgTGWTUAvZrGwx8o1BLCI7+KCymUY3UhOL6QxAY
+e5MUjI/S+u/+p5KKXTCP
+=FPsH
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index c599be2..b166de4 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -3,7 +3,4 @@
 <pkgmetadata>
 <herd>sci</herd>
 <maintainer><email>dilfridge@gentoo.org</email></maintainer>
-<use>
-	<flag name="stlport"> Enables support for STL files</flag>
-</use>
 </pkgmetadata>
diff --git a/sci-libs/opencascade/opencascade-6.3-r3.ebuild b/sci-libs/opencascade/opencascade-6.3-r3.ebuild
index ba3c7e8..f8d4b9f 100644
--- a/sci-libs/opencascade/opencascade-6.3-r3.ebuild
+++ b/sci-libs/opencascade/opencascade-6.3-r3.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit autotools eutils flag-o-matic check-reqs java-pkg-opt-2 multilib toolchain-funcs versionator
+inherit autotools eutils check-reqs multilib
 
 DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange."
 HOMEPAGE="http://www.opencascade.org"
@@ -13,22 +13,19 @@ SRC_URI="http://files.opencascade.com/OCC_${PV}_release/OpenCASCADE_src.tgz -> $
 LICENSE="Open-CASCADE-Technology-Public-License"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples java opengl source stlport X"
+IUSE="debug doc examples java"
+
 DEPEND="java? ( virtual/jdk )
-	opengl? ( virtual/opengl
-		virtual/opengl )
-	X? ( x11-libs/libXmu
-		app-text/dgs )
+	virtual/opengl
+	x11-libs/libXmu
 	>=dev-lang/tcl-8.4
 	>=dev-lang/tk-8.4
 	>=dev-tcltk/itcl-3.2
 	>=dev-tcltk/itk-3.2
-	>=dev-tcltk/tix-8.4.2
-	stlport? ( dev-libs/STLport )"
+	>=dev-tcltk/tix-8.4.2"
 RDEPEND=${DEPEND}
 
 S=${WORKDIR}/OpenCASCADE${PV}.0/ros
-INSTALL_DIR=/opt/${P}/ros
 
 pkg_setup() {
 	# Determine itk, itcl, tix, tk and tcl versions
@@ -38,6 +35,8 @@ pkg_setup() {
 	tk_version=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
 	tcl_version=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
 
+	INSTALL_DIR=/usr/$(get_libdir)/${P}/ros
+
 	ewarn
 	ewarn " It is important to note that OpenCascade is a very large package. "
 	ewarn " Please note that building OpenCascade takes a lot of time and "
@@ -53,14 +52,14 @@ pkg_setup() {
 
 src_prepare() {
 	# Substitute with our ready-made env.ksh script
-	cp -f "${FILESDIR}"/env.ksh.template "${S}"/env.ksh || die "Cannot copy env.ksh.template"
+	cp -f "${FILESDIR}"/env.ksh.template env.ksh || die
 
 	# Feed environment variables used by Opencascade compilation
 	sed -i \
 		-e "s:VAR_CASROOT:${S}:g" \
 		-e 's:VAR_SYS_BIN:/usr/bin:g' \
 		-e "s:VAR_SYS_LIB:/usr/$(get_libdir):g" env.ksh \
-	|| die "Environment variables feed in env.ksh failed!"
+			|| die "Environment variables feed in env.ksh failed!"
 
 	# Tweak itk, itcl, tix, tk and tcl versions
 	sed -i \
@@ -69,84 +68,43 @@ src_prepare() {
 		-e "s:VAR_TIX:tix${tix_version}:g" \
 		-e "s:VAR_TK:tk${tk_version}:g" \
 		-e "s:VAR_TCL:tcl${tcl_version}:g" env.ksh \
-	|| die "itk, itcl, tix, tk and tcl version tweaking failed!"
+			|| die "itk, itcl, tix, tk and tcl version tweaking failed!"
 
-	# epatch "${FILESDIR}"/${P}-Makefile.am.patch
 	epatch "${FILESDIR}"/${P}-fixed-DESTDIR.patch
 	epatch "${FILESDIR}"/${P}-missing-mode.patch
 
-	chmod u+x configure
-
-	# Autotools version update
 	source env.ksh
-	eaclocal || die "eaclocal failed"
-	eautoheader || die "eautoheader failed"
-	eautomake -a -c -f
-	_elibtoolize --force --copy || die "elibtoolize failed"
-	eautoconf || die "eautoconf failed"
+	eautoreconf
 }
 
 src_configure() {
 	# Add the configure options
 	local confargs="--prefix=${INSTALL_DIR}/lin --exec-prefix=${INSTALL_DIR}/lin --with-tcl=/usr/$(get_libdir) --with-tk=/usr/$(get_libdir)"
 
-	if use X ; then
-		confargs="${confargs} --with-dps-include=/usr/include --with-dps-library=/usr/$(get_libdir)"
-		confargs="${confargs} --with-xmu-include=/usr/include --with-xmu-library=/usr/$(get_libdir)"
-		if use !opengl; then
-			ewarn "Activate OpenGL if you want to be able to visualize geometry. Set "opengl" USE flag."
-		else
-			confargs="${confargs} --with-gl-include=/usr/include --with-gl-library=/usr/$(get_libdir)"
-		fi
-	else
-		if use opengl; then
-			die "OpenGL imply X support! Add "X" USE flag."
-		else
-			ewarn "Activate X and OpenGL if you want to be able to visualize geometry. Set "X" and "opengl" USE flags."
-		fi
-	fi
-
 	if use java ; then
 		local java_path
 		java_path=`java-config -O`
 		confargs="${confargs} --with-java-include=${java_path}/include"
 	else
-		ewarn "Java wrapping is not going to be compiled. USE flag: "java""
-	fi
-
-	# NOTES: To clearly state --with-stlport-include and --with-stlport-library cause troubles. I don't know why....
-	if use stlport ; then
-		confargs="${confargs} --with-stlport-libname=stlport_gcc"
-		#confargs="${confargs} --with-stlport-include=/usr/include --with-stlport-library=/usr/$(get_libdir)"
+		confargs+=" --without-java-include"
 	fi
 
-	# Compiler and linker flags
-	if use amd64 ; then
-		append-flags -m64
-	fi
-	append-ldflags -lpthread
-
 	econf	${confargs} \
-		$(use_with X x ) \
-		$(use_enable debug ) \
-		$(use_enable !debug production ) \
-	|| die "Configuration failed"
+		$(use_enable debug ) $(use_enable !debug production ) \
+			|| die "Configuration failed"
 }
 
 src_install() {
-	rm *~
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install || die
 
 	# Symlinks for keeping original OpenCascade folder structure and
-	# add a link lib to lib64 in ros/Linux if we are on amd64
-	# dosym lin ${INSTALL_DIR}/Linux
+	# add a link lib to lib64  if we are on amd64
 
 	if use amd64 ; then
-		mv "${D}""${INSTALL_DIR}"/lin/lib "${D}""${INSTALL_DIR}"/lin/lib64
 		dosym lib64 ${INSTALL_DIR}/lin/lib
 	fi
 
-	# Tweak the environment variables script
+	# Tweak the environment variables script again with new destination
 	cp "${FILESDIR}"/env.ksh.template env.ksh
 	sed -i "s:VAR_CASROOT:${INSTALL_DIR}/lin:g" env.ksh
 
@@ -158,9 +116,10 @@ src_install() {
 		-e '1,2d' \
 		-e '4,14d' \
 		-e "s:/Linux/lib/:/$(get_libdir)/:g" ./50${PN} \
-	|| die "Creation of the /etc/env.d/50opencascade failed!"
+			|| die "Creation of the /etc/env.d/50opencascade failed!"
+
 	sed -i "2i\PATH=${INSTALL_DIR}/lin/bin\nLDPATH=${INSTALL_DIR}/lin/$(get_libdir)" ./50${PN} \
-	|| die "Creation of the /etc/env.d/50opencascade failed!"
+			|| die "Creation of the /etc/env.d/50opencascade failed!"
 
 	# Update both env.d and script with the libraries variables
 	sed -i \
@@ -171,37 +130,23 @@ src_install() {
 		-e "s:VAR_TIX:tix${tix_version}:g" \
 		-e "s:VAR_TK:tk${tk_version}:g" \
 		-e "s:VAR_TCL:tcl${tcl_version}:g" env.ksh 50${PN} \
-	|| die "Tweaking of the Tcl/Tk libraries location in env.ksh and 50opencascade failed!"
+			|| die "Tweaking of the Tcl/Tk libraries location in env.ksh and 50opencascade failed!"
 
 	# Install the env.d variables file
-	doenvd 50${PN}
-	rm 50${PN} env.csh
-
-	# Clean before copying everything
-	emake clean || die "emake clean failed"
+	doenvd 50${PN} || die
 
-	# Install folders
-	cd "${S}"/../
-
-	## Do we really need this USE-flag?
-	if use source; then
-		#symlink for config.h
-		dosym ${INSTALL_DIR}/lin/config.h ${INSTALL_DIR}/inc/config.h
-
-		insinto ${INSTALL_DIR}/../
-		doins -r ros
-	fi
+	cd "${S}"/../ || die
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins -r data
+		doins -r data || die
 
 		insinto /usr/share/doc/${PF}/examples/samples
-		doins -r samples/tutorial
+		doins -r samples/tutorial || die
 
 		if use java ; then
 			insinto /usr/share/doc/${PF}/examples/samples/standard
-			doins -r samples/standard/java
+			doins -r samples/standard/java || die
 		fi
 	fi
 
@@ -209,10 +154,6 @@ src_install() {
 	if use doc; then
 		cd "${S}"/../doc
 		insinto /usr/share/doc/${PF}
-		doins -r {Overview,ReferenceDocumentation} || die "dodoc failed"
+		doins -r {Overview,ReferenceDocumentation} || die
 	fi
 }
-
-pkg_postinst() {
-	einfo "Open CASCADE ebuild needs further development. Please inform any problems or improvements in http://bugs.gentoo.org/show_bug.cgi?id=118656"
-}