[media-gfx/freecad] Resync with tree

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

3 files changed, 34 insertions, 20 deletions

diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 4ce9bb9..beb2af6 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  freecad-0.11.3729.ebuild:
+  Resync with tree
+
   04 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -freecad-0.10.3205.ebuild, freecad-0.11.3729.ebuild:
   Cleanup; added RESTRICT
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index adb48b4..187e6d2 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX freecad-0.10.3205-asneeded.patch 588 RMD160 27fadb74f9f123fd0cc0092b57ae55369867a75b SHA1 9a1477d66b69448ae2cc3e81b2004f5f318a9e77 SHA256 43a1cd392bd05010cfe216f0afd688c8150ca2bc168fd0f776b3dc1e797e6876
 AUX freecad-0.11.3729-asneeded.patch 588 RMD160 27fadb74f9f123fd0cc0092b57ae55369867a75b SHA1 9a1477d66b69448ae2cc3e81b2004f5f318a9e77 SHA256 43a1cd392bd05010cfe216f0afd688c8150ca2bc168fd0f776b3dc1e797e6876
 DIST freecad-0.11.3729.tar.gz 16229615 RMD160 ac056ace72758d83dddfd075205bfeb81020df70 SHA1 fb683989e1a53a9292cc12940c98c41505124512 SHA256 94dcf25e6ae2934d7d23555e22a558643225a9809d443c898f096b39a1853261
-EBUILD freecad-0.11.3729.ebuild 1756 RMD160 43669d8574a8b653f74f01bcfb42d7da70da3cef SHA1 95ed19c54aeb4dace6d816c1e623f140a08050a0 SHA256 450592ed89def34868ad5781aba010a4478e1ff73670156fcfa4263541bccb0c
-MISC ChangeLog 1316 RMD160 30d6f849106614264b5e422caafa6cff8b9bd50e SHA1 bf2d524cb1cf6154b9f321ba0042e9bd9c42bae3 SHA256 63e2b07cf73d1263263e7d5e41a7531174fde9c9c83c0c53265754604dc3b65e
+EBUILD freecad-0.11.3729.ebuild 2286 RMD160 29e5b96afd25efc3819d6d57c2bef70b26de0978 SHA1 1cb2c13e9b67d497d49020c7f3ac538b1ab7ade4 SHA256 f369c5b0b7fe515d1c37a9adac2c714586e14f4e0c369cdfb98953e14f100812
+MISC ChangeLog 1421 RMD160 fc61471054700078d04cbb2b9501181fe42f052f SHA1 3eaa2daab110f909cadc42fcb80eae6fcf77eb6c SHA256 91857baea9374d7aaeaa0879b77c5f2719d5f4ca3b5125c58fb9e9690fc760c3
 MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNcXqBAAoJENwGBM22xffezYAP/0GRd045MysfnhkyzWD3itSv
