sci-geosciences/qgis: 2.18.12 version bump (qt4-based)

Fix lrelease/lupdate paths
Switch to xdg-utils
Fix x11-libs/qscintilla[qt4] .so subdir path

Tested-by: Andreas Plesch <andreasplesch@netscape.net>
Package-Manager: Portage-2.3.8, Repoman-2.3.3

4 files changed, 409 insertions, 0 deletions

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b922dbe13477..ec2e8bd6ae2f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
 DIST qgis-2.18.10.tar.bz2 84503710 SHA256 b2754daa6870008132702008c285dc94830e92ef0bd64e548ce5b47f2dec3fef SHA512 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 WHIRLPOOL ea983e6f0043df1484496c341ad905d672c55b548494ad9ae10ec0cf8731ecd148f0536a0557489a8d42cbe97bd91db261de868609bd4004997f35f7a00bee3d
+DIST qgis-2.18.12.tar.bz2 84936155 SHA256 7af709ac86bf7fb3350962beddd273f169ecfa6f3f60d3254c708a26a429023a SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea WHIRLPOOL 1b58189ade46b1f3d351939aa0b7fd9629fece8bcf419e967006833cad1aa6d799e036b12a856e92a4e3be6c2a768f693d430dffd5d3c706c84978f5b754fcd2
 DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
 DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch
new file mode 100644
index 000000000000..5a1e8fcd9551
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch
@@ -0,0 +1,11 @@
+--- a/cmake/PyQtMacros.cmake	2016-08-26 05:58:37.000000000 -0600
++++ b/cmake/PyQtMacros.cmake	2016-09-21 16:25:55.921411011 -0600
+@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
+   ELSE(WIN32)
+     # TODO osx
+     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
+-    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
++    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+   ENDIF(WIN32)
+ 
+   FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch b/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch
new file mode 100644
index 000000000000..07db9b029bf6
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch
@@ -0,0 +1,185 @@
+diff --git a/python/core/conversions.sip b/python/core/conversions.sip
+index f07d3ab1db..948821e91e 100644
+--- a/python/core/conversions.sip
++++ b/python/core/conversions.sip
+@@ -2041,3 +2041,178 @@ register_from_qvariant_convertor = (void (*)(FromQVariantConvertorFn))sipImportS
+ register_from_qvariant_convertor(null_from_qvariant_convertor);
+ %End
+ %End
++
++// QList<QVariant> is implemented as a Python list.
++%MappedType QList<QVariant> /TypeHintIn="Sequence[QVariant]", TypeHintOut="List[QVariant]", TypeHintValue="[]"/
++{
++%TypeHeaderCode
++#include <qlist.h>
++%End
++
++%ConvertFromTypeCode
++    // Create the list.
++    PyObject *l;
++
++    if ((l = PyList_New(sipCpp->size())) == NULL)
++        return NULL;
++
++    // Set the list elements.
++    for (int i = 0; i < sipCpp->size(); ++i)
++    {
++        QVariant *t = new QVariant(sipCpp->at(i));
++        PyObject *tobj;
++
++        if ((tobj = sipConvertFromNewType(t, sipType_QVariant, sipTransferObj)) == NULL)
++        {
++            Py_DECREF(l);
++            delete t;
++
++            return NULL;
++        }
++
++        PyList_SET_ITEM(l, i, tobj);
++    }
++
++    return l;
++%End
++
++%ConvertToTypeCode
++    SIP_SSIZE_T len;
++
++    // Check the type if that is all that is required.
++    if (sipIsErr == NULL)
++    {
++        if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
++            return 0;
++
++        for (SIP_SSIZE_T i = 0; i < len; ++i)
++        {
++            PyObject *itm = PySequence_ITEM(sipPy, i);
++            bool ok = (itm && sipCanConvertToType(itm, sipType_QVariant, SIP_NOT_NONE));
++
++            Py_XDECREF(itm);
++
++            if (!ok)
++                return 0;
++        }
++
++        return 1;
++    }
++
++    QList<QVariant> *ql = new QList<QVariant>;
++    len = PySequence_Size(sipPy);
++
++    for (SIP_SSIZE_T i = 0; i < len; ++i)
++    {
++        PyObject *itm = PySequence_ITEM(sipPy, i);
++        int state;
++        QVariant *t = reinterpret_cast<QVariant *>(sipConvertToType(itm, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++
++        Py_DECREF(itm);
++
++        if (*sipIsErr)
++        {
++            sipReleaseType(t, sipType_QVariant, state);
++
++            delete ql;
++            return 0;
++        }
++
++        ql->append(*t);
++
++        sipReleaseType(t, sipType_QVariant, state);
++    }
++
++    *sipCppPtr = ql;
++
++    return sipGetState(sipTransferObj);
++%End
++};
++
++
++// QList<QPolygonF> is implemented as a Python list.
++%MappedType QList<QPolygonF> /TypeHintIn="Sequence[QPolygonF]", TypeHintOut="List[QPolygonF]", TypeHintValue="[]"/
++{
++%TypeHeaderCode
++#include <qlist.h>
++%End
++
++%ConvertFromTypeCode
++    // Create the list.
++    PyObject *l;
++
++    if ((l = PyList_New(sipCpp->size())) == NULL)
++        return NULL;
++
++    // Set the list elements.
++    for (int i = 0; i < sipCpp->size(); ++i)
++    {
++        QPolygonF *t = new QPolygonF(sipCpp->at(i));
++        PyObject *tobj;
++
++        if ((tobj = sipConvertFromNewType(t, sipType_QPolygonF, sipTransferObj)) == NULL)
++        {
++            Py_DECREF(l);
++            delete t;
++
++            return NULL;
++        }
++
++        PyList_SET_ITEM(l, i, tobj);
++    }
++
++    return l;
++%End
++
++%ConvertToTypeCode
++    SIP_SSIZE_T len;
++
++    // Check the type if that is all that is required.
++    if (sipIsErr == NULL)
++    {
++        if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
++            return 0;
++
++        for (SIP_SSIZE_T i = 0; i < len; ++i)
++        {
++            PyObject *itm = PySequence_ITEM(sipPy, i);
++            bool ok = (itm && sipCanConvertToType(itm, sipType_QPolygonF, SIP_NOT_NONE));
++
++            Py_XDECREF(itm);
++
++            if (!ok)
++                return 0;
++        }
++
++        return 1;
++    }
++
++    QList<QPolygonF> *ql = new QList<QPolygonF>;
++    len = PySequence_Size(sipPy);
++
++    for (SIP_SSIZE_T i = 0; i < len; ++i)
++    {
++        PyObject *itm = PySequence_ITEM(sipPy, i);
++        int state;
++        QPolygonF *t = reinterpret_cast<QPolygonF *>(sipConvertToType(itm, sipType_QPolygonF, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++
++        Py_DECREF(itm);
++
++        if (*sipIsErr)
++        {
++            sipReleaseType(t, sipType_QPolygonF, state);
++
++            delete ql;
++            return 0;
++        }
++
++        ql->append(*t);
++
++        sipReleaseType(t, sipType_QPolygonF, state);
++    }
++
++    *sipCppPtr = ql;
++
++    return sipGetState(sipTransferObj);
++%End
++};
+-- 
+2.12.0
diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
new file mode 100644
index 000000000000..d0a0f6682394
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -0,0 +1,212 @@
+# 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 gnome2-utils python-single-r1 qmake-utils xdg-utils
+
+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="
+	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,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=(
+	# 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 -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=$(usex webkit)
+	)
+
+	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
+
+	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
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}