xmw 15/07/23 21:32:39
Modified: freecad-0.12.5284-r4.ebuild freecad-9999.ebuild
freecad-0.13.1830-r1.ebuild
freecad-0.14.3702-r1.ebuild ChangeLog
Added: freecad-0.15.4671.ebuild
Removed: freecad-0.14.3702.ebuild
Log:
Version bump (thanks Priit Laes for the cleanups, bug 546786), update live
build, just use CASROOT from environment (as set by eselect opencascade),
RDEPEND on tested version of opencascade.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
62EEF090)
Revision Changes Path
1.2 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.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r4.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r4.ebuild?r1=1.1&r2=1.2
Index: freecad-0.12.5284-r4.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freecad-0.12.5284-r4.ebuild 23 Apr 2014 22:49:07 -0000 1.1
+++ freecad-0.12.5284-r4.ebuild 23 Jul 2015 21:32:39 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header:
/var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r4.ebuild,v 1.2
2015/07/23 21:32:39 xmw Exp $
EAPI=5
@@ -34,7 +34,8 @@
media-libs/SoQt
media-libs/coin[doc]
sci-libs/gts
- sci-libs/opencascade
+ >=sci-libs/opencascade-6.5.5
+ <sci-libs/opencascade-6.8.0
sys-libs/zlib
virtual/glu"
DEPEND="${RDEPEND}
@@ -49,6 +50,8 @@
pkg_setup() {
fortran-2_pkg_setup
python_set_active_version 2
+
+ [ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade
set or define otherwise"
}
src_prepare() {
@@ -66,14 +69,10 @@
"${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
+ "${FILESDIR}"/${P}-cmake-2.8.12.patch \
+ "${FILESDIR}"/${P}-occ-6.5.5.patch \
+ "${FILESDIR}"/${P}-salomesmesh-occ-6.5.5.patch \
+ "${FILESDIR}"/${P}-occ-6.6.patch
local my_coin_version=$(best_version media-libs/coin)
local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html
@@ -82,18 +81,9 @@
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
1.8 media-gfx/freecad/freecad-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild?r1=1.7&r2=1.8
Index: freecad-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freecad-9999.ebuild 21 Jul 2015 23:55:11 -0000 1.7
+++ freecad-9999.ebuild 23 Jul 2015 21:32:39 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild,v 1.7
2015/07/21 23:55:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-9999.ebuild,v 1.8
2015/07/23 21:32:39 xmw Exp $
EAPI=5
@@ -17,14 +17,13 @@
KEYWORDS=""
IUSE=""
+# sci-libs/opencascade ok: failed: 6.9.0
COMMON_DEPEND="dev-cpp/eigen:3
- dev-games/ode
dev-libs/boost
- dev-libs/libf2c
- dev-libs/libspnav[X]
dev-libs/xerces-c[icu]
dev-python/matplotlib
- dev-python/pyside
+ dev-python/pyside[X]
+ dev-python/pyside-tools
dev-python/shiboken
dev-qt/designer:4
dev-qt/qtgui:4
@@ -35,17 +34,17 @@
media-libs/coin[doc]
net-libs/ptlib
sci-libs/gts
- sci-libs/opencascade
+ >=sci-libs/opencascade-6.5.5
+ <sci-libs/opencascade-6.9.0
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
RDEPEND="${COMMON_DEPEND}
dev-qt/assistant:4
- dev-python/pycollada
dev-python/pivy
- dev-python/pyopencl
dev-python/numpy"
DEPEND="${COMMON_DEPEND}
+ dev-python/pyside-tools
>=dev-lang/swig-2.0.4-r1:0"
# http://bugs.gentoo.org/show_bug.cgi?id=352435
@@ -60,21 +59,20 @@
pkg_setup() {
fortran-2_pkg_setup
python-single-r1_pkg_setup
+
+ [ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade
set or define otherwise"
}
src_prepare() {
einfo remove bundled libs
rm -rf src/3rdParty/{boost,Pivy*}
+ epatch "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+
#bug 518996
sed -e "/LibDir = /s:'lib':'"$(get_libdir)"':g" \
-i src/App/FreeCADInit.py || die
- einfo "Patching cMake/FindCoin3DDoc.cmake ..."
- 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
}
src_configure() {
@@ -82,7 +80,10 @@
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)
+ export CASROOT=$(awk -F '=' '$1 == "CASROOT" {print $2}' $my_occ_env)
+ #my_occ_ver=$(echo $CASROOT |
+ # awk '{print gensub(".*opencascade-([0-9.]*).*","\\1","$0")}')
+ # or just $(eselect opencascade show)
local mycmakeargs=(
-DOCC_INCLUDE_DIR="${CASROOT}"/inc
1.6 media-gfx/freecad/freecad-0.13.1830-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild?r1=1.5&r2=1.6
Index: freecad-0.13.1830-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freecad-0.13.1830-r1.ebuild 8 Apr 2015 17:58:14 -0000 1.5
+++ freecad-0.13.1830-r1.ebuild 23 Jul 2015 21:32:39 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.5
2015/04/08 17:58:14 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.6
2015/07/23 21:32:39 xmw Exp $
EAPI=5
@@ -33,7 +33,8 @@
media-libs/SoQt
media-libs/coin[doc]
sci-libs/gts
- sci-libs/opencascade
+ >=sci-libs/opencascade-6.5.5
+ <sci-libs/opencascade-6.8.0
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
@@ -59,6 +60,8 @@
pkg_setup() {
fortran-2_pkg_setup
python-single-r1_pkg_setup
+
+ [ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade
set or define otherwise"
}
src_prepare() {
@@ -75,11 +78,8 @@
# and also because the same module has been removed upstream (commit
c0e2c9)
epatch "${FILESDIR}"/${P}-no-machdist.patch
- local my_cas_version=$(eselect opencascade show 2>/dev/null || echo 6.5)
- if [ "${my_cas_version}" \> "6.5.0" ] ; then
- epatch "${FILESDIR}"/${PN}-0.12.5284-occ-6.6.patch
- epatch "${FILESDIR}"/${P}-occ-6.7.patch
- fi
+ epatch "${FILESDIR}"/${PN}-0.12.5284-occ-6.6.patch
+ epatch "${FILESDIR}"/${P}-occ-6.7.patch
einfo "Patching cMake/FindCoin3DDoc.cmake ..."
local my_coin_version=$(best_version media-libs/coin)
@@ -89,12 +89,6 @@
}
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
1.6 media-gfx/freecad/freecad-0.14.3702-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild?r1=1.5&r2=1.6
Index: freecad-0.14.3702-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- freecad-0.14.3702-r1.ebuild 8 Apr 2015 17:58:14 -0000 1.5
+++ freecad-0.14.3702-r1.ebuild 23 Jul 2015 21:32:39 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild,v 1.5
2015/04/08 17:58:14 mgorny Exp $
+# $Header:
/var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.14.3702-r1.ebuild,v 1.6
2015/07/23 21:32:39 xmw Exp $
EAPI=5
@@ -35,7 +35,8 @@
media-libs/coin[doc]
net-libs/ptlib
sci-libs/gts
- sci-libs/opencascade
+ >=sci-libs/opencascade-6.5.5
+ <sci-libs/opencascade-6.8.0
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
@@ -60,6 +61,8 @@
pkg_setup() {
fortran-2_pkg_setup
python-single-r1_pkg_setup
+
+ [ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade
set or define otherwise"
}
src_prepare() {
@@ -80,12 +83,6 @@
}
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
1.28 media-gfx/freecad/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/ChangeLog?rev=1.28&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/ChangeLog?rev=1.28&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 21 Jul 2015 23:55:11 -0000 1.27
+++ ChangeLog 23 Jul 2015 21:32:39 -0000 1.28
@@ -1,6 +1,15 @@
# ChangeLog for media-gfx/freecad
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.27
2015/07/21 23:55:11 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.28
2015/07/23 21:32:39 xmw Exp $
+
+*freecad-0.15.4671 (23 Jul 2015)
+
+ 23 Jul 2015; Michael Weber <[email protected]> +freecad-0.15.4671.ebuild,
+ -freecad-0.14.3702.ebuild, freecad-0.12.5284-r4.ebuild,
+ freecad-0.13.1830-r1.ebuild, freecad-0.14.3702-r1.ebuild,
freecad-9999.ebuild:
+ Version bump (thanks Priit Laes for the cleanups, bug 546786), update live
+ build, just use CASROOT from environment (as set by eselect opencascade),
+ RDEPEND on tested version of opencascade.
21 Jul 2015; Michael Weber <[email protected]> freecad-9999.ebuild:
Update EGIT_REPO_URI to github, fix README installation (thanks Fabian Kislat
1.1 media-gfx/freecad/freecad-0.15.4671.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.15.4671.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/freecad-0.15.4671.ebuild?rev=1.1&content-type=text/plain
Index: freecad-0.15.4671.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.15.4671.ebuild,v
1.1 2015/07/23 21:32:39 xmw Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit cmake-utils eutils fortran-2 multilib python-single-r1
DESCRIPTION="QT based Computer Aided Design application"
HOMEPAGE="http://www.freecadweb.org/";
SRC_URI="mirror://sourceforge/free-cad/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEPEND="dev-cpp/eigen:3
dev-libs/boost
dev-libs/xerces-c[icu]
dev-python/matplotlib
dev-python/pyside[X]
dev-python/pyside-tools
dev-python/shiboken
dev-qt/designer:4
dev-qt/qtgui:4
dev-qt/qtopengl:4
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
media-libs/coin
>=sci-libs/opencascade-6.5.5
<sci-libs/opencascade-6.9.0
sys-libs/zlib
virtual/glu
${PYTHON_DEPS}"
RDEPEND="${COMMON_DEPEND}
dev-qt/assistant:4
dev-python/pivy
dev-python/numpy"
DEPEND="${COMMON_DEPEND}
dev-python/pyside-tools
>=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"
# TODO:
# DEPEND and RDEPEND:
# salome-smesh - science overlay
# zipio++ - not in portage yet
pkg_setup() {
fortran-2_pkg_setup
python-single-r1_pkg_setup
[ -z "${CASROOT}" ] && die "empty \$CASROOT, run eselect opencascade
set or define otherwise"
}
src_prepare() {
einfo remove bundled libs
rm -rf src/3rdParty/{boost,Pivy*}
epatch "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
#bug 518996
sed -e "/LibDir = /s:'lib':'"$(get_libdir)"':g" \
-i src/App/FreeCADInit.py || die
}
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="${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}
-DCMAKE_INSTALL_DATADIR="${EROOT}"usr/share/${P}/
-DCMAKE_INSTALL_DOCDIR="${EROOT}"usr/share/doc/${P}/
-DCMAKE_INSTALL_INCLUDEDIR="${EROOT}"usr/include/${P}/
-DFREECAD_USE_EXTERNAL_PIVY="ON"
-DFREECAD_BUILD_FEM="OFF"
)
# TODO to remove embedded dependencies:
#
# -DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs
zipios++ but it's not yet in portage so the embedded zipios++
# (under src/zipios++) will be used
# salomesmesh is in 3rdparty but upstream's find_package function
is not complete yet to compile against external version
# (external salomesmesh is available in "science"
overlay)
cmake-utils_src_configure
ewarn "${P} will be built against opencascade version ${CASROOT}"
}
src_install() {
cmake-utils_src_install
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
# disable compression of QT assistant help files
>> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip
>> "${ED}"usr/share/doc/${P}/freecad.qch.ecompress.skip
python_optimize "${ED}"usr/{$(get_libdir),share}/${P}/Mod/
}
