eselect-opencascade, IUSE qt

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

6 files changed, 227 insertions, 26 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index 4befc75a8169..8a5d2c14f357 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/opencascade
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.10 2013/04/26 20:33:00 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.11 2013/04/27 08:25:37 xmw Exp $
+
+*opencascade-6.5.5 (27 Apr 2013)
+
+  27 Apr 2013; Michael Weber <xmw@gentoo.org>
+  +files/opencascade-6.5.4-fixed-tbb-VERSION.patch, +opencascade-6.5.5.ebuild,
+  metadata.xml, opencascade-6.5.0.ebuild, opencascade-6.5.4.ebuild:
+  eselect-opencascade, IUSE qt
 
 *opencascade-6.5.4 (26 Apr 2013)
 *opencascade-6.5.0 (26 Apr 2013)
diff --git a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch
new file mode 100644
index 000000000000..2a245d2bdc46
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-tbb-VERSION.patch
@@ -0,0 +1,10 @@
+--- src/Standard/Standard_MMgrTBBalloc.cxx.ori	2012-04-07 01:28:01.492233539 +0200
++++ src/Standard/Standard_MMgrTBBalloc.cxx	2012-04-07 01:27:52.491891129 +0200
+@@ -12,6 +12,7 @@
+ 
+ // paralleling with Intel TBB
+ #ifdef HAVE_TBB
++#undef VERSION
+ #include <tbb/scalable_allocator.h>
+ using namespace tbb;
+ #else
diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index e9a274a97dd6..6fccf56bc5f6 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Michael Weber</name>
   </maintainer>
   <use>
+    <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
     <flag name="gl2ps">Use gl2ps PostScript printing library</flag>
     <flag name="tbb">tEnable multithreading with the Intel Threads Building Block dev-cpp/tbb</flag>
   </use>
diff --git a/sci-libs/opencascade/opencascade-6.5.0.ebuild b/sci-libs/opencascade/opencascade-6.5.0.ebuild
index a5d8b95bc9aa..4ea9fca53847 100644
--- a/sci-libs/opencascade/opencascade-6.5.0.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.0.ebuild,v 1.1 2013/04/26 20:33:00 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.0.ebuild,v 1.2 2013/04/27 08:25:37 xmw Exp $
 
 EAPI=5
 
