Version bump and next try

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

6 files changed, 255 insertions, 15 deletions

diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 2bfaa45..2854723 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for media-gfx/freecad
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*freecad-0.12.5284 (05 Jan 2012)
+
+  05 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +freecad-0.12.5284.ebuild, +files/freecad-0.12.5284-gcc46.patch,
+  +files/freecad-0.12.5284-removeoldswig.patch,
+  +files/archive/FreeCAD-swig-2.0.4.patch:
+  Version bump and next try
+
   22 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   freecad-0.11.4422.ebuild:
   Add -fpermissive, unfortunately not enough
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index d722029..efbaa8b 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,29 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX archive/FreeCAD-swig-2.0.4.patch 479 RMD160 58ffbca7fa5aa2baf17b43f22d99f3acac011903 SHA1 78c0d46412b6c48267199d937b3a436eb58e7366 SHA256 7fd4a3f0471a35c5738c2dd4da6b8a680aaf95ac7691c90373c4f0a7c9220701
 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
 AUX freecad-0.11.4422-gcc46.patch 424 RMD160 1c88a1b7dccd92d9d906d7a01edf3a2bac3b34e3 SHA1 0df7252bd5d53946694bdb983e18067d5aa9a04e SHA256 ce452c6ab373f41f0a88c3f40966ba3f942aae097134ee18273b6ff22ed6f44b
+AUX freecad-0.12.5284-gcc46.patch 424 RMD160 1c88a1b7dccd92d9d906d7a01edf3a2bac3b34e3 SHA1 0df7252bd5d53946694bdb983e18067d5aa9a04e SHA256 ce452c6ab373f41f0a88c3f40966ba3f942aae097134ee18273b6ff22ed6f44b
+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
+DIST freecad-0.12.5284.tar.gz 48399004 RMD160 6f8175509091592b72c74584b3a3418391022317 SHA1 29f80b84c5405d5dc9ab988db2c2a41018b90b15 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d
 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
-MISC ChangeLog 1778 RMD160 9ed95c87d950964f973847d8c5f570d2fe15260e SHA1 9063d58813ad21be4e1514b03358486b1f5c547e SHA256 ed5d9e161ec501569e727f9f73a6966833461726d3c6873f6c8a8973e87d9068
+EBUILD freecad-0.12.5284.ebuild 2205 RMD160 433badc38fca417174f2f550537daea6605ec3f9 SHA1 13fd60916d60163f694f7bfcda2416a177667b6f SHA256 eb60d779f95280b37a478500b09d5ba04bdd22210c19973f82a27b2a68d9fda5
+MISC ChangeLog 2056 RMD160 9aace549d6379833f91d8cf1446ea3c2297704cb SHA1 934dde0e5d8263544dba113fe535116f7f3611b1 SHA256 60ed1b45fbc592adb9899d90fafb0948394ea04665218a596e8738a7c723eb5d
 MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOzDMmAAoJENwGBM22xffeCDEP/3LnXa3CGJeGYRAIzV9nWrx2
