commit: 00e86d362b301de831131147ba4a1f541200d883 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 1 16:34:21 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Aug 7 07:27:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e86d36
media-gfx/freecad: Remove last-rited Closes: https://bugs.gentoo.org/620702 media-gfx/freecad/Manifest | 1 - .../files/freecad-0.14.3702-install-paths.patch | 21 ---- .../freecad/files/freecad-0.17_pre-no-webkit.patch | 45 ------- media-gfx/freecad/files/freecad.sharedmimeinfo | 8 -- media-gfx/freecad/freecad-0.16.6712.ebuild | 131 --------------------- media-gfx/freecad/metadata.xml | 12 -- profiles/package.mask | 4 - 7 files changed, 222 deletions(-) diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest deleted file mode 100644 index 662e0f20394..00000000000 --- a/media-gfx/freecad/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e diff --git a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch b/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch deleted file mode 100644 index d042695e88c..00000000000 --- a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- freecad-0.14.3702/CMakeLists.txt -+++ freecad-0.14.3702/CMakeLists.txt -@@ -69,9 +69,15 @@ - SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory") - endif(WIN32) - --SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") --SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") --SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") -+if(NOT CMAKE_INSTALL_DATADIR) -+ SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") -+endif(NOT CMAKE_INSTALL_DATADIR) -+if(NOT CMAKE_INSTALL_INCLUDEDIR) -+ SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") -+endif(NOT CMAKE_INSTALL_INCLUDEDIR) -+if(NOT CMAKE_INSTALL_DOCDIR) -+ SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") -+endif(NOT CMAKE_INSTALL_DOCDIR) - # Don't set it without manual adaption of LibDir variable in src/App/FreeCADInit.py - SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries") - diff --git a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch deleted file mode 100644 index 60dcfed22c7..00000000000 --- a/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: Remove Qt4-Webkit dependency -Author: Anton Gladky <[email protected]> -Bug-Debian: https://bugs.debian.org/784464 -Last-Update: 2017-09-06 - -* asturm: tidied up and amended to use and not override BUILD_WEB - ---- a/src/Gui/DownloadManager.cpp -+++ b/src/Gui/DownloadManager.cpp -@@ -33,7 +33,6 @@ - #include <QMetaEnum> - #include <QSettings> - #include <QFileIconProvider> --#include <QWebSettings> - - #include "DownloadItem.h" - #include "DownloadManager.h" -@@ -224,11 +223,12 @@ void DownloadManager::updateRow() - ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height()); - - bool remove = false; -+/* - QWebSettings *globalSettings = QWebSettings::globalSettings(); - if (!item->downloading() - && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) - remove = true; -- -+*/ - if (item->downloadedSuccessfully() - && removePolicy() == DownloadManager::SuccessFullDownload) { - remove = true; ---- a/CMakeLists.txt 2018-03-02 22:39:46.374140506 +0100 -+++ b/CMakeLists.txt 2018-03-02 22:41:59.904216932 +0100 -@@ -351,11 +351,6 @@ - set(BUILD_MESH ON) - endif(BUILD_JTREADER) - --#a runtime dependency --if(BUILD_START) -- set(BUILD_WEB ON) --endif(BUILD_START) -- - #leaving test module for someone else. - #image has none. as far as I can tell. - #mesh has none. as far as I can tell. diff --git a/media-gfx/freecad/files/freecad.sharedmimeinfo b/media-gfx/freecad/files/freecad.sharedmimeinfo deleted file mode 100644 index 6d5e93e7d13..00000000000 --- a/media-gfx/freecad/files/freecad.sharedmimeinfo +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/x-extension-fcstd"> - <!-- <sub-class-of type="application/zip"/> --> - <comment>FreeCAD document files</comment> - <glob pattern="*.fcstd"/> - </mime-type> -</mime-info> diff --git a/media-gfx/freecad/freecad-0.16.6712.ebuild b/media-gfx/freecad/freecad-0.16.6712.ebuild deleted file mode 100644 index 0c65c49697b..00000000000 --- a/media-gfx/freecad/freecad-0.16.6712.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils desktop xdg-utils fortran-2 python-single-r1 - -DESCRIPTION="Qt based Computer Aided Design application" -HOMEPAGE="https://www.freecadweb.org/"; - -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"; -else - SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - dev-cpp/eigen:3 - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-libs/xerces-c[icu] - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/pyside:0[X,svg,${PYTHON_USEDEP}] - dev-python/shiboken:0[${PYTHON_USEDEP}] - dev-qt/designer:4 - dev-qt/qtgui:4[-egl] - dev-qt/qtopengl:4[-egl] - dev-qt/qtsvg:4 - media-libs/coin - media-libs/freetype - sci-libs/opencascade:*[vtk(+)] - sci-libs/orocos_kdl - sys-libs/zlib - virtual/glu" -RDEPEND="${COMMON_DEPEND} - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pivy[${PYTHON_USEDEP}] - dev-qt/assistant:4" -DEPEND="${COMMON_DEPEND} - >=dev-lang/swig-2.0.4-r1:0 - dev-python/pyside-tools:0[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch - "${FILESDIR}"/${PN}-0.17_pre-no-webkit.patch -) - -# https://bugs.gentoo.org/show_bug.cgi?id=352435 -# https://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt -RESTRICT="mirror" - -# TODO: -# DEPEND and RDEPEND: -# salome-smesh - science overlay -# zipio++ - not in portage yet - -S="${WORKDIR}/FreeCAD-${PV}" - -DOCS=( README.md ChangeLog.txt ) - -pkg_setup() { - fortran-2_pkg_setup - python-single-r1_pkg_setup - - [[ -z ${CASROOT} ]] && die "empty \$CASROOT, run eselect opencascade set or define otherwise" -} - -src_configure() { - export QT_SELECT=4 - - #-DOCC_* defined with cMake/FindOpenCasCade.cmake - #-DCOIN3D_* defined with cMake/FindCoin3D.cmake - #-DSOQT_ not used - local mycmakeargs=( - -DOCC_INCLUDE_DIR="${CASROOT}"/inc - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) - -DCMAKE_INSTALL_DATADIR=share/${P} - -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} - -DCMAKE_INSTALL_INCLUDEDIR=include/${P} - -DFREECAD_USE_EXTERNAL_KDL=ON - -DBUILD_WEB=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 - einfo "${P} will be built against opencascade version ${CASROOT}" -} - -src_install() { - cmake-utils_src_install - - make_desktop_entry FreeCAD "FreeCAD" "" "" "MimeType=application/x-extension-fcstd;" - - # install mimetype for FreeCAD files - insinto /usr/share/mime/packages - newins "${FILESDIR}"/${PN}.sharedmimeinfo "${PN}.xml" - - # install icons to correct place rather than /usr/share/freecad - pushd "${ED%/}"/usr/share/${P} || die - local size - for size in 16 32 48 64; do - newicon -s ${size} freecad-icon-${size}.png freecad.png - done - doicon -s scalable freecad.svg - newicon -s 64 -c mimetypes freecad-doc.png application-x-extension-fcstd.png - popd || die - - python_optimize "${ED%/}"/usr/{,share/${P}/}Mod/ -} - -pkg_postinst() { - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml deleted file mode 100644 index fd959a35b4f..00000000000 --- a/media-gfx/freecad/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Michael Weber</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">free-cad</remote-id> - <remote-id type="github">FreeCAD/FreeCAD</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 4668d160578..c11114ea5e8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -380,10 +380,6 @@ virtual/jre:9 # (<0.6) that have been punted from the tree. net-misc/cocaine-core -# Andreas Sturmlechner <[email protected]> (16 Nov 2017) -# Depends on dead Qt4. Last-rites on hold for chance of Qt5-port. Bug #620702 -<media-gfx/freecad-0.17 - # Patrice Clement <[email protected]> (28 Oct 2017) # Missing dependencies. >=dev-python/scrapy-1.4.0
