From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 944B6139694 for ; Sun, 19 Feb 2017 14:56:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8449E0E5A; Sun, 19 Feb 2017 14:55:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F366E0E32 for ; Sun, 19 Feb 2017 14:55:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64230340EE8 for ; Sun, 19 Feb 2017 14:55:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC6314D59 for ; Sun, 19 Feb 2017 14:55:50 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1487515528.9cafc514db126ff0c9cfdd044e6eccaa8088292e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch sci-geosciences/qgis/qgis-2.18.2-r1.ebuild sci-geosciences/qgis/qgis-2.18.2-r2.ebuild sci-geosciences/qgis/qgis-2.18.3.ebuild X-VCS-Directories: sci-geosciences/qgis/files/ sci-geosciences/qgis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9cafc514db126ff0c9cfdd044e6eccaa8088292e X-VCS-Branch: master Date: Sun, 19 Feb 2017 14:55:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d32bfc27-b271-4df7-a928-7bffb52ebd5a X-Archives-Hash: fe44cb459e4d18be3b044d07724d4a29 commit: 9cafc514db126ff0c9cfdd044e6eccaa8088292e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 19 12:23:45 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 19 14:45:28 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cafc514 sci-geosciences/qgis: Drop old Package-Manager: portage-2.3.3 .../qgis/files/qgis-2.12.0-no-pyqtconfig.patch | 23 --- sci-geosciences/qgis/qgis-2.18.2-r1.ebuild | 178 ------------------- sci-geosciences/qgis/qgis-2.18.2-r2.ebuild | 181 ------------------- sci-geosciences/qgis/qgis-2.18.3.ebuild | 197 --------------------- 4 files changed, 579 deletions(-) diff --git a/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch deleted file mode 100644 index 24fe7bff6c..0000000000 --- a/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur qgis-2.12.0.orig/python/console/console.py qgis-2.12.0/python/console/console.py ---- qgis-2.12.0.orig/python/console/console.py -+++ qgis-2.12.0/python/console/console.py -@@ -25,7 +25,6 @@ - QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, \ - QDesktopServices - from PyQt4.QtGui import QVBoxLayout --from PyQt4 import pyqtconfig - from qgis.utils import iface - from console_sci import ShellScintilla - from console_output import ShellOutputScintilla -@@ -482,10 +481,7 @@ - self.lineEditFind = QgsFilterLineEdit() - placeHolderTxt = QCoreApplication.translate("PythonConsole", "Enter text to find...") - -- if pyqtconfig.Configuration().qt_version >= 0x40700: -- self.lineEditFind.setPlaceholderText(placeHolderTxt) -- else: -- self.lineEditFind.setToolTip(placeHolderTxt) -+ self.lineEditFind.setPlaceholderText(placeHolderTxt) - self.findNextButton = QToolButton() - self.findNextButton.setEnabled(False) - toolTipfindNext = QCoreApplication.translate("PythonConsole", "Find Next") diff --git a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild deleted file mode 100644 index 1add6e5a97..0000000000 --- a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 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,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,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] ) - ( x11-libs/qwt:5[svg] =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-4.1.0 - 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_prepare() { - default - - 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" - 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" - 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 -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild deleted file mode 100644 index f85044f398..0000000000 --- a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 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,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] ) - ( x11-libs/qwt:5[svg] =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-db/spatialite-4.1.0 - 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_prepare() { - default - - 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" - 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 16 images/icons/qgis-icon-16x16.png qgis.png - newicon -s 512 images/icons/qgis-icon.png qgis.png - newicon -s scalable images/icons/qgis_icon.svg qgis.svg - 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" - 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 -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild deleted file mode 100644 index 051afe8115..0000000000 --- a/sci-geosciences/qgis/qgis-2.18.3.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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/qtsvg:4 - dev-qt/qtsql:4 - >=sci-libs/gdal-1.6.1:=[geos,oracle?,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(+)] ) - ( x11-libs/qwt:5[svg] =sci-geosciences/grass-7.0.0:= ) - mapserver? ( dev-libs/fcgi ) - oracle? ( dev-db/oracle-instantclient:= ) - 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}] - =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 - 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 -}