[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/

[Andreas Sturmlechner]

commit:     6516010356d81151671b063357aff47bca18b86c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  1 19:08:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 19:39:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65160103

sci-geosciences/qgis: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4099

 sci-geosciences/qgis/Manifest                      |   3 -
 .../qgis-1.7.0-avoid-deprecated-pyqtconfig.patch   |  53 ------
 .../qgis/files/qgis-1.8.0-no-python-pyc.patch      |  54 ------
 .../qgis/files/qgis-1.8.0-private.patch            |  10 --
 .../qgis/files/qgis-1.8.0-redrawning.patch         |  10 --
 sci-geosciences/qgis/metadata.xml                  |   2 -
 sci-geosciences/qgis/qgis-1.8.0.ebuild             | 115 -------------
 sci-geosciences/qgis/qgis-2.14.5-r1.ebuild         | 172 -------------------
 sci-geosciences/qgis/qgis-2.18.2-r3.ebuild         | 186 ---------------------
 9 files changed, 605 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5ea73676a83..f8b2f462316 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,6 +1,3 @@
-DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
-DIST qgis-2.14.5.tar.bz2 74336261 SHA256 acc1bc1b1c838503e072b3c80de075185f6059d75bb8a686da7a6ab9264b514d SHA512 d493c83a96eeea2e52199c9a8812989ea89c3357e2f984fdc92f0a05b240770f7ed2d77b1bdbb0e57975c37916acbd6cc4115db5fe11f63897957e8baf6a5586 WHIRLPOOL 3cecafad597ae793acd97648987bb130f17bfc8392cde5fd55f093f54786312a2389cdc754c67b47eb0b9512dc981f95cd85cc5dbaaf178c674a477273e83927
-DIST qgis-2.18.2.tar.bz2 83593908 SHA256 e218ecc2c0b983a95bba0dc46788661e803cf870f5740cbcfaa1ea39a71f02a0 SHA512 b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f WHIRLPOOL 97629355706241f84152142793881cbd973a269b3fdf5aa9786b4c0d49af7d26c089461638472a977d1a649f6881599467579706837f1ab69e7be3e5cae96cfb
 DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
 DIST qgis-2.18.4.tar.bz2 85419060 SHA256 737827fd4c63c859a0ea7badd36ebcba970ca7c0a8feda4b10c0de0ed52546e8 SHA512 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7 WHIRLPOOL 4dfb9a304c193de3f276871cafe3f0683764d5e7fdc5015e8f3d76c9f46072c01758e87097e0db69657b38da3f5908b41293319d909b5c69b5d23f98ba473b54
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch
deleted file mode 100644
index 65cabb2afe7..00000000000
--- a/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Avoid relying on the deprecated pyqtconfig module.
-
-When PyQt4 is configured using configure-ng.py then no pyqtconfig module
-will be built, causing the automatic detection in the QGIS build system to
-fail.
-
-This change tries to work around the problem by extracting or guessing all
-the relevant settings.  It should work reasonably well for a default
-configuration of PyQt, but may fail if PyQt overrides the defaults from sip. 
-All may break if SIP v5 is used, since that version apparently won't contain
-a sipconfig module any more.  But we'll tackle that once we get there.
-
-References:
-* https://bugs.gentoo.org/show_bug.cgi?id=525700
-
-2014-10-21 Martin von Gagern
-
-Index: qgis-2.4.0/cmake/FindPyQt.py
-===================================================================
---- qgis-2.4.0.orig/cmake/FindPyQt.py
-+++ qgis-2.4.0/cmake/FindPyQt.py
-@@ -30,9 +30,29 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
--import PyQt4.pyqtconfig
-+try:
-+    import PyQt4.pyqtconfig
-+    pyqtcfg = PyQt4.pyqtconfig.Configuration()
-+except ImportError:
-+    import PyQt4.QtCore
-+    import sipconfig # won't work for SIP v5
-+    import os.path
-+    cfg = sipconfig.Configuration()
-+    sip_dir = cfg.default_sip_dir
-+    for p in (os.path.join(sip_dir, "PyQt4"), sip_dir):
-+        if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
-+            sip_dir = p
-+            break
-+    cfg = {
-+        'pyqt_version': PyQt4.QtCore.PYQT_VERSION,
-+        'pyqt_version_str': PyQt4.QtCore.PYQT_VERSION_STR,
-+        'pyqt_sip_flags': PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'],
-+        'pyqt_mod_dir': cfg.default_mod_dir,
-+        'pyqt_sip_dir': sip_dir,
-+        'pyqt_bin_dir': cfg.default_bin_dir,
-+    }
-+    pyqtcfg = sipconfig.Configuration([cfg])
- 
--pyqtcfg = PyQt4.pyqtconfig.Configuration()
- print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
- print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
- print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)

diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch b/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch
deleted file mode 100644
index ec3e1c2dccf..00000000000
--- a/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- cmake/PythonMacros.cmake
-+++ cmake/PythonMacros.cmake
-@@ -22,40 +22,4 @@
-   # Install the source file.
-   INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
- 
--  # Byte compile and install the .pyc file.        
--  GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
--  GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
--  GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
--  GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
--
--  if(WIN32)
--    string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
--  endif(WIN32)
--
--  SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
--  SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
--
--  FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
--
--  SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
--
--  GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
--  IF(_abs_bin_py STREQUAL ${_absfilename})    # Don't copy the file onto itself.
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${message}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ELSE(_abs_bin_py STREQUAL ${_absfilename})
--    ADD_CUSTOM_COMMAND(
--      TARGET compile_python_files
--      COMMAND ${CMAKE_COMMAND} -E echo ${message} 
--      COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
--      COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
--      DEPENDS ${_absfilename}
--    )
--  ENDIF(_abs_bin_py STREQUAL ${_absfilename})
--
--  INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
- ENDMACRO(PYTHON_INSTALL)
---- python/CMakeLists.txt
-+++ python/CMakeLists.txt
-@@ -102,8 +102,6 @@
- 
- SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)
- 
--ADD_CUSTOM_TARGET(compile_python_files ALL)
--
- ADD_CUSTOM_COMMAND(TARGET compile_python_files
-        POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${QGIS_PYTHON_OUTPUT_DIRECTORY}

diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-private.patch b/sci-geosciences/qgis/files/qgis-1.8.0-private.patch
deleted file mode 100644
index 59c3ca76939..00000000000
--- a/sci-geosciences/qgis/files/qgis-1.8.0-private.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/core/qgsmaplayerregistry.h	2015-12-30 15:06:17.199889612 +0100
-+++ b/src/core/qgsmaplayerregistry.h	2015-12-30 15:05:50.159890061 +0100
-@@ -173,6 +173,7 @@
-     /** debugging member
-         invoked when a connect() is made to this object
-     */
-+  public:
-     void connectNotify( const char * signal );
- 
- 

diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch b/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch
deleted file mode 100644
index b58ec55f164..00000000000
--- a/sci-geosciences/qgis/files/qgis-1.8.0-redrawning.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/gui/qgsmaptoolpan.cpp	2012-06-12 21:28:18.000000000 +0200
-+++ b/src/gui/qgsmaptoolpan.cpp	2015-12-30 15:55:02.679840978 +0100
-@@ -39,6 +39,7 @@
-     mDragging = true;
-     // move map and other canvas items
-     mCanvas->panAction( e );
-+    mCanvas->refresh();
-   }
- }
- 

diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index dca8b5f01bb..fc606b878cf 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -14,8 +14,6 @@
   tracks from your GPS. 
 </longdescription>
   <use>
-    <flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</pkg></flag>
-    <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
     <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
     <flag name="mapserver">Determines whether mapserver should be built</flag>
     <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>

diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
deleted file mode 100644
index bff71e7dc8b..00000000000
--- a/sci-geosciences/qgis/qgis-1.8.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils gnome2-utils multilib cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bundled-libs examples gsl postgres python spatialite test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/expat
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	sci-geosciences/gpsbabel
-	>=sci-libs/gdal-1.6.1[geos,python?]
-	sci-libs/geos
-	sci-libs/libspatialindex
-	sci-libs/proj
-	x11-libs/qwt:5[svg]
-	!bundled-libs? ( <x11-libs/qwtpolar-1 )
-	gsl? ( sci-libs/gsl )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	)
-	spatialite? (
-		dev-db/sqlite:3
-		dev-db/spatialite
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
-	"${FILESDIR}/${PN}-1.8.0-no-python-pyc.patch"
-	"${FILESDIR}/${PN}-1.8.0-redrawning.patch"
-	"${FILESDIR}/${PN}-1.8.0-private.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DQGIS_MANUAL_SUBDIR=/share/man/"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		"-DWITH_INTERNAL_SPATIALITE=OFF"
-		"-DWITH_INTERNAL_QWTPOLAR=$(usex bundled-libs "ON" "OFF")"
-		"-DPEDANTIC=OFF"
-		"-DWITH_APIDOC=OFF"
-		"-DWITH_GRASS=OFF"
-		$(cmake-utils_use_with postgres POSTGRESQL)
-		$(cmake-utils_use_with python BINDINGS)
-		$(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
-		$(cmake-utils_use_with spatialite SPATIALITE)
-		$(cmake-utils_use_enable test TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc BUGS ChangeLog CODING README
-
-	newicon -s 128 images/icons/qgis-icon.png qgis.png
-	make_desktop_entry qgis "Quantum GIS " qgis
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/*
-	fi
-
-	python_optimize "${D}"/usr/share/qgis/python/plugins \
-		"${D}"/$(python_get_sitedir)/qgis
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild b/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
deleted file mode 100644
index 94aabb570fc..00000000000
--- a/sci-geosciences/qgis/qgis-2.14.5-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-	http://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples grass gsl mapserver oracle postgres python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-		mapserver? ( python )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/expat
-	sci-geosciences/gpsbabel
-	>=sci-libs/gdal-1.6.1:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	gsl? ( sci-libs/gsl:= )
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	x11-libs/qscintilla:=[qt4(-)]
-	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
-		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
-	)
-	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
-	mapserver? ( dev-libs/fcgi )
-	oracle? ( dev-db/oracle-instantclient:= )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		${PYTHON_DEPS}
-	)
-	dev-db/sqlite:3
-	dev-db/spatialite
-	app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-DOCS=( BUGS ChangeLog NEWS )
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DQGIS_MANUAL_SUBDIR=/share/man/"
-		"-DBUILD_SHARED_LIBS=ON"
-		"-DQGIS_LIB_SUBDIR=$(get_libdir)"
-		"-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
-		"-DWITH_INTERNAL_DATEUTIL=OFF"
-		"-DWITH_INTERNAL_HTTPLIB2=OFF"
-		"-DWITH_INTERNAL_JINJA2=OFF"
-		"-DWITH_INTERNAL_MARKUPSAFE=OFF"
-		"-DWITH_INTERNAL_PYGMENTS=OFF"
-		"-DWITH_INTERNAL_PYTZ=OFF"
-		"-DWITH_INTERNAL_QWTPOLAR=OFF"
-		"-DWITH_INTERNAL_SIX=OFF"
-		"-DPEDANTIC=OFF"
-		"-DWITH_APIDOC=OFF"
-		"-WITH_QSPATIALITE=ON"
-		-DENABLE_TESTS=no
-		-DWITH_BINDINGS="$(usex python)"
-		-DWITH_GRASS7="$(usex grass)"
-		$(usex grass "-DGRASS_PREFIX=/usr/" "")
-		-DWITH_GSL="$(usex gsl)"
-		-DWITH_ORACLE="$(usex oracle)"
-		-DWITH_POSTGRESQL="$(usex postgres)"
-		-DWITH_PYSPATIALITE="$(usex python)"
-		-DWITH_SERVER="$(usex mapserver)"
-	)
-
-	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
-		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
-		if has_version '>=x11-libs/qwt-6.1.2' ; then
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
-			)
-		else
-			mycmakeargs+=(
-				"-DQWT_INCLUDE_DIR=/usr/include/qwt6"
-				"-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
-			)
-		fi
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon -s 128 images/icons/qgis-icon.png qgis.png
-	make_desktop_entry qgis "QGIS " qgis
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/qgis_sample_data/*
-	fi
-
-	python_optimize "${D}"/usr/share/qgis/python \
-		"${D}"/$(python_get_sitedir)/qgis \
-		"${D}"/$(python_get_sitedir)/pyspatialite
-
-	if use grass; then
-		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
-		python_optimize "${D}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	else
-		if use python ; then
-			elog "Support of PostgreSQL is disabled."
-			elog "But some installed python-plugins needs import psycopg2 module."
-			elog "If you do not need this modules just disable them in main menu."
-			elog "Or you need to set USE=postgres"
-		fi
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
deleted file mode 100644
index 8d2ae3b3ff5..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.2-r3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils fdo-mime gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
-	http://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	mapserver? ( python )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/expat
-	sci-geosciences/gpsbabel
-	>=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	dev-libs/qjson
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsvg:4
-	dev-qt/qtsql:4
-	dev-qt/qtwebkit:4
-	x11-libs/qscintilla:=[qt4(-)]
-	|| (
-		( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
-		( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
-	)
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
-	mapserver? ( dev-libs/fcgi )
-	oracle? ( dev-db/oracle-instantclient:= )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
-		<dev-python/sip-4.19:=[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-		${PYTHON_DEPS}
-	)
-	dev-db/sqlite:3
-	>=dev-db/spatialite-4.1.0
-	app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	cd src/plugins || die
-	use georeferencer || cmake_comment_add_subdirectory "georeferencer"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DWITH_INTERNAL_DATEUTIL=OFF
-		-DWITH_INTERNAL_HTTPLIB2=OFF
-		-DWITH_INTERNAL_JINJA2=OFF
-		-DWITH_INTERNAL_MARKUPSAFE=OFF
-		-DWITH_INTERNAL_PYGMENTS=OFF
-		-DWITH_INTERNAL_PYTZ=OFF
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DWITH_INTERNAL_SIX=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_BINDINGS="$(usex python)"
-		-DWITH_GRASS7="$(usex grass)"
-		$(usex grass "-DGRASS_PREFIX=/usr/" "")
-		-DWITH_ORACLE="$(usex oracle)"
-		-DWITH_POSTGRESQL="$(usex postgres)"
-		-DWITH_PYSPATIALITE="$(usex python)"
-		-DWITH_SERVER="$(usex mapserver)"
-	)
-
-	if has_version '>=x11-libs/qwtpolar-1' &&  has_version 'x11-libs/qwt:5' ; then
-		elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
-		mycmakeargs+=( "-DQWT_INCLUDE_DIR=/usr/include/qwt6" )
-		if has_version '>=x11-libs/qwt-6.1.2' ; then
-			mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so" )
-		else
-			mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so" )
-		fi
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-	fi
-
-	python_optimize "${D}"/usr/share/qgis/python
-
-	if use grass; then
-		python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}