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.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

7 files changed, 73 insertions, 91 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/Manifest b/media-gfx/freecad/Manifest
index b5bb4cce5226..013105402e94 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -25,17 +25,18 @@ AUX freecad-0.14.3702-install-paths.patch 1143 SHA256 3a16c5568f88e5a92a0b4d3c56
 DIST freecad-0.12.5284.tar.gz 48399004 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d SHA512 f1fee73ae7b43e7b3a136847f0dbb0b3f3e8f62ad3a9063f759efd8b9ed5a0dfff54961870465f37c0563161c4c5e2821f1f3379ead72dbdeddae36702e2ec0a WHIRLPOOL 7a46119d86a5d43ae8eaec6b5532e4739d54b0443769381630e644aa16c3f4185b63b513e4350c7562beacd86d56a7edbb3b506d10cb54190cbeaab48a504d5f
 DIST freecad-0.13.1830.tar.gz 70168706 SHA256 550ed16225e4cd67a463ae9b826f3a64edf7d2819cc8d235b15a89e10be72f13 SHA512 3e8d4eed8cace38da9615965f79a2b0da21d31a6df793ceaf3f732e0abd5666e9715ec9eb162e6ff998718e8d609a7dff2d0993b28f493200b734318a2322160 WHIRLPOOL 6d41565423edf8a0c67901a8559600ff1088f645c3ecb4aad8d7597490522f80d6475af3e7f5a623fc30b4d1571187bf6e6a132e6c480825798b957bea90bb83
 DIST freecad-0.14.3702.tar.gz 66927339 SHA256 ee24cf3542bfb1a887a12d2df52458bcc0e3e82679370c449b9d8b5b473b9dc9 SHA512 6333bc8256728084b492687c5c6a5b3356212cbcab4bf0beb95fcdb0f9ac7c49df8eee0275e83feadc7b2460cf2396e88b0b309cbc1e1c9d46375bcadb334c13 WHIRLPOOL eb7d22f255536d4fde5a182e5b59c63eb38a6d70ecf0b6a7abdf1d76c00c51492c517053d09eb56d5657d8cc3a49bad56e67e8965ce03d27982d36dcd1944982
