Version bump (thanks Priit Laes for the cleanups, bug 546786), update live build, just use CASROOT from environment (as set by eselect opencascade), RDEPEND on tested version of opencascade.

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

6 files changed, 63 insertions, 82 deletions

diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 2390e1f75372..0b762d51b118 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/freecad
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.27 2015/07/21 23:55:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.28 2015/07/23 21:32:39 xmw Exp $
+
+*freecad-0.15.4671 (23 Jul 2015)
+
+  23 Jul 2015; Michael Weber <xmw@gentoo.org> +freecad-0.15.4671.ebuild,
+  -freecad-0.14.3702.ebuild, freecad-0.12.5284-r4.ebuild,
+  freecad-0.13.1830-r1.ebuild, freecad-0.14.3702-r1.ebuild, freecad-9999.ebuild:
+  Version bump (thanks  Priit Laes for the cleanups, bug 546786), update live
+  build, just use CASROOT from environment (as set by eselect opencascade),
+  RDEPEND on tested version of opencascade.
 
   21 Jul 2015; Michael Weber <xmw@gentoo.org> freecad-9999.ebuild:
   Update EGIT_REPO_URI to github, fix README installation (thanks Fabian Kislat
diff --git a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
index 8f5f7ec0962e..7ca85f24176a 100644
--- a/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
+++ b/media-gfx/freecad/freecad-0.12.5284-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r4.ebuild,v 1.1 2014/04/23 22:49:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r4.ebuild,v 1.2 2015/07/23 21:32:39 xmw Exp $
 
 EAPI=5
 
@@ -34,7 +34,8 @@ RDEPEND="dev-cpp/eigen:3
 	media-libs/SoQt
 	media-libs/coin[doc]
 	sci-libs/gts
-	sci-libs/opencascade
+	>=sci-libs/opencascade-6.5.5
+	<sci-libs/opencascade-6.8.0
 	sys-libs/zlib
 	virtual/glu"
 DEPEND="${RDEPEND}
@@ -49,6 +50,8 @@ S="${WORKDIR}/FreeCAD-${PV}"
 pkg_setup() {
 	fortran-2_pkg_setup
 	python_set_active_version 2
+	
+	[ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade set or define otherwise"
 }
 
 src_prepare() {
@@ -66,14 +69,10 @@ src_prepare() {
 		"${FILESDIR}"/${P}-boost148.patch \
 		"${FILESDIR}"/${P}-nopivy.patch \
 		"${FILESDIR}"/${P}-no-permissive.patch \
-		"${FILESDIR}"/${P}-cmake-2.8.12.patch
-
-	local my_cas_version=$(eselect opencascade show 2>/dev/null || echo 6.5)
-	if [ "${my_cas_version}" \> "6.5.0" ] ; then
-		epatch  "${FILESDIR}"/${P}-occ-6.5.5.patch
-		epatch  "${FILESDIR}"/${P}-salomesmesh-occ-6.5.5.patch
-		epatch  "${FILESDIR}"/${P}-occ-6.6.patch
-	fi
+		"${FILESDIR}"/${P}-cmake-2.8.12.patch \
+		"${FILESDIR}"/${P}-occ-6.5.5.patch \
+		"${FILESDIR}"/${P}-salomesmesh-occ-6.5.5.patch \
+		"${FILESDIR}"/${P}-occ-6.6.patch
 
 	local my_coin_version=$(best_version media-libs/coin)
 	local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html
@@ -82,18 +81,9 @@ src_prepare() {
 
 	sed -e '/FREECAD_BUILD_FEM/s: ON): OFF):' \
 		-i CMakeLists.txt || die
-	#sed -e '/add_subdirectory(Fem)/d' \
-	#	-e '/add_subdirectory(MeshPart)/d' \
-	#	-i src/Mod/CMakeLists.txt || die
 }
 
 src_configure() {
-	local my_occ_env=${EROOT}etc/env.d/50opencascade
-	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
-		my_occ_env=${EROOT}etc/env.d/51opencascade
-	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
-
 	local mycmakeargs=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
 		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
index f423b76120b2..b64db3f2d769 100644
--- a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.5 2015/04/08 17:58:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.6 2015/07/23 21:32:39 xmw Exp $
 
 EAPI=5
 
@@ -33,7 +33,8 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	media-libs/SoQt
 	media-libs/coin[doc]
 	sci-libs/gts
-	sci-libs/opencascade
+	>=sci-libs/opencascade-6.5.5
+	<sci-libs/opencascade-6.8.0
 	sys-libs/zlib
 	virtual/glu
 	${PYTHON_DEPS}"
@@ -59,6 +60,8 @@ RESTRICT="bindist mirror"
 pkg_setup() {
 	fortran-2_pkg_setup
 	python-single-r1_pkg_setup
+
+	[ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade set or define otherwise"
 }
 
 src_prepare() {
@@ -75,11 +78,8 @@ src_prepare() {
 	# and also because the same module has been removed upstream (commit c0e2c9)
 	epatch "${FILESDIR}"/${P}-no-machdist.patch
 
-	local my_cas_version=$(eselect opencascade show 2>/dev/null || echo 6.5)
-	if [ "${my_cas_version}" \> "6.5.0" ] ; then
-		epatch  "${FILESDIR}"/${PN}-0.12.5284-occ-6.6.patch
-		epatch  "${FILESDIR}"/${P}-occ-6.7.patch
-	fi
+	epatch  "${FILESDIR}"/${PN}-0.12.5284-occ-6.6.patch
+	epatch  "${FILESDIR}"/${P}-occ-6.7.patch
 
 	einfo "Patching cMake/FindCoin3DDoc.cmake ..."
 	local my_coin_version=$(best_version media-libs/coin)
@@ -89,12 +89,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local my_occ_env=${EROOT}etc/env.d/50opencascade
-	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
-		my_occ_env=${EROOT}etc/env.d/51opencascade
-	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
-
 	local mycmakeargs=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
 		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
diff --git a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
index 7f2f4d3db7c6..f22c0a116637 100644
--- a/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
+++ b/media-gfx/freecad/freecad-0.14.3702-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild,v 1.5 2015/04/08 17:58:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild,v 1.6 2015/07/23 21:32:39 xmw Exp $
 
 EAPI=5
 
@@ -35,7 +35,8 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	media-libs/coin[doc]
 	net-libs/ptlib
 	sci-libs/gts
-	sci-libs/opencascade
+	>=sci-libs/opencascade-6.5.5
+	<sci-libs/opencascade-6.8.0
 	sys-libs/zlib
 	virtual/glu
 	${PYTHON_DEPS}"
@@ -60,6 +61,8 @@ RESTRICT="bindist mirror"
 pkg_setup() {
 	fortran-2_pkg_setup
 	python-single-r1_pkg_setup
+
+	[ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade set or define otherwise"
 }
 
 src_prepare() {
@@ -80,12 +83,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local my_occ_env=${EROOT}etc/env.d/50opencascade
-	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
-		my_occ_env=${EROOT}etc/env.d/51opencascade
-	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
-
 	local mycmakeargs=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
 		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
diff --git a/media-gfx/freecad/freecad-0.14.3702.ebuild b/media-gfx/freecad/freecad-0.15.4671.ebuild
index 88b6247d0ac0..944d8935476b 100644
--- a/media-gfx/freecad/freecad-0.14.3702.ebuild
+++ b/media-gfx/freecad/freecad-0.15.4671.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702.ebuild,v 1.3 2015/04/08 17:58:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.15.4671.ebuild,v 1.1 2015/07/23 21:32:39 xmw Exp $
 
 EAPI=5
 
@@ -10,42 +10,37 @@ inherit cmake-utils eutils fortran-2 multilib python-single-r1
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="http://www.freecadweb.org/"
-SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/free-cad/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-cpp/eigen:3
-	dev-games/ode
 	dev-libs/boost
-	dev-libs/libf2c
-	dev-libs/libspnav[X]
 	dev-libs/xerces-c[icu]
 	dev-python/matplotlib
+	dev-python/pyside[X]
+	dev-python/pyside-tools
 	dev-python/shiboken
 	dev-qt/designer:4
 	dev-qt/qtgui:4
 	dev-qt/qtopengl:4
 	dev-qt/qtsvg:4
 	dev-qt/qtwebkit:4
-	media-libs/SoQt
-	media-libs/coin[doc]
-	net-libs/ptlib
-	sci-libs/gts
-	sci-libs/opencascade
+	media-libs/coin
+	>=sci-libs/opencascade-6.5.5
+	<sci-libs/opencascade-6.9.0
 	sys-libs/zlib
 	virtual/glu
 	${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
 	dev-qt/assistant:4
-	dev-python/pycollada
 	dev-python/pivy
-	dev-python/PyQt4[svg]
-	dev-python/pyopencl
 	dev-python/numpy"
 DEPEND="${COMMON_DEPEND}
+	dev-python/pyside-tools
 	>=dev-lang/swig-2.0.4-r1:0"
 
 # http://bugs.gentoo.org/show_bug.cgi?id=352435
@@ -60,28 +55,23 @@ RESTRICT="bindist mirror"
 pkg_setup() {
 	fortran-2_pkg_setup
 	python-single-r1_pkg_setup
+
+	[ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade set or define otherwise"
 }
 
 src_prepare() {
 	einfo remove bundled libs
 	rm -rf src/3rdParty/{boost,Pivy*}
 
-	epatch "${FILESDIR}"/${P}-install-paths.patch
+	epatch "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+
+	#bug 518996
+	sed -e "/LibDir = /s:'lib':'"$(get_libdir)"':g" \
+		-i src/App/FreeCADInit.py || die
 
-	einfo "Patching cMake/FindCoin3DDoc.cmake ..."
-	local my_coin_version=$(best_version media-libs/coin)
-	local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html
-	sed -e "s:/usr/share/doc/libcoin60-doc/html:${my_coin_path}:" \
-		-i cMake/FindCoin3DDoc.cmake || die
 }
 
 src_configure() {
-	local my_occ_env=${EROOT}etc/env.d/50opencascade
-	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
-		my_occ_env=${EROOT}etc/env.d/51opencascade
-	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
-
 	local mycmakeargs=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/inc
 		-DOCC_INCLUDE_PATH="${CASROOT}"/inc
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index f9dddb6188e9..35c92eabb4f1 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild,v 1.7 2015/07/21 23:55:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild,v 1.8 2015/07/23 21:32:39 xmw Exp $
 
 EAPI=5
 
@@ -17,14 +17,13 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
+# sci-libs/opencascade ok: failed: 6.9.0
 COMMON_DEPEND="dev-cpp/eigen:3
-	dev-games/ode
 	dev-libs/boost
-	dev-libs/libf2c
-	dev-libs/libspnav[X]
 	dev-libs/xerces-c[icu]
 	dev-python/matplotlib
-	dev-python/pyside
+	dev-python/pyside[X]
+	dev-python/pyside-tools
 	dev-python/shiboken
 	dev-qt/designer:4
 	dev-qt/qtgui:4
@@ -35,17 +34,17 @@ COMMON_DEPEND="dev-cpp/eigen:3
 	media-libs/coin[doc]
 	net-libs/ptlib
 	sci-libs/gts
-	sci-libs/opencascade
+	>=sci-libs/opencascade-6.5.5
+	<sci-libs/opencascade-6.9.0
 	sys-libs/zlib
 	virtual/glu
 	${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
 	dev-qt/assistant:4
-	dev-python/pycollada
 	dev-python/pivy
-	dev-python/pyopencl
 	dev-python/numpy"
 DEPEND="${COMMON_DEPEND}
+	dev-python/pyside-tools
 	>=dev-lang/swig-2.0.4-r1:0"
 
 # http://bugs.gentoo.org/show_bug.cgi?id=352435
@@ -60,21 +59,20 @@ RESTRICT="bindist mirror"
 pkg_setup() {
 	fortran-2_pkg_setup
 	python-single-r1_pkg_setup
+
+	[ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade set or define otherwise"
 }
 
 src_prepare() {
 	einfo remove bundled libs
 	rm -rf src/3rdParty/{boost,Pivy*}
 
+	epatch "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+
 	#bug 518996
 	sed -e "/LibDir = /s:'lib':'"$(get_libdir)"':g" \
 		-i src/App/FreeCADInit.py || die
 
-	einfo "Patching cMake/FindCoin3DDoc.cmake ..."
-	local my_coin_version=$(best_version media-libs/coin)
-	local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html
-	sed -e "s:/usr/share/doc/libcoin60-doc/html:${my_coin_path}:" \
-		-i cMake/FindCoin3DDoc.cmake || die
 }
 
 src_configure() {
@@ -82,7 +80,10 @@ src_configure() {
 	if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then
 		my_occ_env=${EROOT}etc/env.d/51opencascade
 	fi
-	export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env)
+	export CASROOT=$(awk -F '=' '$1 == "CASROOT" {print $2}' $my_occ_env)
+	#my_occ_ver=$(echo $CASROOT |
+	#	awk '{print gensub(".*opencascade-([0-9.]*).*","\\1","$0")}')
+	# or just $(eselect opencascade show)
 
 	local mycmakeargs=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/inc