diff options
| author |   Michael Weber <xmw@gentoo.org> | 2015-08-09 16:03:54 +0200 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2015-08-09 16:03:54 +0200 |
| commit | 8755b0b69aff157136f52029b9646d86789f14f3 (patch) | |
| tree | 5864d960f69a9af0cb2c3b076281871fef076e9e | |
| parent | sci-libs/opencascade: add USE=vtk (bug 557022, thanks Helmut Jarausch). (diff) | |
| download | gentoo-8755b0b69aff157136f52029b9646d86789f14f3.tar.gz gentoo-8755b0b69aff157136f52029b9646d86789f14f3.tar.bz2 gentoo-8755b0b69aff157136f52029b9646d86789f14f3.zip | |
media-gfx/freecad: use sci-libs/opencascade[(+)vtk] (bug 557022, thanks Helmut Jarausch).
Package-Manager: portage-2.2.20
| -rw-r--r-- | media-gfx/freecad/freecad-0.15.4671.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-9999.ebuild | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/media-gfx/freecad/freecad-0.15.4671.ebuild b/media-gfx/freecad/freecad-0.15.4671.ebuild index a1883530eb31..cc779485b0a0 100644 --- a/media-gfx/freecad/freecad-0.15.4671.ebuild +++ b/media-gfx/freecad/freecad-0.15.4671.ebuild @@ -30,7 +30,7 @@ COMMON_DEPEND="dev-cpp/eigen:3 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 media-libs/coin - || ( sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 ) + || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 ) sys-libs/zlib virtual/glu ${PYTHON_DEPS}" diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index eac03449cbb7..fca8ff22a156 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -30,11 +30,8 @@ COMMON_DEPEND="dev-cpp/eigen:3 dev-qt/qtopengl:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 - media-libs/SoQt - media-libs/coin[doc] - net-libs/ptlib - sci-libs/gts - || ( sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 ) + media-libs/coin + || ( sci-libs/opencascade:6.9.0[vtk] sci-libs/opencascade:6.8.0 sci-libs/opencascade:6.7.1 sci-libs/opencascade:6.6.0 sci-libs/opencascade:6.5.5 ) sys-libs/zlib virtual/glu ${PYTHON_DEPS}" @@ -75,15 +72,6 @@ src_prepare() { } 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=$(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 -DOCC_INCLUDE_PATH="${CASROOT}"/inc @@ -128,7 +116,7 @@ src_install() { newicon src/Main/icon.ico ${PN}.ico make_desktop_entry FreeCAD - dodoc README ChangeLog.txt + dodoc README.Linux ChangeLog.txt # disable compression of QT assistant help files >> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip |