Unbundled pivy

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 7887F787)

3 files changed, 122 insertions, 13 deletions

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 7149d23..a13af71 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -7,6 +7,7 @@ AUX freecad-0.11.4422-gcc46.patch 424 RMD160 1c88a1b7dccd92d9d906d7a01edf3a2bac3
 AUX freecad-0.12.5284-gcc46.patch 424 RMD160 1c88a1b7dccd92d9d906d7a01edf3a2bac3b34e3 SHA1 0df7252bd5d53946694bdb983e18067d5aa9a04e SHA256 ce452c6ab373f41f0a88c3f40966ba3f942aae097134ee18273b6ff22ed6f44b
 AUX freecad-0.12.5284-glu.patch 441 RMD160 b72b8bb579b6d08c62abbc65d6ca727244241804 SHA1 f57286bc450f7267c6bc76e3e9b791e1394456e6 SHA256 7375de7bd4880070afd6c45ea7c9f5c2214b4f76f028ad89c1cd013883c802e0
 AUX freecad-0.12.5284-nodir.patch 776 RMD160 49cc0092e4cacefc9cd12c07239ba55bb1a47ec3 SHA1 6cb199641e299b455221dd9942735fc3edbff2f9 SHA256 9ce3f5897311c4b26678d432a9f725d5469eaff855de59d97cb1fd12e320bb3b
+AUX freecad-0.12.5284-nopivy.patch 751 RMD160 0864c7aba43f669496ae75ee29405d0fde33d58d SHA1 994dfc400fefbe4aae127bc001400a46a882e7bf SHA256 3424f2630cd739ecb5ddcd7824469c44d6e89c2fe97a9e123090d7b8d04dfcfd
 AUX freecad-0.12.5284-removeoldswig.patch 5165 RMD160 c157e9d72ede6ed96fc82b116b32dd2009ef10bf SHA1 48102dd88918f11b99b4e52df5ff72cde848833e SHA256 a5f44ac26071e1769c0686de30bbd2ca2a5fd03cb44222a1625f23c6f5ad6fc8
 DIST freecad-0.11.3729.tar.gz 16229615 RMD160 ac056ace72758d83dddfd075205bfeb81020df70 SHA1 fb683989e1a53a9292cc12940c98c41505124512 SHA256 94dcf25e6ae2934d7d23555e22a558643225a9809d443c898f096b39a1853261
 DIST freecad-0.11.4422.tar.gz 36392506 RMD160 3543b68b121ff8f3535604f0b6fde13411614d2f SHA1 2a36b0a18f7de5e6d67442f060727b7d033c55d9 SHA256 ab6bdc2d9e2628a7862f6ad013e8982dec7e8c87f77d1f26d1403e87a50caefa
@@ -14,23 +15,24 @@ DIST freecad-0.12.5284.tar.gz 48399004 RMD160 6f8175509091592b72c74584b3a3418391
 EBUILD freecad-0.11.3729.ebuild 2286 RMD160 29e5b96afd25efc3819d6d57c2bef70b26de0978 SHA1 1cb2c13e9b67d497d49020c7f3ac538b1ab7ade4 SHA256 f369c5b0b7fe515d1c37a9adac2c714586e14f4e0c369cdfb98953e14f100812
 EBUILD freecad-0.11.4422.ebuild 2133 RMD160 3a7f3dd7f1299e4b73234a383673255a27762d55 SHA1 d27054a8114dac8c33fb395fbe054eed632c67de SHA256 aed0689815f2ea8013a581c01c412c1082a20bea4699421556f4259802a35898
 EBUILD freecad-0.12.5284-r1.ebuild 1868 RMD160 1b6ebb271635c3d6725aed82939abb5b62fe49d6 SHA1 507b0faf1486fa9a529f21639805fd0096b57e25 SHA256 547c9e746a42d6289909503908464a2887d714495583a6b3efa5b404c0bb7c0f
