gentoo resync : 09.03.2018

5 files changed, 53 insertions, 277 deletions

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index c447c18db152..c4a8440768bc 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,8 +1,6 @@
 AUX freecad-0.14.3702-install-paths.patch 1143 BLAKE2B bbf14f29381fa7d808af53c51ce439ac21acb269648df647ddf3abc5ee6f01de44ffbc62bd1274aec1a167cf3f449c8498768af2af50fc0b9e3a5963f1857a46 SHA512 12181e4b48e4fb6284b574cb9872af713323d8f229a6c1746424968b0d22300bd6ada6437854a730dd4c5310eb36ebb06a35375ab012d36e9d3af4fb4271d884
+AUX freecad-0.17_pre-no-webkit.patch 1353 BLAKE2B c1a3b1cfea471cd027aaf921eabaaa036bda8fc5f6569358aa5990b1d400e0868429fb19c9d19013f93f8143a044961bf3e914a442f47a2ebbad0c0433819f78 SHA512 aa109102d428a7160538bbf53a05d335b44a8aca8bcdc3d43a258f2f30d1c8a4fb4f46021bc472ca3aa5c4fb3b26675222894b595c3e0e5a321cbfab348a928c
 AUX freecad.sharedmimeinfo 312 BLAKE2B 731f28f904bebac03c8a64778d5e36f9b26fa33c347fa0b67113752aea12568f5a19968e730a53da89a7c7d08db6f8d80f11ab30d011e6b4db973c8549f710bd SHA512 bb55cad8387032af0e06ce7f1b4cab4354a34a915b9f550de25e05bf24d4161d9ea152d5692d65df4b362622f76a11d78894deaf7fee60c7a3fc0bfec38fa10c
-DIST freecad-0.16.6712.tar.gz 111706423 BLAKE2B ef6386fb953a9acfc51856b4a898aaefd1c24750b5eb07e5266392e54e357252327d594311030c3cc19144ead6e7f274710b532f7cd4993008850a3af6ec31c2 SHA512 ea8214b37f7a10a3e3e558e6c1223d9212d6c2906b79961c8cb9211edff97a41e2da0ce6cf64cdc7a22610f6ff13495163c46573b5dd84d4a7cc0260f15e371e
 DIST freecad-0.17_pre.tar.gz 111704401 BLAKE2B 790462beef989b7a3db69d7412cd1076738579906873c8ce6c152b175f6b8305c2949087c9d719d884839e2966088c23309dc2617b3469bc5fa3296d2131e375 SHA512 a826a549d842ba322f7ec5f786d402e81f5b916008be450bacefb7ee976e203427130938c036cc6fca6ea11a8df0ab9b4a39f3bdfedc3cc1a7d31e7a5d11e142
