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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     6860c534e91f6b4b2551c9434d194b6d20561898
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 19:26:49 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 19:27:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6860c534

sci-geosciences/qgis: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-geosciences/qgis/Manifest              |   2 -
 sci-geosciences/qgis/qgis-2.18.4.ebuild    | 203 --------------------------
 sci-geosciences/qgis/qgis-2.18.6-r1.ebuild | 223 -----------------------------
 3 files changed, 428 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 1126b17af51..30daa171447 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,3 @@
 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-2.18.6.tar.bz2 84951747 SHA256 8cce11c255f82b29ddf64a84895f7411159de0fe69e85bb6b0767a0c675b8648 SHA512 0046a7b4b573e3ecef0ad006c8cf3d22cf3f6032b7a57c445d416f903d6aa063bd9f5459b22375fb99f5f7a027cda98b861300cb1399448aa2fd3567093ada76 WHIRLPOOL f20c948e44f57f5060319d6b2e46f6b568d5ddccfa6ec18e82c21720893fb2914dd3fb45601f75c791118fa3ffe9cd138e44155e80d0169d2dd09cc47afa9b40
 DIST qgis-2.18.7.tar.bz2 84928689 SHA256 ab05060e6b91909f61a21205ee12ddf79ebd85a7d7b81ab3b7dabfd032aa2e5b SHA512 e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d WHIRLPOOL 25320b1bacaeaf1486aa6a95b8df32e0a1b4713aedb5237f46e7aa538ef682b9cbd9eff70914727e426193fb0821df437e4732b118e71a4e12d90308cbbb066f
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5

diff --git a/sci-geosciences/qgis/qgis-2.18.4.ebuild b/sci-geosciences/qgis/qgis-2.18.4.ebuild
deleted file mode 100644
index 4a1f1c1c736..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.4.ebuild
+++ /dev/null
@@ -1,203 +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 cmake-utils eutils fdo-mime gnome2-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 webkit"
-
-REQUIRED_USE="
-	grass? ( python )
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt4,ssl]
-	>=dev-db/spatialite-4.1.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/qjson
-	dev-qt/designer:4
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	x11-libs/qscintilla:=[qt4(-)]
-	>=x11-libs/qwt-6.1.2:6=[svg,qt4(-)]
-	>=x11-libs/qwtpolar-1[qt4(-)]
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt4[X,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( dev-qt/qtwebkit:4 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.18.3-qscintilla-2.10.patch
-	"${FILESDIR}"/${PN}-2.18.3-sip-4.19.1.patch
-)
-
-pkg_setup() {
-	use python && 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
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_HTTPLIB2=OFF
-			-DWITH_INTERNAL_JINJA2=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYGMENTS=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	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
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize "${ED%/}"/usr/share/qgis/python
-
-		if use grass; then
-			python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-		fi
-	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
-}

diff --git a/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild
deleted file mode 100644
index 22288131d33..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.6-r1.ebuild
+++ /dev/null
@@ -1,223 +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"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
-		examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-	KEYWORDS="~amd64 ~x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch webkit"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5,ssl]
-	>=dev-db/spatialite-4.1.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtpositioning:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsvg:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	x11-libs/qscintilla:=[qt5]
-	>=x11-libs/qwt-6.1.2:6=[qt5,svg]
-	>=x11-libs/qwtpolar-1.1.1-r1[qt5]
-	designer? ( dev-qt/designer:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qttest:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-featuresummary.patch"
-	"${FILESDIR}/${P}-python.patch"
-)
-
-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
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DWITH_INTERNAL_QWTPOLAR=OFF
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DENABLE_QT5=ON
-		-DENABLE_PYTHON3=$(python_is_python3)
-		-DWITH_CUSTOM_WIDGETS=$(usex designer)
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_TOUCH="$(usex touch)"
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if has_version '>=x11-misc/qscintilla-2.10'; then
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2-qt5.so
-		)
-	else
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
-		)
-	fi
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DBINDINGS_GLOBAL_INSTALL=ON
-			-DWITH_PYSPATIALITE=ON
-			-DWITH_INTERNAL_DATEUTIL=OFF
-			-DWITH_INTERNAL_FUTURE=OFF
-			-DWITH_INTERNAL_MARKUPSAFE=OFF
-			-DWITH_INTERNAL_PYTZ=OFF
-			-DWITH_INTERNAL_SIX=OFF
-			-DWITH_INTERNAL_YAML=OFF
-		)
-	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
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	if use grass; then
-		python_fix_shebang "${ED%/}"/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
-}