gentoo resync : 08.08.2018

3 files changed, 121 insertions, 0 deletions

diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index 81b9de14e8b9..66d924ea4038 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -1,4 +1,6 @@
+AUX merkaartor-0.18.3-sharedir-pluginsdir.patch 722 BLAKE2B 294f5ff4d2da45d441948fdcf2b642971bdb3ea5fa2649bbe9827fdc50ab72ca77ea6f2c80d690794a9ea539bda91eea1ec34fc98ec073d49cf933002df68747 SHA512 5e2b1d4a8d4294785b59ea3631e7f086c2d52ab8752574872088ae4cb26c5b11851ab1c597a53012797b6ec7c5d9c1012037baf9cfc4135b06542365c5eb60c9
 DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
 EBUILD merkaartor-0.18.3-r2.ebuild 2096 BLAKE2B 3d3cd7dccd7e89246e288b3df729fd7c21c7d0ce8126594e2e49ea6531c535248033f56f19df867efeec46605c33f8cd2d4506028632d630d0f9b0963d8e09d5 SHA512 8b993b269a2800e47cd86d29e0f91f3e6f98f1c2c52074b58f6bd2b64f0facb3584074612230d88c2d2ab134ac976a9a6c27d79dba20d9a06dcd19c8146e04ee
+EBUILD merkaartor-0.18.3-r3.ebuild 2257 BLAKE2B 54f02ae8d223a955d5e51f5675a25f0309e33cfa7e4118514ee2641b25c99eb60391a1e180c8e9f8cb9c0a9a191809c7f75cfcf804b85831cacb78844dc22d5f SHA512 b7dc364577288741999f114a5d8a1b39d57727b9ef062e27ad479fda9cf1e9393197ed785a3ad14f3117ba0708a8875cea714b1c64bff282d44e8695860313a7
 EBUILD merkaartor-9999.ebuild 2160 BLAKE2B 4fd3917aa1d03f235f79db008a33b056625e8e56232f614eb581924475eee67fe78d91882913868c57b2d0d07d20153c6574a0390052718ca1a65eb182404ebb SHA512 cc487da0ad47cbcea5b107d92fd17a8bc973292c1135ae590f456d99346adec5288dc8f53ce15b16ad4377e93ccce670a67c3bea455ea4c7402c23b2311f89e9
 MISC metadata.xml 575 BLAKE2B d9a30a01f5b6c55e9a4865f6f1aa92ea610ad2f1aa9ab1bcb129dfbf03f9579fe7f3d8bdf604da0564b4d53b65d54b8c32f3628f1e8e389f6368d14cfca9997b SHA512 d9e5293c9bf7a3bfc7fd691d5a61c7de6c284941da73883590e4956bb4a7b26215e003a9096b9fdaa1f7590765aad583bec04ad6ec8778bc4a26a422a3e2da38
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
new file mode 100644
index 000000000000..46f5964e17cb
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-sharedir-pluginsdir.patch
@@ -0,0 +1,28 @@
+--- a/src/src.pro	2018-08-05 13:25:02.761849538 +0100
++++ b/src/src.pro	2018-08-05 13:25:55.935846789 +0100
+@@ -155,8 +155,10 @@
+     isEmpty( LIBDIR ) {
+         LIBDIR = $${PREFIX}/lib${LIB_SUFFIX}
+     }
+-
+-    DEFINES += PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
++    isEmpty( PLUGINS_DIR ){
++	PLUGINS_DIR=$${LIBDIR}/merkaartor/plugins
++    }
++    DEFINES += PLUGINS_DIR=$${PLUGINS_DIR}
+ 
+     target.path = $${PREFIX}/bin
+     SHARE_DIR = $${PREFIX}/share/merkaartor
+
+--- a/src/src.pro	2018-08-05 16:20:33.759305219 +0100
++++ b/src/src.pro	2018-08-05 16:20:53.094304220 +0100
+@@ -181,7 +181,7 @@
+ 
+ 
+ 
+-DEFINES += SHARE_DIR=$${SHARE_DIR}
++DEFINES += SHARE_DIR=$${SHARE_DIR_PATH}
+ INSTALLS += target
+ 
+ win32-msvc* {
+
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
new file mode 100644
index 000000000000..19e627bdad45
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
+
+inherit gnome2-utils l10n qmake-utils xdg-utils
+
+DESCRIPTION="Qt based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	>=sci-libs/gdal-1.6.0
+	>=sci-libs/proj-4.6
+	sys-libs/zlib
+	exif? ( media-gfx/exiv2:= )
+	gps? ( >=sci-geosciences/gpsd-3.17-r2 )
+	libproxy? ( net-libs/libproxy )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+PATCHES=( "${FILESDIR}/${P}-sharedir-pluginsdir.patch" ) # bug 621826
+DOCS=( AUTHORS CHANGELOG )
+
+src_prepare() {
+	default
+
+	my_rm_loc() {
+		sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+		rm "translations/${PN}_${1}.ts" || die
+	}
+
+	if [[ -n "$(l10n_get_locales)" ]]; then
+		l10n_for_each_disabled_locale_do my_rm_loc
+		$(qt5_get_bindir)/lrelease src/src.pro || die
+	fi
+
+	# build system expects to be building from git
+	sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
+}
+
+src_configure() {
+	# TRANSDIR_SYSTEM is for bug #385671
+	eqmake5 \
+		PREFIX="${ED%/}/usr" \
+		LIBDIR="${ED%/}/usr/$(get_libdir)" \
+		PLUGINS_DIR="/usr/$(get_libdir)/plugins" \
+		SHARE_DIR_PATH="/usr/share/${PN}" \
+		TRANSDIR_MERKAARTOR="${ED%/}/usr/share/${PN}/translations" \
+		TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
+		SYSTEM_QTSA=1 \
+		RELEASE=1 \
+		NODEBUG="$(usex debug '0' '1')" \
+		GEOIMAGE="$(usex exif '1' '0')" \
+		GPSDLIB="$(usex gps '1' '0')" \
+		LIBPROXY="$(usex libproxy '1' '0')" \
+		ZBAR=0 \
+		Merkaartor.pro
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}