From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1013789-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 75D001382C5
	for <garchives@archives.gentoo.org>; Fri, 30 Mar 2018 16:52:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 56D59E08A4;
	Fri, 30 Mar 2018 16:52:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 1D2E7E08A4
	for <gentoo-commits@lists.gentoo.org>; Fri, 30 Mar 2018 16:52:09 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id DD74F335D27
	for <gentoo-commits@lists.gentoo.org>; Fri, 30 Mar 2018 16:52:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A539D26A
	for <gentoo-commits@lists.gentoo.org>; Fri, 30 Mar 2018 16:52:05 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1522428708.0a2e8183a0b23aefe1818b9384e95fb4881f0a33.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-geosciences/qgis/Manifest sci-geosciences/qgis/qgis-2.18.14.ebuild
X-VCS-Directories: sci-geosciences/qgis/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 0a2e8183a0b23aefe1818b9384e95fb4881f0a33
X-VCS-Branch: master
Date: Fri, 30 Mar 2018 16:52:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b2eb25fe-5ecd-40a2-bd36-3d41d9e30a9f
X-Archives-Hash: b2e8b2ef411c3d00a146fec126c982b5

commit:     0a2e8183a0b23aefe1818b9384e95fb4881f0a33
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 16:48:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 16:51:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2e8183

sci-geosciences/qgis: Drop 2.8.14, aborting stabilisation

Closes: https://bugs.gentoo.org/647864
Closes: https://bugs.gentoo.org/648132
Closes: https://bugs.gentoo.org/641406
Package-Manager: Portage-2.3.27, Repoman-2.3.9

 sci-geosciences/qgis/Manifest            |   1 -
 sci-geosciences/qgis/qgis-2.18.14.ebuild | 207 -------------------------------
 2 files changed, 208 deletions(-)

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 9b2a249d1e5..9893d00a449 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,4 @@
 DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
-DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036
 DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
 DIST qgis-3.0.0.tar.bz2 94186303 BLAKE2B 2b2623c218a86af22ee13e1271e66244fc6191732db6bc694860015824525188308609c8758062910ba7065ca6790d4091beb15ff324d1a8410e65525cf785b0 SHA512 91201c5d48f9450734a6268f70cba830e363db15a979266af1a7f2ef73857ca11e89145d027f394d052d0536e54b4f62523b1ad49bbe698743fec882ceecfabe
 DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75

diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild
deleted file mode 100644
index 2f935622f68..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.14.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2018 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 gnome2-utils python-single-r1 qmake-utils xdg-utils
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-SRC_URI="
-	https://qgis.org/downloads/qgis-${PV}.tar.bz2
-	examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python"
-
-REQUIRED_USE="
-	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/qtsvg:4
-	dev-qt/qtsql: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,${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}] )
-	)
-"
-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=(
-	# TODO upstream
-	"${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e "s:\${QT_BINARY_DIR}:$(qt4_get_bindir):" \
-		CMakeLists.txt || die "Failed to fix lrelease path"
-
-	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=OFF
-	)
-
-	if has_version '<x11-libs/qscintilla-2.10'; then
-		mycmakeargs+=(
-			-DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/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
-
-	# bug 612956
-	addpredict /dev/dri/renderD128
-
-	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_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
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}