xmw 14/04/23 22:49:07 Modified: freecad-0.12.5284-r3.ebuild ChangeLog Added: freecad-0.12.5284-r4.ebuild Log: Revbump to address cmake update (bug 493666), opencascade-6.6 changes (bug 474794) and fix eselect module invocation (bug 468696). Thanks to Fabio Rossi, Juergen Rose, Bob Johnson and others. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Revision Changes Path 1.2 media-gfx/freecad/freecad-0.12.5284-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r3.ebuild?r1=1.1&r2=1.2 Index: freecad-0.12.5284-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freecad-0.12.5284-r3.ebuild 27 Apr 2013 22:49:15 -0000 1.1 +++ freecad-0.12.5284-r3.ebuild 23 Apr 2014 22:49:07 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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-r3.ebuild,v 1.1 2013/04/27 22:49:15 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r3.ebuild,v 1.2 2014/04/23 22:49:07 xmw Exp $ EAPI=5 @@ -66,7 +66,7 @@ "${FILESDIR}"/${P}-nopivy.patch \ "${FILESDIR}"/${P}-no-permissive.patch - local my_cas_version=$(eselect opencascadee show 2>/dev/null || echo 6.5) + 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 1.17 media-gfx/freecad/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/ChangeLog?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/ChangeLog?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/ChangeLog?r1=1.16&r2=1.17 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 9 May 2013 08:36:38 -0000 1.16 +++ ChangeLog 23 Apr 2014 22:49:07 -0000 1.17 @@ -1,6 +1,16 @@ # ChangeLog for media-gfx/freecad -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.16 2013/05/09 08:36:38 xmw Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.17 2014/04/23 22:49:07 xmw Exp $ + +*freecad-0.12.5284-r4 (23 Apr 2014) + + 23 Apr 2014; Michael Weber <[email protected]> + +files/freecad-0.12.5284-cmake-2.8.12.patch, + +files/freecad-0.12.5284-occ-6.6.patch, +freecad-0.12.5284-r4.ebuild, + freecad-0.12.5284-r3.ebuild: + Revbump to address cmake update (bug 493666), opencascade-6.6 changes (bug + 474794) and fix eselect module invocation (bug 468696). Thanks to Fabio Rossi, + Juergen Rose, Bob Johnson and others. 09 May 2013; Michael Weber <[email protected]> freecad-0.13.1830.ebuild: Fix S (thanks Alessio De Marchi, bug 469064) 1.1 media-gfx/freecad/freecad-0.12.5284-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r4.ebuild?rev=1.1&content-type=text/plain Index: freecad-0.12.5284-r4.ebuild =================================================================== # Copyright 1999-2014 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 $ EAPI=5 PYTHON_DEPEND=2 inherit eutils multilib fortran-2 python cmake-utils DESCRIPTION="QT based Computer Aided Design application" HOMEPAGE="http://sourceforge.net/apps/mediawiki/free-cad/"; SRC_URI="mirror://sourceforge/free-cad/${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/libspnav[X] dev-libs/xerces-c[icu] dev-python/PyQt4[svg] dev-python/pivy dev-qt/designer:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 media-libs/SoQt media-libs/coin[doc] sci-libs/gts sci-libs/opencascade sys-libs/zlib virtual/glu" DEPEND="${RDEPEND} >=dev-lang/swig-2.0.4-r1:0" # http://bugs.gentoo.org/show_bug.cgi?id=352435 # http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt RESTRICT="bindist mirror" S="${WORKDIR}/FreeCAD-${PV}" pkg_setup() { fortran-2_pkg_setup python_set_active_version 2 } src_prepare() { einfo remove bundled libs rm -rf src/3rdParty/{Pivy{,-0.5},boost} einfo cleanup build system find . -name "configure*" -print -delete epatch \ "${FILESDIR}"/${P}-gcc46.patch \ "${FILESDIR}"/${P}-removeoldswig.patch \ "${FILESDIR}"/${P}-glu.patch \ "${FILESDIR}"/${P}-nodir.patch \ "${FILESDIR}"/${P}-qt3support.patch \ "${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 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 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 -DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so -DOCC_LIBRARY_DIR="${CASROOT}"/lib -DOCC_LIB_PATH="${CASROOT}"/lib -DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin -DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so -DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so -DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin -DCMAKE_INSTALL_PREFIX="${EROOT}"usr/$(get_libdir)/${P} ) cmake-utils_src_configure ewarn "${P} will be built against opencascade version ${CASROOT}" } src_install() { cmake-utils_src_install insinto /usr/$(get_libdir)/${P}/Mod/Start doins -r src/Mod/Start/StartPage prune_libtool_files make_wrapper FreeCAD \ "${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCAD \ "" "${EROOT}"usr/$(get_libdir)/${P}/lib make_wrapper FreeCADCmd \ "${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \ "" "${EROOT}"usr/$(get_libdir)/${P}/lib newicon src/Main/icon.ico ${PN}.ico make_desktop_entry FreeCAD dodoc README.Linux ChangeLog.txt }