-EBUILD freecad-0.16.6712.ebuild 3512 BLAKE2B c82cbfa92ea9fef06dacc261614f603c82b757ff27f31cd44618b2443d2073a012740c54c3ce3045f2ab1a56edf782b87b695c1635ae0fea5bc3c25c0479234f SHA512 69dd661a78298c4c0ada44662cac74e94e6f444c392374b73026638baddfb7a0dd565873c2c5fccd6184db2dee9c08c8d780ffdf1b0efa3bd4249a4fa62ffe1b
-EBUILD freecad-0.17_pre.ebuild 3512 BLAKE2B c82cbfa92ea9fef06dacc261614f603c82b757ff27f31cd44618b2443d2073a012740c54c3ce3045f2ab1a56edf782b87b695c1635ae0fea5bc3c25c0479234f SHA512 69dd661a78298c4c0ada44662cac74e94e6f444c392374b73026638baddfb7a0dd565873c2c5fccd6184db2dee9c08c8d780ffdf1b0efa3bd4249a4fa62ffe1b
-EBUILD freecad-9999.ebuild 3658 BLAKE2B b8fb3a076bc64144f2f15c0134cf3f047245081a233bf0b9d8bb1d717d9e061f91e029d6a1c21fda29df0967307377432edd952eeb7f0e82f9a94b7cc2487d4a SHA512 f0def47258f9a1886566ff0e38f54b87b57657381b22a1b9dd8db051503af37dfac9cf7313257787f2b4df6c517476b9b8482e0a940b69bca75c2daf77c86919
+EBUILD freecad-0.17_pre-r1.ebuild 3527 BLAKE2B d50cbd1e2958e5ca3203494d8aa042263f9450b9b308291087de177f3eb06774a54dd12989670df09797990d65a3fd966a8863b0790083065b0f70ce020d5762 SHA512 0aae95df7cc528f3fd1defca5be34da26b03b73c21627fd510115e1a19668135db365cbd5a275edef8dc8c6a389c151a67786a6b7bfb8d896a5602e7e5fb4204
 MISC metadata.xml 376 BLAKE2B a1e6c119bd4edce1e1e39c3ef95ed00c8d48f2b3391c2ead629b1936cf1570501de97988163b786669ef9d5cdea20d7ded01286dd1633278c703a5efd5813f0a SHA512 2b159882b18f33adc78ede30133528a915130d21fcfd111a099861b2ee719b59338cd81af63a289bb5812ce04dee238a6eb4596a95a5abedbc453f631e827f53
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
new file mode 100644
index 000000000000..60dcfed22c7d
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.17_pre-no-webkit.patch
@@ -0,0 +1,45 @@
+Description: Remove Qt4-Webkit dependency
+Author: Anton Gladky <gladk@debian.org>
+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/freecad-0.16.6712.ebuild b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
index 46964014555b..3b3624752c5b 100644
--- a/media-gfx/freecad/freecad-0.16.6712.ebuild
+++ b/media-gfx/freecad/freecad-0.17_pre-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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 eutils xdg-utils fortran-2 python-single-r1
+inherit cmake-utils desktop xdg-utils fortran-2 python-single-r1
 
 DESCRIPTION="Qt based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/"
@@ -23,10 +23,8 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="
-	${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	dev-cpp/eigen:3
-	dev-java/xerces
 	dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	dev-libs/xerces-c[icu]
 	dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -36,7 +34,6 @@ COMMON_DEPEND="
 	dev-qt/qtgui:4[-egl]
 	dev-qt/qtopengl:4[-egl]
 	dev-qt/qtsvg:4
-	dev-qt/qtwebkit:4
 	media-libs/coin
 	media-libs/freetype
 	sci-libs/opencascade:*[vtk(+)]
@@ -53,6 +50,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+	"${FILESDIR}"/${P}-no-webkit.patch
 )
 
 # https://bugs.gentoo.org/show_bug.cgi?id=352435
@@ -87,7 +85,8 @@ src_configure() {
 		-DCMAKE_INSTALL_DATADIR=share/${P}
 		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
 		-DCMAKE_INSTALL_INCLUDEDIR=include/${P}
-		-DFREECAD_USE_EXTERNAL_KDL="ON"
+		-DFREECAD_USE_EXTERNAL_KDL=ON
+		-DBUILD_WEB=OFF
 	)
 
 	# TODO to remove embedded dependencies:
diff --git a/media-gfx/freecad/freecad-0.17_pre.ebuild b/media-gfx/freecad/freecad-0.17_pre.ebuild
deleted file mode 100644
index 46964014555b..000000000000
--- a/media-gfx/freecad/freecad-0.17_pre.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils 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-java/xerces
-	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
-	dev-qt/qtwebkit: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
-)
-
-# 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"
-	)
-
-	# 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/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
deleted file mode 100644
index 13355e49800b..000000000000
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils xdg-utils gnome2-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}"
-
-#dev-qt/qtgui:4[-egl] and dev-qt/qtopengl:4[-egl] : Bug 564978
-#dev-python/pyside[svg] : Bug 591012
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-cpp/eigen:3
-	dev-java/xerces
-	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
-	dev-qt/qtwebkit: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}]"
-
-# 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
-
-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=/usr/share/${P}
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${P}
-		-DFREECAD_USE_EXTERNAL_KDL="ON"
-	)
-
-	# 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
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	gnome2_icon_cache_update
-}