Version bump (bug 438466)

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

5 files changed, 226 insertions, 5 deletions

diff --git a/sci-libs/opencascade/ChangeLog b/sci-libs/opencascade/ChangeLog
index 75a01736705f..be71303c1d4d 100644
--- a/sci-libs/opencascade/ChangeLog
+++ b/sci-libs/opencascade/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2013/04/27 21:53:52 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/opencascade/ChangeLog,v 1.14 2013/06/24 19:16:11 xmw Exp $
+
+*opencascade-6.6.0 (24 Jun 2013)
+
+  24 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/opencascade-6.6.0-fixed-DESTDIR.patch, +opencascade-6.6.0.ebuild,
+  files/opencascade-6.5.4-fixed-DESTDIR.patch,
+  files/opencascade-6.5.4-fixed-tbb-VERSION.patch:
+  Version bump (bug 438466)
 
   27 Apr 2013; Michael Weber <xmw@gentoo.org> -opencascade-6.5.4.ebuild,
   opencascade-6.5.5.ebuild:
diff --git a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch
index b8312158223c..15a9fa607216 100644
--- a/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch
+++ b/sci-libs/opencascade/files/opencascade-6.5.4-fixed-DESTDIR.patch
@@ -1,5 +1,5 @@
---- Makefile.am.orig	2013-01-14 12:53:15.293322821 +0100
-+++ Makefile.am	2013-01-14 13:02:05.333309637 +0100
+--- opencascade-6.5.4/Makefile.am
++++ opencascade-6.5.4/Makefile.am
 @@ -82,27 +82,27 @@
  	cd $(top_builddir)/adm/make && $(MAKE) $(AM_MAKEFLAGS) Draw
  
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
index 2a245d2bdc46..88b13acd21c4 100644
--- 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
@@ -1,5 +1,5 @@
---- 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
+--- src/Standard/Standard_MMgrTBBalloc.cxx
++++ src/Standard/Standard_MMgrTBBalloc.cxx
 @@ -12,6 +12,7 @@
  
  // paralleling with Intel TBB
diff --git a/sci-libs/opencascade/files/opencascade-6.6.0-fixed-DESTDIR.patch b/sci-libs/opencascade/files/opencascade-6.6.0-fixed-DESTDIR.patch
new file mode 100644
index 000000000000..54143db4d491
--- /dev/null
+++ b/sci-libs/opencascade/files/opencascade-6.6.0-fixed-DESTDIR.patch
@@ -0,0 +1,45 @@
+--- opencascade-6.6.0/Makefile.am
++++ opencascade-6.6.0/Makefile.am
+@@ -82,27 +82,27 @@
+ 	cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) Draw
+ 
+ install-exec-local:
+-	$(INSTALL) -d $(prefix)/$(platform)
+-	if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
+-		cd $(prefix)/$(platform) && ln -s ../bin bin; \
++	$(INSTALL) -d $(DESTDIR)$(prefix)/$(platform)
++	if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \
++		cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \
+ 	fi
+-	if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
+-		cd $(prefix)/$(platform) && ln -s ../lib lib; \
++	if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \
++		cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \
+ 	fi
+-	buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \
++	buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \
+ 	if [ "$$installd" != "$$sourced" ]; then \
+-		$(INSTALL) -d $(prefix)/inc; \
+-		cp -frL $(top_srcdir)/inc $(prefix); \
+-		cp -frL $$buildd/config.h $(prefix); \
++		$(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
++		cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \
++		cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \
+ 		for d in  $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \
+-			$(INSTALL) -d $(prefix)/src/$$d; \
+-			cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \
++			$(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
++			cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
+ 		done; \
+ 	fi
+-	if [ -e $(prefix)/inc/config.h ]; then \
+-		rm -f $(prefix)/inc/config.h; \
++	if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
++		rm -f $(DESTDIR)$(prefix)/inc/config.h; \
+ 	fi
+-	cd $(prefix)/inc && ln -s ../config.h config.h
+-	cd $(top_srcdir) && cp *amk.sh $(prefix)
++	cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
++	cd $(top_srcdir) && cp *amk.sh $(DESTDIR)$(prefix)
+ 
+ .PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
diff --git a/sci-libs/opencascade/opencascade-6.6.0.ebuild b/sci-libs/opencascade/opencascade-6.6.0.ebuild
new file mode 100644
index 000000000000..bd96ed1c95aa
--- /dev/null
+++ b/sci-libs/opencascade/opencascade-6.6.0.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.6.0.ebuild,v 1.1 2013/06/24 19:16:11 xmw Exp $
+
+EAPI=5
+
+inherit autotools eutils check-reqs multilib java-pkg-opt-2 flag-o-matic versionator
+
+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$(delete_all_version_separators).tgz"
+
+LICENSE="Open-CASCADE-Technology-Public-License-6.6"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+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 )
+	java? ( >=virtual/jdk-0 )
+	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.6.0-fixed-DESTDIR.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/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
+		-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}
+
+	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
+}