sci-geosciences/merkaartor: Drop unnecessary REQUIRED_USE, simplify

Removes another possible blocker for users and one line from plasma
profile package.use.

metadata.xml: Indentation

Package-Manager: portage-2.3.0

Signed-off-by: Ettore Di Giacinto <mudler@gentoo.org>

diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
new file mode 100644 (file)
index 0000000..6765950
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 fdo-mime gnome2-utils l10n qmake-utils
+
+DESCRIPTION="A 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 qrcode qt5"
+
+REQUIRED_USE="qrcode? ( !qt5 )"
+
+RDEPEND="
+       !qt5? (
+               dev-qt/qtcore:4
+               dev-qt/qtgui:4
+               dev-qt/qtsingleapplication[qt4]
+               dev-qt/qtsvg:4
+               dev-qt/qtwebkit:4
+       )
+       qt5? (
+               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.13[cxx] )
+       libproxy? ( net-libs/libproxy )
+       qrcode? ( media-gfx/zbar[qt4] )
+"
+DEPEND="${RDEPEND}
+       qt5? ( dev-qt/linguist-tools )
+       virtual/pkgconfig
+"
+
+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
+               if use qt5 ; then
+                       $(qt5_get_bindir)/lrelease src/src.pro || die
+               else
+                       $(qt4_get_bindir)/lrelease src/src.pro || die
+               fi
+       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
+       if use qt5 ; then
+               eqmake5 \
+               PREFIX="${ED}usr" \
+               LIBDIR="${ED}usr/$(get_libdir)" \
+               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="$(usex qrcode '1' '0')" \
+               Merkaartor.pro
+       else
+               eqmake4 \
+               PREFIX="${ED}usr" \
+               LIBDIR="${ED}usr/$(get_libdir)" \
+               TRANSDIR_MERKAARTOR="${ED}usr/share/${PN}/translations" \
+               TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/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="$(usex qrcode '1' '0')" \
+               Merkaartor.pro
+       fi
+}
+
+pkg_preinst() {
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       fdo-mime_desktop_database_update
+       gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+       fdo-mime_desktop_database_update
+       gnome2_icon_cache_update
+}

diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 418a660fbfe81714a8c31d216e507cbce86677a3..ac3993f6272343ab1c6fa3ad7110b40ab15d357f 100644 (file)
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-geosciences@gentoo.org</email>
-    <name>Gentoo Geosciences Project</name>
-  </maintainer>
-  <use>
-    <flag name="libproxy">
-       Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration
-       </flag>
-    <flag name="qrcode">
-    Enable QR code scanning with <pkg>media-gfx/zbar</pkg>
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="github">openstreetmap/merkaartor</remote-id>
-  </upstream>
+       <maintainer type="project">
+               <email>sci-geosciences@gentoo.org</email>
+               <name>Gentoo Geosciences Project</name>
+       </maintainer>
+       <use>
+               <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration</flag>
+               <flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
+       </use>
+       <upstream>
+               <remote-id type="github">openstreetmap/merkaartor</remote-id>
+       </upstream>
 </pkgmetadata>