diff options
| -rw-r--r-- | sci-misc/freecad/ChangeLog | 3 | ||||
| -rw-r--r-- | sci-misc/freecad/Manifest | 12 | ||||
| -rw-r--r-- | sci-misc/freecad/freecad-0.9.2646.ebuild | 20 |
3 files changed, 22 insertions, 13 deletions
diff --git a/sci-misc/freecad/ChangeLog b/sci-misc/freecad/ChangeLog index 0bea15cbb..4dffbaa80 100644 --- a/sci-misc/freecad/ChangeLog +++ b/sci-misc/freecad/ChangeLog @@ -6,6 +6,9 @@ +metadata.xml: Change builder from root to Roelof Wobben + 29 Jun 2010; Justin Lecher <jlec@gentoo.org> freecad-0.9.2646.ebuild: + Python ABI fixes + 30 Mar 2010; Justin Lecher <jlec@gentoo.org> freecad-0.9.2646.ebuild: Changed DEPEND of media-libs/SoQt from 1.4.2_alpha4181 to 1.4.2_alpha1841 diff --git a/sci-misc/freecad/Manifest b/sci-misc/freecad/Manifest index 1711a0604..3c71d9cb4 100644 --- a/sci-misc/freecad/Manifest +++ b/sci-misc/freecad/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST FreeCAD-0.9.2646-2.tar.gz 6991727 RMD160 8166f2b6890cac6e593f5fd3adfab9d3d5590dfa SHA1 fec115fe28a797cd4dca120f5a68e8afb1cc8853 SHA256 7cb3b3ea76b939abe65994ef873aa946cc59431fb35ecd046f929c66364d7a22 -EBUILD freecad-0.9.2646.ebuild 962 RMD160 e2c392e5760b7056e23ad5be829455eaf28c25b5 SHA1 16dee57749559685375a1298567e4e617029ddbb SHA256 edb5253c055fd571b272f3668003723ea32c30e2ec367743a17b0afcfe236d9d -MISC ChangeLog 805 RMD160 dd8f06d3dd8f120358a48383ba43a11980e9676f SHA1 f0a1e295fcab5570538bf5f1f1c0ca579c9c8e55 SHA256 5ea8b9b18faa797378fd61fc4568c8e277857be47e3fc5eb64f892d1c72c1b6b +EBUILD freecad-0.9.2646.ebuild 1060 RMD160 0903c297198a3b3e883e14377d14b0458cce9153 SHA1 8b285836de9eff8ee3d6bb2e142dedc271ce0897 SHA256 ac94ccfe34a4657ea89f7a6802fe664143feca80a7084efa31217bfa1f9d7229 +MISC ChangeLog 897 RMD160 9a7026843b5202eee48de9c08cf27e10b498cc20 SHA1 5fd7161e58ee7518cfbcc0f549d454739b597329 SHA256 590cbd1a867320c63391e6c4642bb91d0e2bda8796fbd0b4e86acd5211ec2961 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkuxpFAACgkQgAnW8HDreRY2kQCdGd7SKW+bRVWHe4EU/6U9j18i -AgMAoLFIDIL03vK/NZ2kf2tJ4uZAfvND -=bvVr +iEYEARECAAYFAkwqS7AACgkQgAnW8HDreRaxvgCcC6jVqQBsY+h5GJPF9ZeuLPUQ +Z58AmgJdIFiafhz8DaMMHcRLiPPT6Q0u +=Z7Z5 -----END PGP SIGNATURE----- diff --git a/sci-misc/freecad/freecad-0.9.2646.ebuild b/sci-misc/freecad/freecad-0.9.2646.ebuild index 1407fca79..62c279221 100644 --- a/sci-misc/freecad/freecad-0.9.2646.ebuild +++ b/sci-misc/freecad/freecad-0.9.2646.ebuild @@ -2,9 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI="3" -inherit multilib +PYTHON_DEPEND="2" + +inherit multilib python MY_P="FreeCAD-${PV}" @@ -17,7 +19,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-lang/python +RDEPEND=" sci-libs/opencascade x11-libs/qt-gui:4 x11-libs/qt-svg:4 @@ -29,16 +31,20 @@ RDEPEND="dev-lang/python dev-python/PyQt4 dev-libs/xerces-c =media-libs/SoQt-1.4.2_alpha1841" - DEPEND="${RDEPEND} dev-lang/swig" S="${WORKDIR}/${MY_P}" +pkg_setup() { + python_set_active_version 2 +} + src_configure () { - econf --with-qt4-include=/usr/include/qt4 \ - --with-qt4-bin=/usr/bin \ - --with-qt4-lib=/usr/$(get_libdir)/qt4 + econf \ + --with-qt4-include="${EPREFIX}"/usr/include/qt4 \ + --with-qt4-bin="${EPREFIX}"//usr/bin \ + --with-qt4-lib="${EPREFIX}"//usr/$(get_libdir)/qt4 } src_install () { |