-DLC635Vuklzrw/CBMvt2iQRHv8quQ9AwLfXaDC2Oe3NSDfVfQfSc73MLQYGbHxwu
-34ghZ54J8fDmI30QpkMOkE+Tebgb3zruKKTsCSHv6qzzWPi12HVymrzyujGio0Iv
-hhMC1G8l6ocIfkjr27/4A4JAaKs4y78UX2tVVnGbB0BNmUuUHEVl1oC80uesnFPX
-FTcueYCB7Cu9DgvkLZmkWrpePrCBJwRiDfi8ujBbtYhnNAwxvRl4AUBtjeHZNizJ
-mwXsrfQbyCoUxDB1qOGrYJxjHlXjrh1XHXaiOQck7Ic12p8Vlw1fh9ByyGzz2z/4
-6s0xszz64tqMWnifhU+8X4z+JVM987V31vpzpKouPYqVl0lsDS7oZkjZiWiL3F/m
-XcVJTmTNhyMQCTnYqdbFtTqlo/q+xpiZj+VY06FCR02yjXvNR4Ml4K68Op2CCrza
-A/EcjA6BYMlzU4zApcWsCzc2R7pf6nax+uk/9inG3LmG/U/Rc86MbdyDJBPyrQ/I
-DJfB17E4InGeTviGnZg5ivyNb1xqcEKRewph65i4ItWPEj8tSRu9GvOeckdI7nMR
-Hx+LMuOdok4+rvAWFNwvXxrWYFpF19leUx+dxn704dDpIS5yxymQ2wSYhJxZJDEF
-SHaI5NLuaDmGUxUK3HuV
-=cvR6
+iQIcBAEBCgAGBQJPBhnwAAoJEEb+UGWnxTyHGNoQAJgZbWRDFxk7YjKfphhBJTCc
+HFt+9c6lU63mbFLtjsj806xlhCCkoQO9AMRmIOuDKGQc5eaFf8DxD66mzWzm/+gz
+8jZi8bP3p7jnwfHqvFJw58PvodNCHn64KMF9PqkvEvwPrmg5f+WPBJeEl+Hch2Dc
+Uv90BeIw/3UB3V31xpUg2wJrC6/z3FvPRLvtl2ZPZpYm6Gryf+rMc1AnyUNsz22C
+eNOqsuxbPgqTJGcUV0DEQug2c4tSrFHGWJbwb/yzpQu0iBizG3f/FfYlowwCTCCv
+WIIy+OmSQtUBxbUocfSqOjiddGCNN07Bv1AgpvXwoPK7/2UsbtcaWRc4h5KXo8BO
+731fiHeqYZ4Fp3mTm8fYNlmN7NNqSW41NpBud7hgQH0foRXrCfiHWBq1CPZth4hZ
+3q3dMULHiPcJOUjVDZldvL19LFBfTTObuTQzHBqlmtSGub6KZhgZ27IX4Go0mEpL
+DZusjuyQc+I9Hno2S6PuPNrc/dMyNSRX3GAvJBNbBb/jgIet/VPjzcNwFpX7m/eG
+ArMEvdnMcX34OP4je/jfkf9ZP9eTu7CHR2Rs8Hw2RUSYqx1Zn2ihQokcx4sbHMem
+sBE7jnz2HlMs2igtI6BnmGAeJAsC4cK8jqQQG0HmDz68f5iProrAwarpZrXQUaUL
+Vnh58hkj0ivEMz3YvMu5
+=8Cxo
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freecad/files/archive/FreeCAD-swig-2.0.4.patch b/media-gfx/freecad/files/archive/FreeCAD-swig-2.0.4.patch
new file mode 100644
index 0000000..7bd2e5d
--- /dev/null
+++ b/media-gfx/freecad/files/archive/FreeCAD-swig-2.0.4.patch
@@ -0,0 +1,11 @@
+--- src/Base/swigpyrun.inl.old	2010-08-27 16:24:16.000000000 +0200
++++ src/Base/swigpyrun.inl	2011-12-24 00:19:25.175628049 +0100
+@@ -32,7 +32,7 @@
+     if (!swig_type)

+         throw Base::Exception("Cannot find type information for requested type");

+     

+-    *ptr = SWIG_Python_NewPointerObj(obj,swig_type,own);

++    *ptr = SWIG_Python_NewPointerObj(NULL,obj,swig_type,own);

+     if (*ptr == 0)

+         throw Base::Exception("Cannot convert into requested type");

+ 

diff --git a/media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch b/media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch
new file mode 100644
index 0000000..df2fb19
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch
@@ -0,0 +1,11 @@
+diff -ruN FreeCAD-0.11.4422.orig/src/zipios++/directory.h FreeCAD-0.11.4422/src/zipios++/directory.h
+--- FreeCAD-0.11.4422.orig/src/zipios++/directory.h	2011-02-11 01:48:21.000000000 +0100
++++ FreeCAD-0.11.4422/src/zipios++/directory.h	2011-11-13 22:11:27.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include <string>

+ #include <ctime>

+ #include <stdexcept>

++#include <cstddef>

+ 

+ // #include <boost.h>  Contents of boost.h

+ 

diff --git a/media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch b/media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch
new file mode 100644
index 0000000..b768178
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch
@@ -0,0 +1,111 @@
+--- src/Base/Interpreter.cpp.old	2010-08-27 16:24:16.000000000 +0200
++++ src/Base/Interpreter.cpp	2011-12-24 00:13:52.356641021 +0100
+@@ -503,11 +503,6 @@
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))

+ namespace Swig_python { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }

+ #endif

+-namespace Swig_1_3_25 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }

+-namespace Swig_1_3_33 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }

+-namespace Swig_1_3_36 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }

+-namespace Swig_1_3_38 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }

+-namespace Swig_1_3_40 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }

+ 

+ PyObject* InterpreterSingleton::createSWIGPointerObj(const char* Module, const char* TypeName, void* Pointer, int own)

+ {

+@@ -517,21 +512,6 @@
+     int version = getSWIGVersionFromModule(Module);

+     switch (version&0xff)

+     {

+-    case 25:

+-        result = Swig_1_3_25::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);

+-        break;

+-    case 33:

+-        result = Swig_1_3_33::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);

+-        break;

+-    case 36:

+-        result = Swig_1_3_36::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);

+-        break;

+-    case 38:

+-        result = Swig_1_3_38::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);

+-        break;

+-    case 40:

+-        result = Swig_1_3_40::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);

+-        break;

+     default:

+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))

+     result = Swig_python::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);

+@@ -550,11 +530,6 @@
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))

+ namespace Swig_python { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }

+ #endif

+-namespace Swig_1_3_25 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }

+-namespace Swig_1_3_33 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }

+-namespace Swig_1_3_36 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }

+-namespace Swig_1_3_38 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }

+-namespace Swig_1_3_40 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }

+ 

+ bool InterpreterSingleton::convertSWIGPointerObj(const char* Module, const char* TypeName, PyObject* obj, void** ptr, int flags)

+ {

+@@ -563,21 +538,6 @@
+     int version = getSWIGVersionFromModule(Module);

+     switch (version&0xff)

+     {

+-    case 25:

+-        result = Swig_1_3_25::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);

+-        break;

+-    case 33:

+-        result = Swig_1_3_33::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);

+-        break;

+-    case 36:

+-        result = Swig_1_3_36::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);

+-        break;

+-    case 38:

+-        result = Swig_1_3_38::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);

+-        break;

+-    case 40:

+-        result = Swig_1_3_40::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);

+-        break;

+     default:

+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))

+         result = Swig_python::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);

+@@ -596,11 +556,6 @@
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))

+ namespace Swig_python { extern void cleanupSWIG_T(const char* TypeName); }

+ #endif

+-namespace Swig_1_3_25 { extern void cleanupSWIG_T(const char* TypeName); }

+-namespace Swig_1_3_33 { extern void cleanupSWIG_T(const char* TypeName); }

+-namespace Swig_1_3_36 { extern void cleanupSWIG_T(const char* TypeName); }

+-namespace Swig_1_3_38 { extern void cleanupSWIG_T(const char* TypeName); }

+-namespace Swig_1_3_40 { extern void cleanupSWIG_T(const char* TypeName); }

+ 

+ void InterpreterSingleton::cleanupSWIG(const char* TypeName)

+ {

+@@ -608,9 +563,4 @@
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))

+     Swig_python::cleanupSWIG_T(TypeName);

+ #endif

+-    Swig_1_3_25::cleanupSWIG_T(TypeName);

+-    Swig_1_3_33::cleanupSWIG_T(TypeName);

+-    Swig_1_3_36::cleanupSWIG_T(TypeName);

+-    Swig_1_3_38::cleanupSWIG_T(TypeName);

+-    Swig_1_3_40::cleanupSWIG_T(TypeName);

+ }

+--- src/Base/Makefile.am.old	2011-12-24 00:14:25.625540687 +0100
++++ src/Base/Makefile.am	2010-10-27 12:29:37.000000000 +0200
+@@ -65,16 +65,6 @@
+ 		Swap.cpp \
+ 		swigpyrun.inl \
+ 		swigpyrun.cpp \
+-		swigpyrun_1.3.25.cpp \
+-		swigpyrun_1.3.25.h \
+-		swigpyrun_1.3.33.cpp \
+-		swigpyrun_1.3.33.h \
+-		swigpyrun_1.3.36.cpp \
+-		swigpyrun_1.3.36.h \
+-		swigpyrun_1.3.38.cpp \
+-		swigpyrun_1.3.38.h \
+-		swigpyrun_1.3.40.cpp \
+-		swigpyrun_1.3.40.h \
+ 		TimeInfo.cpp \
+ 		Type.cpp \
+ 		Tools.cpp \
diff --git a/media-gfx/freecad/freecad-0.12.5284.ebuild b/media-gfx/freecad/freecad-0.12.5284.ebuild
new file mode 100644
index 0000000..c8354ff
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.12.5284.ebuild
@@ -0,0 +1,94 @@
+# 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 autotools flag-o-matic python
+
+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"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	base_src_prepare
+	append-cxxflags -fpermissive
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-qt4-include="${EPREFIX}"/usr/include/qt4 \
+		--with-qt4-bin="${EPREFIX}"//usr/bin \
+		--with-qt4-lib="${EPREFIX}"//usr/$(get_libdir)/qt4 \
+		--with-occ-include=${CASROOT}/inc \
+		--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
+
+	find "${D}" -name "*.la" -exec rm {} +
+
+	dodoc README.Linux ChangeLog.txt
+
+	dodir /usr/share/apps/freecad
+	mv "${D}/usr/share/freecad.xpm" "${D}/usr/share/apps/freecad/" || die
+
+	make_desktop_entry FreeCAD FreeCAD /usr/share/apps/freecad/freecad.xpm
+}