@@ -13,19 +13,21 @@ SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/OpenCASCADE${PV//\.
 LICENSE="Open-CASCADE-Technology-Public-License-6.5"
 SLOT="${PV}"
 KEYWORDS=""
-IUSE="debug doc examples gl2ps java"
-
-DEPEND="media-libs/ftgl
+IUSE="debug doc examples freeimage gl2ps java +tbb"
+
+DEPEND="app-admin/eselect-opencascade
+	dev-lang/tcl
+	dev-lang/tk
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	dev-tcltk/tix
+	media-libs/ftgl
 	virtual/glu
 	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
-	gl2ps? ( x11-libs/gl2ps )"
-#freeimage? ( media-libs/freeimage )
+	freeimage? ( media-libs/freeimage )
+	gl2ps? ( x11-libs/gl2ps )
+	tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/ros
@@ -48,7 +50,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-6.5-ftgl.patch \
 		"${FILESDIR}"/${PN}-6.5-fixed-DESTDIR.patch \
-		"${FILESDIR}"/${PN}-6.5-tcl8.6.patch
+		"${FILESDIR}"/${PN}-6.5-tcl8.6.patch \
+		"${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
 
 	# Feed environment variables used by Opencascade compilation
 	my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
@@ -116,7 +119,10 @@ src_configure() {
 		--with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
 		--with-freetype="${EROOT}usr" \
 		--with-ftgl="${EROOT}usr" \
-		$(usex gl2ps "--with-gl2ps=\"${EROOT}usr\"" "") \
+		$(usex freeimage "--with-freeimage=${EROOT}usr" "") \
+		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
+		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
+		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
 		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
 		$(use_enable debug) \
 		$(use_enable !debug production)
diff --git a/sci-libs/opencascade/opencascade-6.5.4.ebuild b/sci-libs/opencascade/opencascade-6.5.4.ebuild
index ec1d92fb1046..9b2304b91f22 100644
--- a/sci-libs/opencascade/opencascade-6.5.4.ebuild
+++ b/sci-libs/opencascade/opencascade-6.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.4.ebuild,v 1.1 2013/04/26 20:33:00 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.4.ebuild,v 1.2 2013/04/27 08:25:37 xmw Exp $
 
 EAPI=5
 
@@ -13,19 +13,21 @@ SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/OpenCASCADE${PV//\.
 LICENSE="Open-CASCADE-Technology-Public-License-6.5"
 SLOT="${PV}"
 KEYWORDS=""
-IUSE="debug doc examples gl2ps java"
-
-DEPEND="media-libs/ftgl
+IUSE="debug doc examples freeimage gl2ps java qt4 +tbb"
+
+DEPEND="app-admin/eselect-opencascade
+	dev-lang/tcl
+	dev-lang/tk
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	dev-tcltk/tix
+	media-libs/ftgl
 	virtual/glu
 	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
-	gl2ps? ( x11-libs/gl2ps )"
-#freeimage? ( media-libs/freeimage )
+	freeimage? ( media-libs/freeimage )
+	gl2ps? ( x11-libs/gl2ps )
+	tbb? ( dev-cpp/tbb )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/ros
@@ -48,6 +50,7 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-fixed-DESTDIR.patch \
 		"${FILESDIR}"/${P}-tcl8.6.patch
+		"${FILESDIR}"/${P}-fixed-tbb-VERSION.patch
 
 	# Feed environment variables used by Opencascade compilation
 	my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
@@ -105,6 +108,8 @@ TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*
 	append-cxxflags "-fpermissive"
 
 	sed -e "/^AM_C_PROTOTYPES$/d" \
+		-e "s:\$qt/include:\$qt/include/qt4:g"\
+		-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
 		-i configure.* || die
 	eautoreconf
 }
@@ -115,7 +120,11 @@ src_configure() {
 		--with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
 		--with-freetype="${EROOT}usr" \
 		--with-ftgl="${EROOT}usr" \
-		$(usex gl2ps "--with-gl2ps=\"${EROOT}usr\"" "") \
+		$(usex freeimage "--with-freeimage=${EROOT}usr" "") \
+		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
+		$(usex qt4 "--with-qt=${EROOT}usr" "") \
+		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
+		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
 		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
 		$(use_enable debug) \
 		$(use_enable !debug production)
diff --git a/sci-libs/opencascade/opencascade-6.5.5.ebuild b/sci-libs/opencascade/opencascade-6.5.5.ebuild
new file mode 100644
index 000000000000..d4521e7a3586
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-6.5.5.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/opencascade-6.5.5.ebuild,v 1.1 2013/04/27 08:25:37 xmw Exp $
+
+EAPI=5
+
+inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange"
+HOMEPAGE="http://www.opencascade.org/"
+SRC_URI="http://files.opencascade.com/OCCT/OCC_${PV}_release/OpenCASCADE${PV//\./}.tgz"
+
+LICENSE="Open-CASCADE-Technology-Public-License-6.5"
+SLOT="${PV}"
+KEYWORDS=""
+IUSE="debug doc examples freeimage gl2ps java qt4 +tbb"
+
+DEPEND="app-admin/eselect-opencascade
+	dev-lang/tcl
+	dev-lang/tk
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	dev-tcltk/tix
+	media-libs/ftgl
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXmu
+	freeimage? ( media-libs/freeimage )
+	gl2ps? ( x11-libs/gl2ps )
+	tbb? ( dev-cpp/tbb )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/ros
+
+# http://bugs.gentoo.org/show_bug.cgi?id=352435
+# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+RESTRICT="bindist mirror"
+
+CHECKREQS_MEMORY="256M"
+CHECKREQS_DISK_BUILD="3584M"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	epatch \
+		"${FILESDIR}"/${PN}-6.5.4-fixed-DESTDIR.patch \
+		"${FILESDIR}"/${PN}-6.5.4-tcl8.6.patch \
+		"${FILESDIR}"/${PN}-6.5.4-fixed-tbb-VERSION.patch
+
+	# Feed environment variables used by Opencascade compilation
+	my_install_dir=${EROOT}usr/$(get_libdir)/${P}/ros
+	local my_env_install="#!/bin/sh -f
+if [ -z \"\$PATH\" ]; then
+	export PATH=VAR_CASROOT/Linux/bin
+else
+	export PATH=VAR_CASROOT/Linux/bin:\$PATH
+fi
+if [ -z \"\$LD_LIBRARY_PATH\" ]; then
+	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib
+else
+	export LD_LIBRARY_PATH=VAR_CASROOT/Linux/lib:\$LD_LIBRARY_PATH
+fi"
+	local my_sys_lib=${EROOT}usr/$(get_libdir)
+	local my_env="CASROOT=VAR_CASROOT
+CSF_MDTVFontDirectory=VAR_CASROOT/src/FontMFT
+CSF_LANGUAGE=us
+MMGT_CLEAR=1
+CSF_EXCEPTION_PROMPT=1
+CSF_SHMessage=VAR_CASROOT/src/SHMessage
+CSF_MDTVTexturesDirectory=VAR_CASROOT/src/Textures
+CSF_XSMessage=VAR_CASROOT/src/XSMessage
+CSF_StandardDefaults=VAR_CASROOT/src/StdResource
+CSF_PluginDefaults=VAR_CASROOT/src/StdResource
+CSF_XCAFDefaults=VAR_CASROOT/src/StdResource
+CSF_StandardLiteDefaults=VAR_CASROOT/src/StdResource
+CSF_GraphicShr=VAR_CASROOT/Linux/lib/libTKOpenGl.so
+CSF_UnitsLexicon=VAR_CASROOT/src/UnitsAPI/Lexi_Expr.dat
+CSF_UnitsDefinition=VAR_CASROOT/src/UnitsAPI/Units.dat
+CSF_IGESDefaults=VAR_CASROOT/src/XSTEPResource
+CSF_STEPDefaults=VAR_CASROOT/src/XSTEPResource
+CSF_XmlOcafResource=VAR_CASROOT/src/XmlOcafResource
+CSF_MIGRATION_TYPES=VAR_CASROOT/src/StdResource/MigrationSheet.txt
+TCLHOME=${EROOT}usr/bin
+TCLLIBPATH=${my_sys_lib}
+ITK_LIBRARY=${my_sys_lib}/itk$(grep ITK_VER /usr/include/itk.h | sed 's/^.*"\(.*\)".*/\1/')
+ITCL_LIBRARY=${my_sys_lib}/itcl$(grep ITCL_VER /usr/include/itcl.h | sed 's/^.*"\(.*\)".*/\1/')
+TIX_LIBRARY=${my_sys_lib}/tix$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
+TK_LIBRARY=${my_sys_lib}/tk$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
+TCL_LIBRARY=${my_sys_lib}/tcl$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')"
+
+	( 	echo "${my_env_install}"
+		echo "${my_env}" | sed -e "s:^:export :" ) \
+	| sed -e "s:VAR_CASROOT:${S}:g" > env.sh || die
+	source env.sh
+
+	(	echo "PATH=${my_install_dir}/lin/bin"
+		echo "LDPATH=${my_install_dir}/lin/$(get_libdir)"
+		echo "${my_env}" | sed \
+			-e "s:VAR_CASROOT:${my_install_dir}/lin:g" \
+			-e "s:/Linux/lib/:/$(get_libdir)/:g" || die
+	) > 50${PN}
+
+	append-cxxflags "-fpermissive"
+
+	sed -e "/^AM_C_PROTOTYPES$/d" \
+		-e "s:\$qt/include:\$qt/include/qt4:g"\
+		-e "s:\$qt/lib:\$qt/$(get_libdir)/qt4:g"\
+		-i configure.* || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--prefix=${my_install_dir}/lin --exec-prefix=${my_install_dir}/lin \
+		--with-tcl="${EROOT}usr/$(get_libdir)" --with-tk="${EROOT}usr/$(get_libdir)" \
+		--with-freetype="${EROOT}usr" \
+		--with-ftgl="${EROOT}usr" \
+		$(usex freeimage "--with-freeimage=${EROOT}usr" "") \
+		$(usex gl2ps "--with-gl2ps=${EROOT}usr" "") \
+		$(usex qt4 "--with-qt=${EROOT}usr" "") \
+		$(usex tbb "--with-tbb-include=${EROOT}usr" "") \
+		$(usex tbb "--with-tbb-library=${EROOT}usr" "") \
+		$(use java && echo "--with-java-include=$(java-config -O)/include" || echo "--without-java-include") \
+		$(use_enable debug) \
+		$(use_enable !debug production)
+	#$(use_with freeimage) \
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	prune_libtool_files
+
+	# Symlinks for keeping original OpenCascade folder structure and
+	# add a link lib to $(get_libdir)  if we are e.g. on amd64 multilib
+	if [ "$(get_libdir)" != "lib" ]; then
+		dosym "$(get_libdir)" "${my_install_dir}/lin/lib"
+	fi
+
+	insinto /etc/env.d/${PN}
+	newins 50${PN} ${PV}
+
+	cd "${WORKDIR}"
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r data
+		doins -r samples
+	fi
+	dodoc doc/*.pdf
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/{overview,ReferenceDocumentation}
+	fi
+}
+
+pkg_postinst() {
+	eselect ${PN} set ${PV}
+	einfo
+	elog "After upgrading OpenCASCADE you may have to rebuild packages depending on it."
+	elog "You get a list by running \"equery depends sci-libs/opencascade\""
+	elog "revdep-rebuild does NOT suffice."
+	einfo
+}