-EBUILD freecad-0.12.5284-r4.ebuild 3713 SHA256 37dc7913965f3a0b686b70c1f66b47f248a188b3294ac5b892b8f13d98d91c71 SHA512 91efeaedc89df00c3d1495720915a46c63eb856ff343871a5dbe179d5e96e5d6f1326e4b101fb12d2386f93cbafa456ccc7157bd849822c7b8aead53c9ccc3b7 WHIRLPOOL 7722d4698937a98f75516352790bbd9efade325325152a0f74712d414fa8d38f6f5dba6670a12538185a81aa9b5fbc793fb7efa44531cec204aa597b9952bc0d
-EBUILD freecad-0.13.1830-r1.ebuild 4579 SHA256 e7f868a49d7ebfd09c7eb07c891c6b1687210fa4127e0c88d508b5eb7e1903b1 SHA512 a203876310601160ded148c0de98eb7445e8060736f238959998ab231ea7a1ccb7e1995fd86ef890f7f0ecf5a33f6559de9ce7038b3343bd9c148d9a5d60a317 WHIRLPOOL 3b7771c867b171112b79247da7ca844a04d6831dd165d5ab714d99324f5a4e1ebde3f75e10d8b3fd5c557e77530b8cb9f2fd61558783cefa54fddba3703269d0
-EBUILD freecad-0.14.3702-r1.ebuild 4058 SHA256 9ab5c5860b598a4cf362682582b3dc03336adf2efb0eb8924e793e7b2a02e36e SHA512 7cf2324b7272fe52ef4ff317b0f997e839d180d0bff04c2b09a84708e46af2a152e08b8f05be2505b482cc704a1161f1e2b89c658e9fdced54b2985f6525e728 WHIRLPOOL a5c41eded7788b52259972325fc659e0cd04030e9fa5206151d4da509976f707525508eef631a53de6eb2000eb2768a2326fce87fe5390c86780d6ec292bcdff
-EBUILD freecad-0.14.3702.ebuild 3945 SHA256 899d7b8a85fda14466a9a4fd83c143199facb2033d9d10bfd77bb93e987894cd SHA512 0eb30356cabc27193dda9ae0f663922cc85a88bef3886328056841204c1b64aef416cc2ebac9f59ee17d9303991de72e09de4d46d0d4feaf3277f5ca830e6f18 WHIRLPOOL 945b4f8308589a425a1b3d485eb0ad53c6e0b801f27387c24e42ad46086d95ea66b11a89916765f20545e8cc1c7bb66470a935aa9cf853aae75bb5a544fff9d3
-EBUILD freecad-9999.ebuild 3989 SHA256 d31b5450876aa95bbcd149995551b8009fc2cd33eb0090857192dd3ed5ea0cb1 SHA512 f63571656edaf66ab331391db9bebd0ebc0cef74bb20e9e5d383d14e8ba7ed4ccf360922c1e1f9cac022890a6ba1ee0c0695c73aa3ccd540c50920be62b4ccdc WHIRLPOOL bac47bfe8c8a460806da6c0c6ccee3fdcf5c8b4d2250cda2e8b351d5d5213b279651cbbebb977fc86ae0b1881af3cde9aa3f5b80e2080d00bd1c95b8398c9889
-MISC ChangeLog 5961 SHA256 89af8a68d1b0bb63397d7588523a02a4cf41341a5f02d947c02ad60e8dc2ecc3 SHA512 d3f74de5f40c5e50cfaf8ea113895091e2781231130086ebe82f1e3851d865aa45dd704860fca989453718a4a0f7d1233ecebe0bacb8438ad3670495f7efd4c2 WHIRLPOOL 40e1ccdef10e56a3efb1e0235c5193f42edff6f8190ed69f03bcc2fe2c500352220c8e94f1ede0df65c3e9ec5766572fd456ad11d411775266a8bf6441ceeb91
+DIST freecad-0.15.4671.tar.gz 93680347 SHA256 8dda8f355cb59866a55c9c6096f39a3ebc5347892284db4c305352cc9be03bbc SHA512 695081117b5511bbc0b7335b63a8760e164987a6dff2c5b0dc86b6b0a93bb7d7b83aa9f4fab1d66d7d2c917a42b0135af78553b463579873a1d1e52e3dd9aecb WHIRLPOOL 0c351ad9ee360dfd9af54af9cc348a6ba3d8c15b6743667f6943e41aa252cec9bd2149baa32fceeceac65660a9b629aefba3c80a5c3a84c45a8d502323547287
+EBUILD freecad-0.12.5284-r4.ebuild 3371 SHA256 e8d26fb422f036913be5d3257ba605c6d273c5dad65bf6b5d3a30bdb6ed36b97 SHA512 b6228d43ebc1ec61a83cc3d0d8b71a27c803cd5fbdea8022449436573a6c1d5f852b799d6def36d936d3e0e5eff8b4945e5bfc4de88cc7e559427e5e78dff0d6 WHIRLPOOL fbbe07b86ca31078763e180967be30d67bd8638d983eb3f56b1c9fc6fd0b61cd3546b760c770ceaa570f59f18230e3aa47ce9ab7f9b84ae7896e0946da3f48c5
+EBUILD freecad-0.13.1830-r1.ebuild 4364 SHA256 27303b856e0eef7f360f42701448b0326e59ff01c411e8199cc21ac52df2d67a SHA512 ceb002200b8850365a8992a2e4f17690db7e7f1909b9ec0cf9c8c7e63280b0ad01e9d0d5e2cb7fb0a699d3c3250f4f8e7ee5b6e74be89c275900d86152c13eac WHIRLPOOL ed229da5b4c1bc5ccd8f72a79d5a95c7a965c19c7ae8992b0dd59c298e68185a9fcb321077971c595a8fc7d896e1861cf1871daa504d6360b91a50e630160f27
+EBUILD freecad-0.14.3702-r1.ebuild 3969 SHA256 f19f8a90ebae8977c662c9f8d552ba6f6f1824d0d6bde3dfba5fef437671470a SHA512 5030d9ee755beb3691d833d316fa39d74e760256a13195620d2a036eb5de84d67672b2dff3da10ee710dda02a75a464f21294ba0c2dc87789cdb271f8aae9ff1 WHIRLPOOL 5e677941cd1c46c13b330e427536de9d991ebf6e15f4f0c6160968382afa333e3d7c7c536c1a3752cc6fa695bf311c925a0f2ed56874f626d9565a8379ba08f8
+EBUILD freecad-0.15.4671.ebuild 3622 SHA256 ed0665e1e65702572898f754e574ea94528dca1bd227d78db150224f3773f14b SHA512 77c8b42ce5bbe46c59dcddd5637ec8d0a4ce7165ee53160a4a08e36556fafa2e5f1d63a7e88fb9f6cf1e6ac4f77d4c7f6516eac76dafde3c4856bd83f6f02815 WHIRLPOOL 683f6ae4020dfc0acaf84ea2e1afbf70008155070a94425eb1d6a059371308207d392d25a3d783d1f4ff5619182001af535cd9f75d416d669bc4c318e62f572d
+EBUILD freecad-9999.ebuild 4040 SHA256 1cc688d21c9b2e333bb1a3a766048d650cc76bc6dd3c64c34147aa877dac384e SHA512 bccee0408b72c3b6feb8ef23cd0df6c547ad33b409fb755e45036ccf2e265b231a91bb159d468cc70b8e6e20d05f0b92194ad8d97dc789b5318447c24516a34e WHIRLPOOL c4dccfb2aa3fca6a08a8255602975a6259c183b2038c6e798404cd7df60f01aa0a1d838e80417fabfeb63fe7302bedb660abd09602b1f531f68f92d781b64ea7
+MISC ChangeLog 6406 SHA256 def699f87cf9df70d9ae008382ae9d6274db48eb06ff3de36caf4c27c78bcf07 SHA512 5ecb2527e3f08bb25a13ca47929ec2eb9104118a3ab9ef3babcb02ca7b266ccbc871342ff68b6457fc19b392ecb7aefe326a41f0f9f206ac73bd479091d40829 WHIRLPOOL ee966980adebf281f1ee2b5ff6a61c3d4dcce81741425b453c8eaff1cee49b7afba1917cbdceac16196751c3da4e102bcfa92562c7c9585dcd9580fef6517b74
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWu2+AACgkQknrdDGLu8JB/GAEAjIsTBoEG08O5uE4ltwWgHHJk
-u6GaDKkzoxEsdfcB9+8A/iwG+fyw8hNDWLwTKnhKxYDUt/njvTpL7yuEYT5v855F
-=f6Wm
+iF4EAREIAAYFAlWxXXkACgkQknrdDGLu8JCHzAD+Oy+7Ri+me2WcwFTaNt+zk5Lg
+ZO1wHEBADzl0uqE38b0A/RH/nlLYPvvZDNdquZcaeceutYWhlASibpUJNRRKJiRj
+=Bw4t
 -----END PGP SIGNATURE-----
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