+EBUILD freecad-0.12.5284-r2.ebuild 2027 RMD160 ab5943fb2b75153e422088d7f42e740da0264877 SHA1 2a4bb90a367c88c74e607f9b9f7e9953f05b87f6 SHA256 bf66d8450b8c2359caeefdfc9994053b8f477e22c86e2b0fa98cc964b1578754
 EBUILD freecad-0.12.5284.ebuild 2235 RMD160 91ebd8523d3d3ac4fe341f56b148b90916619a97 SHA1 431e327abd0f4e49e43cad723d28a7bcc683de0a SHA256 bec8da044eed9e9baccf08661a9eb608f1d1bf23ddfda5d2040804db9d2ea25a
 MISC ChangeLog 2432 RMD160 1e0ee628bd6f6e6a54bacb0042a077ddc885c4aa SHA1 377c7aae5069564c8b457130a82d247cb8fc46b6 SHA256 9ea4e54457f03119ac41048b063c9cea9619685bbe34dbc4e036b23377b10c7b
 MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPBwAtAAoJEEb+UGWnxTyHSNUQAIeoGJYbSYS5wXDWqAIuw08a
-zlq3lPlyhexbZgz/4IAxPywnap7Uxe7NcxZplcjv8p0YL7jTMsN3XFCLMtKVL1CC
-ayRH/o1fv/KszieHACf05eTZQuIYkBsG6yY9EtAS4F5DbhtsqtrPyWB0RF/zLWmq
-Db+AQi5ECuT+D6siCj3zQxwEeTKOhAZ7bb/maRJ2Jah1gW0QpRbQ/5/ABkjmFwXW
-lLqrT2L2KtwdycC68vhxu6G+kp/I0s8V6Rww6X7Tw5VrioQ7wORDGlAuhA82yk7i
-y2hP4f/GDteUmQKp9iag4v8QnNlXRp/3cH1UmgyXeURl1+zCxA3wW75kMID7Mpms
-tq/O22nUYQLShZAY19Inq6F8xi37uscDDiwGpAhEYqqRERbHhRHcbdoNmuR4T5k6
-uUf8F93dBXYkWmg/MlmfcopjgutApcwoTdXhrLettuVC19S4q+xWPeVpmxs/Qy9d
-51t0Kouz6aoPxanydZgcV+JRsyNrgj0wbHqciFI/UHexg+m79PcxKqoFhYxDPJDB
-iD4EinJcFb6Ro+zzUUF031Z18u2g3yokMwnFfq50B2AGO3M+WFGZlwlJuOqxeurz
-/CbTzq0cT4WZ49CSFSVb7gius/kwjrHooczl2Ac5ICEWGzG0NiaFoWU0BbXNgKtj
-baKTFbwtQ5VpGJUi48qB
-=wvGQ
+iQIcBAEBCgAGBQJPCGZ+AAoJEEb+UGWnxTyHLw8P+QE66RBITl+iNBrtK3FUUPqv
+WOtnj9R6vaOpHFlgdFEtMpO1Lpnkao+GbMCv6r/CEHkWr3m+CUdpFxXP4K4xF8dR
+a+dIIn1NTQunjQmbXpOlhwT0bYPXJxA2wCaT7neIAxCuuwcfmm9rBB88+IFboCxk
+XrXByjiHesjkRUSlLGpDViwR8+Rv3O65/9z1NcvnujQnku1vo6OsnF+QW7oGbVXj
++OBFNiekaX9y1wDeAKG/2lA2qI49FVOLom7uyggn3xEjctPhxF4DSyjPySqUMR5f
+Z0RBzVZqorjFW++kiVjMi0LartIIYpXbNyrTwUwUy97noAAulfGFwE7iKiz9WLG1
+7iYdGtqTgzkm6BVdJwqDIma+9hh8QVsOBCfbg2KIrHUhyth8AJauBd8Vi+SPWUmc
+HQ4ArxuEgRgiX8/MbtqUwY8wkgBI8h0YOqmJYC8Nscm6ukCeKkHulshi1ZTuL5Xf
+RBGYbn+JPNPb/qh8b+KROIsZ4JTw1+o27SmbhYuOxiTTtr3oZ326RUVjsB8wxweM
+ZeJ3Eenn8W8F7KTLDatph39Hp5OOUbhF0ESayipMDqx6wKrgtwIBH3qN1b0vkRAn
++iC8HBY2vrZPIPxoymh+vmG4Mz5P1KuAro5NQ+up1WrawpRNaiX/I36ytiivHWDu
+mAslq8fhKavdpQsutX2q
+=qKDg
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch b/media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch
new file mode 100644
index 0000000..337348a
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch
@@ -0,0 +1,17 @@
+diff -ruN FreeCAD-0.12.5284.orig/src/3rdParty/CMakeLists.txt FreeCAD-0.12.5284/src/3rdParty/CMakeLists.txt
+--- FreeCAD-0.12.5284.orig/src/3rdParty/CMakeLists.txt	2012-01-03 13:30:19.000000000 +0100
++++ FreeCAD-0.12.5284/src/3rdParty/CMakeLists.txt	2012-01-07 15:57:52.000000000 +0100
+@@ -19,13 +19,6 @@
+ #   add_subdirectory(Pivy)
+ #endif(MINGW)
+ # applies for Unix, MinGW and Windows with custom LibPack
+-elseif(FREECAD_BUILD_GUI)
+-    find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
+-    if (COIN_VERSION3)
+-    add_subdirectory(Pivy-0.5)
+-    else (COIN_VERSION3)
+-    add_subdirectory(Pivy)
+-    endif(COIN_VERSION3)
+ endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
+ 
+ # For Windows we have all stuff in the LibPack
diff --git a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild b/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
new file mode 100644
index 0000000..4116f8f
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.11.3729.ebuild,v 1.3 2011/04/10 20:59:13 dilfridge Exp $
+
+EAPI=4
+PYTHON_DEPEND=2
+
+inherit base eutils multilib flag-o-matic python cmake-utils
+
+MY_P="freecad-${PV}"
+MY_PD="FreeCAD-${PV}"
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="http://sourceforge.net/apps/mediawiki/free-cad/"
+SRC_URI="mirror://sourceforge/free-cad/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-games/ode
+	dev-libs/boost
+	dev-libs/libf2c
+	dev-libs/xerces-c
+	dev-python/pivy
+	dev-python/PyQt4[svg]
+	media-libs/coin
+	media-libs/SoQt
+	>=sci-libs/opencascade-6.3-r3
+	sci-libs/gts
+	sys-devel/gcc[fortran]
+	sys-libs/zlib
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-webkit:4
+	x11-libs/qt-xmlpatterns:4
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2.0.4-r1
+"
+
+RESTRICT="bindist mirror"
+# http://bugs.gentoo.org/show_bug.cgi?id=352435
+# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+
+S="${WORKDIR}/${MY_PD}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc46.patch"
+	"${FILESDIR}/${P}-removeoldswig.patch"
+	"${FILESDIR}/${P}-glu.patch"
+	"${FILESDIR}/${P}-nodir.patch"
+	"${FILESDIR}/${P}-nopivy.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	base_src_prepare
+	append-cxxflags -fpermissive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOCC_INCLUDE_DIR=${CASROOT}/inc
+		-DOCC_INCLUDE_PATH=${CASROOT}/inc
+		-DOCC_LIBRARY=${CASROOT}/lib/libTKernel.so
+		-DOCC_LIBRARY_DIR=${CASROOT}/lib
+		-DOCC_LIB_PATH=${CASROOT}/lib
+		-DCOIN3D_INCLUDE_DIR=/usr/include/coin
+		-DCOIN3D_LIBRARY=/usr/$(get_libdir)/libCoin.so
+		-DSOQT_LIBRARY=/usr/$(get_libdir)/libSoQt.so
+		-DSOQT_INCLUDE_PATH=/usr/include/coin
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	find "${D}" -name "*.la" -exec rm {} +
+
+	dodoc README.Linux ChangeLog.txt
+}