From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8FAB8138A7D for ; Sun, 23 Oct 2016 17:41:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5E09E080C; Sun, 23 Oct 2016 17:41:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B2DBE080C for ; Sun, 23 Oct 2016 17:41:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3909B341652 for ; Mon, 24 Oct 2016 08:52:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71A9F2FF for ; Sun, 23 Oct 2016 17:41:12 +0000 (UTC) From: "Ettore Di Giacinto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ettore Di Giacinto" Message-ID: <1477244435.855efdeb80592d86448b02a1b5cccfa5816040ee.mudler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/merkaartor/merkaartor-0.18.3-r1.ebuild sci-geosciences/merkaartor/metadata.xml X-VCS-Directories: sci-geosciences/merkaartor/ X-VCS-Committer: mudler X-VCS-Committer-Name: Ettore Di Giacinto X-VCS-Revision: 855efdeb80592d86448b02a1b5cccfa5816040ee X-VCS-Branch: master Date: Sun, 23 Oct 2016 17:41:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9c4378cf-5ae4-4b1d-acc0-826c952b3d1d X-Archives-Hash: 83036ed3acb00999cd51bcd56e2d0031 commit: 855efdeb80592d86448b02a1b5cccfa5816040ee Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Oct 22 20:17:21 2016 +0000 Commit: Ettore Di Giacinto gentoo org> CommitDate: Sun Oct 23 17:40:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855efdeb 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 gentoo.org> .../merkaartor/merkaartor-0.18.3-r1.ebuild | 122 +++++++++++++++++++++ sci-geosciences/merkaartor/metadata.xml | 26 ++--- 2 files changed, 133 insertions(+), 15 deletions(-) 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 index 00000000..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 418a660..ac3993f 100644 --- a/sci-geosciences/merkaartor/metadata.xml +++ b/sci-geosciences/merkaartor/metadata.xml @@ -1,19 +1,15 @@ - - sci-geosciences@gentoo.org - Gentoo Geosciences Project - - - - Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration - - - Enable QR code scanning with media-gfx/zbar - - - - openstreetmap/merkaartor - + + sci-geosciences@gentoo.org + Gentoo Geosciences Project + + + Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration + Enable QR code scanning with media-gfx/zbar + + + openstreetmap/merkaartor +