From e1c869e494ee8bd1d937942b5571a25a08769bf9 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 21 Dec 2017 03:24:43 +0100 Subject: [PATCH] sci-geosciences/qgis: Drop old Closes: https://bugs.gentoo.org/623780 Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- .../qgis/files/qgis-2.18.6-python.patch | 25 -- sci-geosciences/qgis/metadata.xml | 1 - sci-geosciences/qgis/qgis-2.18.12-r100.ebuild | 234 ------------------ 3 files changed, 260 deletions(-) delete mode 100644 sci-geosciences/qgis/files/qgis-2.18.6-python.patch delete mode 100644 sci-geosciences/qgis/qgis-2.18.12-r100.ebuild diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch b/sci-geosciences/qgis/files/qgis-2.18.6-python.patch deleted file mode 100644 index b8a812d3e4fa..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 13d8e30bbe0ee17fff32a3eba90cd217d277e5ac -Author: Marco Bernasocchi -Date: Wed Dec 7 19:08:24 2016 +1300 - - fix 2.18 build with Qt5 by executing pyuic - -diff --git a/scripts/pyuic-wrapper.sh b/scripts/pyuic-wrapper.sh -index d6fb497a84..aa146b31bb 100755 ---- a/scripts/pyuic-wrapper.sh -+++ b/scripts/pyuic-wrapper.sh -@@ -15,12 +15,12 @@ - ########################################################################### - - --PYUIC4=$1 -+PYUIC=$1 - LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH - PYTHONPATH=$3:$PYTHONPATH - PYTHON=$4 - shift 4 - - export LD_LIBRARY_PATH PYTHONPATH -- -+$PYUIC $@ - exec $PYTHON $(dirname $0)/pyuic-wrapper.py $@ diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index c64b2c6468ee..511bb239d69d 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -19,6 +19,5 @@ Add support for sci-geosciences/grass Determines whether mapserver should be built Enable support for the polar coordinate system via x11-libs/qwtpolar - Enable support for touch input devices diff --git a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild b/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild deleted file mode 100644 index 2e8591032def..000000000000 --- a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5} ) -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 ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils -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" - -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[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtsvg:5 - dev-qt/qtsql:5 - dev-qt/qtwebkit: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}] ) - ) -" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - dev-qt/qtxmlpatterns: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=( - # TODO upstream - "${FILESDIR}/${PN}-2.18.6-featuresummary.patch" - "${FILESDIR}/${PN}-2.18.6-python.patch" - # Taken from redhat - "${FILESDIR}/${P}-sip.patch" - # git master - "${FILESDIR}/${P}-cmake-lib-suffix.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \ - -i CMakeLists.txt || die "Failed to fix lrelease path" - - sed -e "/QT_LRELEASE_EXECUTABLE/d" \ - -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \ - -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \ - -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake" - - 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 - -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)" - ) -# # FIXME: Re-add when segfaults were figured out upstream, bug #612070 -# -DWITH_QTWEBKIT=$(usex webkit) - - if has_version '