[patch] proj and QGIS verbumps

0001-qgis-3.6.0.patch (text/plain), 11.87 KB, created by Burak Arslan on 2019-03-11 22:06:39 UTC

From f30a330f55b84bdf3f88d4f491ed60fb2d68d606 Mon Sep 17 00:00:00 2001
From: Burak Arslan <[e-mail]>
Date: Tue, 12 Mar 2019 00:58:01 +0300
Subject: [PATCH] qgis-3.6.0

---
 sci-geosciences/qgis/Manifest          |   2 +-
 sci-geosciences/qgis/qgis-3.6.0.ebuild | 224 +++++++++++++++++++++++++
 sci-libs/proj/Manifest                 |   2 +
 sci-libs/proj/proj-4.9.3.ebuild        |  54 ++++++
 4 files changed, 281 insertions(+), 1 deletion(-)
 create mode 100644 sci-geosciences/qgis/qgis-3.6.0.ebuild
 create mode 100644 sci-libs/proj/proj-4.9.3.ebuild

diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index aa60e32de730..9c7d9163c39e 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,2 @@
 DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
+DIST qgis-3.6.0.tar.bz2 75342119 BLAKE2B 71b4b11c89b0bc1955ba895a65f662844e6e080d1ef1afdde28370ef8728fbbf0bdca87c7610bb7ea250b3697fb66c1315402164aefb4048bfc92ac585fff968 SHA512 435911cfbd78382611f1b8405c0e2e3d5dce1bf89ab76871a93ecd663da01135c86b5878880e14c27dc92a30fae182b41ccc80ed700f53ec82a86c657231928c
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/qgis-3.6.0.ebuild b/sci-geosciences/qgis/qgis-3.6.0.ebuild
new file mode 100644
index 000000000000..6330e6648edf
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.6.0.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python qml serialport webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+),ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	mapserver? ( dev-libs/fcgi )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	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/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,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-2.10.1[qt5(+),${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/sip:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	serialport? ( >=dev-qt/qtserialport-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# 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 -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
+}
+
+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
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=$(usex webkit)
+		-DWITH_QT5SERIALPORT=$(usex serialport)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu ${BUILD_DIR}/org.qgis.qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} linux/icons/${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
+	fi
+
+	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
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	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
+}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 26fe916b6afa..54f9fc0125e9 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -2,4 +2,6 @@ DIST proj-4.8.0-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de
 DIST proj-4.8.0.tar.gz 785279 BLAKE2B c0b71012128f395347f1233cca55c5d6af258bdc1d0c67ca8b847e8b69c2f6fead7176f69ae1546f45dddcd96e05c6409167b0c078029de0be1d7bc4e550edec SHA512 6076289f8bdf1ca3b76ea879d8c221a668fcb4a6deec7cf6a293c489dfe0b21c36da0c6ed2c7a0b8042436106e851018aa429b4731f4ff018fea2fdb8887ec76
 DIST proj-4.9.2-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
 DIST proj-4.9.2.tar.gz 874816 BLAKE2B a59a405298a7c8d5bcf3e1a29c5949b466fed5c3745d0f6d631fff3282f6135d6be21cd75c9b377692f4fb98ae6e10e75867fdeab868fdb49c1578073cd7e802 SHA512 34a506742bb27cbc7f5ee91ee7f8c7a27d0f5644a1dcfd11b1e59120040804b1621ddfa4212bff45a1c3fb85511e48ece21612e86033139bafbb50c165e77cda
+DIST proj-4.9.3-org_proj4_PJ.h 2960 BLAKE2B f5f367910490fb781a7ddb512e8eaae2d6de4fd1f5b8e9e1dc1b189959a57499174f6b1e90476f10cb4cb8860e069061eb8b507fbbb46b3e1e394df43f67561e SHA512 db2c2b8920ef1c0c56395480dd514e372d5385839ac553a36c92431f5662bb8ec47706489b5c12e0c4308967da58fc94b29a957ede627274ab685ab647151f2c
+DIST proj-4.9.3.tar.gz 921448 BLAKE2B 1055dbc3aeb7f6d27aa824f247cb53e860d813fd6c5338f0f97e35cb458e3f7742664f2bb4a78a04c78c9355462a6c0db2cb82087069a6545a89837915fc4ece SHA512 98e986fc5cb0dd13dc118923df096517ba32e17dd27b725fdbbcd4235b2f25527cf63c68672dc206730bf70924ddfbd2e60d3f4af7182634be79bdf4ca9ee2cb
 DIST proj-datumgrid-1.5.zip 2250131 BLAKE2B c83b5bab72b790c70fbf3b95782ba4e8e93e2accc93a0a8c06667908dc437de44aa3623799f685e020269090be103bac568fe6a9d73ce128b8af024ec1ca8442 SHA512 9d9a935b3e984721a1ceafac49c139d3c5d9923c5bcef5f57fec8028a043c86e7de8bad9c200fa38cd6d1bf27b32dd0126597d42fee793d055e686f090604bf3
diff --git a/sci-libs/proj/proj-4.9.3.ebuild b/sci-libs/proj/proj-4.9.3.ebuild
new file mode 100644
index 000000000000..8060368e57e4
--- /dev/null
+++ b/sci-libs/proj/proj-4.9.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="Proj.4 cartographic projection software"
+HOMEPAGE="http://trac.osgeo.org/proj/"
+SRC_URI="
+	http://download.osgeo.org/proj/${P}.tar.gz
+	http://download.osgeo.org/proj/${PN}-datumgrid-1.5.zip
+	http://disttrac.osgeo.org/proj/export/2647/trunk/proj/src/org_proj4_PJ.h -> ${P}-org_proj4_PJ.h
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="java static-libs"
+
+RDEPEND=""
+DEPEND="
+	app-arch/unzip
+	java? ( >=virtual/jdk-1.5 )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/nad || die
+	mv README README.NAD || die
+	cp "${DISTDIR}/${P}-org_proj4_PJ.h" "${S}/src/org_proj4_PJ.h" || die
+	unpack ${PN}-datumgrid-1.5.zip
+}
+
+src_configure() {
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		append-cflags "$(java-pkg_get-jni-cflags)"
+	fi
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with java jni)
+}
+
+src_install() {
+	default
+	cd nad || die
+	dodoc README.{NAD,NADUS}
+	insinto /usr/share/proj
+	insopts -m 755
+	doins test27 test83
+	insopts -m 644
+	doins pj_out27.dist pj_out83.dist
+	prune_libtool_files
+}
-- 
2.19.2