-7w6qFc7R1BEbYe3MTxKXUMN/lVFTTMmKa2WoZ9+PMW69XsZcIQ6176hW4qexqpRV
-+fl0IT3LlIM9+W5glU00WbZ4JvgluIpx3mQK/LtbFGmFK9l8Jq3DhsbwPKNgVAZ2
-dL2bw7105uyOCFR6Ori+VTwhJVj0Lxjkggy6FpLyPieZxeSf1FR6iLilvUDNJjoY
-2jmTi/bIka4wDZiWe42pJFDiDawBXl1H1L9DfJzvkaE3IRE7i43HLW8Fs70hwzrT
-tZJwlxoO2UeG8HbzBrtsNFC5NB2eDC7/qObIZcrOlATM2dLzirpuKQJVQVAiRIWR
-aJuGphx7BccVYfkU3C8FnZfdxFoChcNugMX1qelTUNHwhPczqGypjO5oHcYPx5b1
-q1lUK4KIHoY2KSgbzlyk6yt1FF5HiL50qg8VGQllpZE9eWmYsHf5FaJjzrIsOfqq
-fTw63syAz6kQN9AkyxoJu1Cs2cDXolDczJUPRkhugNNNhQpW3L1J6NtU+7p17A8Z
-0ztRayLknm6AjyV/bbtDmQ5ILODCxWWd19gWDOzoeqdNzzv/UdESa8skua74YnfF
-S7YkD2vaNBCVoY1B9aMyrzAY+1J6Zg5C4LCB1ll/RhdyY2j43hU/Ls0fNFEY/B7Q
-TNBql3qfk/xXfHEBwO2C
-=LBmd
+iQIcBAEBCgAGBQJNtaRkAAoJENwGBM22xffeRKYP/25Oozc8jaFUCzj3Rb6N7Gl3
+3KrdMO9dC+aSQxURdgHz8oTDCncZoQ2YT7tjGYVZ9MXyRFRgxWVbVTJ+zPdFECOe
+5yJSbqDX5fLzC6mfDR1Obj6RSh//tbGkPHQm7Ri3LUbaN5IoXUwSa0MY//HCO1S0
+KGhjtoRMuTL7bTasoh9Pc7/f56GuUMux0IEuHAQt7gKi3xT/02vBZ/mM4kC+ALdZ
+XruwnuXy/njLJeXJO6fsPezSDt/XU1VaILybRVwv8TgyeNQAs6uEIKxpX0aZLVgd
+qczMdMwn3V+jIqSCjdhzUVyXjDsIfreKgt4ZfJAfz2VHDTLynztiXaz3cT77PCea
+MesVLT/CvGhv60f5leA8z0gmT5ABHRgdm3PPZXNAKpspFzyxnA3UEMwK9Ar0pBpl
+9l9MJth4lcSi9VOiHzkgzgxEtBbLeaY4PEUU/Ms4UUibV87BLuL07romC6u/q/UB
+Oo8oft1cJD4wiTq3CbODDztmZ/ZzzuIzMeu568ez1fpZdWlcssh2EXtdOVB9X6GG
+J4mp8xGavvkgTnB3JuDtAcIcGZlKJnPOScT2A7rxIkUGBYpx3iOmte223C06EUUK
+XWkBYWxs40683D+G7Cnwbtwv1cQ+ziGGGVMi6YM/itW9MQWZIpjcrnEtwSrVFnKi
+xv0Hcw7rxBX+PyV49+WA
+=CT+I
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freecad/freecad-0.11.3729.ebuild b/media-gfx/freecad/freecad-0.11.3729.ebuild
index 8ca9263..fc5bb97 100644
--- a/media-gfx/freecad/freecad-0.11.3729.ebuild
+++ b/media-gfx/freecad/freecad-0.11.3729.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $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=3
 PYTHON_DEPEND=2
 
-inherit base eutils multilib autotools python
+inherit base eutils multilib autotools flag-o-matic python
 
 MY_P="freecad-${PV}"
 MY_PD="FreeCAD-${PV}"
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/boost
 	dev-libs/xerces-c
 	dev-python/pivy
-	dev-python/PyQt4
+	dev-python/PyQt4[svg]
 	media-libs/coin
 	media-libs/SoQt
 	>=sci-libs/opencascade-6.3-r3
@@ -59,7 +59,10 @@ src_prepare() {
 }
 
 src_configure() {
-	 econf \
+	append-cflags "-DBOOST_FILESYSTEM_VERSION=2"
+	append-cppflags "-DBOOST_FILESYSTEM_VERSION=2"
+	append-cxxflags "-DBOOST_FILESYSTEM_VERSION=2"
+	econf \
 		--with-qt4-include="${EPREFIX}"/usr/include/qt4 \
 		--with-qt4-bin="${EPREFIX}"//usr/bin \
 		--with-qt4-lib="${EPREFIX}"//usr/$(get_libdir)/qt4 \
@@ -67,6 +70,13 @@ src_configure() {
 		--with-occ-lib=${CASROOT}/lib
 }
 
+src_compile() {
+	# the build system is generating extremely odd errors on parallel build
+	# seem like moc is trying to process non-existing files, resulting in
+	# double namespace declarations Bla::Bla::Method in the moc_ files
+	MAKEOPTS="-j1" base_src_compile
+}
+
 src_install() {
 	emake  DESTDIR="${D}" install || die "install failed"