jlec 15/03/31 13:15:04
Modified: merkaartor-0.18.1.ebuild merkaartor-0.17.2.ebuild
metadata.xml merkaartor-9999.ebuild ChangeLog
Added: merkaartor-0.18.1-r1.ebuild
Log:
Use system libs instead of bundled ones, bug #487512; thanks Nikoli for the
patch; update live ebuild to new repo location, bug #544862
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.3 sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild?r1=1.2&r2=1.3
Index: merkaartor-0.18.1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merkaartor-0.18.1.ebuild 2 Mar 2013 23:21:39 -0000 1.2
+++ merkaartor-0.18.1.ebuild 31 Mar 2015 13:15:04 -0000 1.3
@@ -1,25 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild,v
1.2 2013/03/02 23:21:39 hwoarang Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild,v
1.3 2015/03/31 13:15:04 jlec Exp $
EAPI=4
REDMINE_HASH="301"
-[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
-EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
-EGIT_PROJECT=${PN}
inherit multilib qt4-r2 ${SCM_ECLASS}
DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
HOMEPAGE="http://www.merkaartor.be";
-[[ ${PV} == 9999 ]] ||
SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2";
+SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
KEYWORDS="~amd64 ~x86"
IUSE="debug exif gps nls libproxy"
1.9 sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild?r1=1.8&r2=1.9
Index: merkaartor-0.17.2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merkaartor-0.17.2.ebuild 2 Mar 2013 23:21:39 -0000 1.8
+++ merkaartor-0.17.2.ebuild 31 Mar 2015 13:15:04 -0000 1.9
@@ -1,24 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v
1.8 2013/03/02 23:21:39 hwoarang Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild,v
1.9 2015/03/31 13:15:04 jlec Exp $
EAPI=4
REDMINE_HASH="253"
-[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
-EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
-EGIT_PROJECT=${PN}
+
inherit multilib qt4-r2 ${SCM_ECLASS}
DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
HOMEPAGE="http://www.merkaartor.be";
-[[ ${PV} == 9999 ]] ||
SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2";
+SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == 9999 ]] || \
KEYWORDS="~amd64 ~x86"
IUSE="debug exif gps nls libproxy"
1.7 sci-geosciences/merkaartor/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/metadata.xml?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/metadata.xml?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/metadata.xml?r1=1.6&r2=1.7
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml 23 Oct 2013 19:17:27 -0000 1.6
+++ metadata.xml 31 Mar 2015 13:15:04 -0000 1.7
@@ -3,7 +3,11 @@
<pkgmetadata>
<herd>sci-geosciences</herd>
<use>
- <flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting the
HTTP/HTTPS/SOCKS proxy configuration</flag>
- <flag name="webkit">Enable Webkit browser plugin using
<pkg>dev-qt/qtwebkit</pkg></flag>
+ <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>
</pkgmetadata>
1.16 sci-geosciences/merkaartor/merkaartor-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild?r1=1.15&r2=1.16
Index: merkaartor-9999.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- merkaartor-9999.ebuild 28 Feb 2015 17:39:49 -0000 1.15
+++ merkaartor-9999.ebuild 31 Mar 2015 13:15:04 -0000 1.16
@@ -1,67 +1,93 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v
1.15 2015/02/28 17:39:49 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-9999.ebuild,v
1.16 2015/03/31 13:15:04 jlec Exp $
-EAPI=4
+EAPI=5
-REDMINE_HASH="253"
-[[ ${PV} == 9999 ]] && SCM_ECLASS=git-2
-EGIT_REPO_URI="git://gitorious.org/merkaartor/main.git"
-EGIT_PROJECT=${PN}
-inherit multilib qt4-r2 ${SCM_ECLASS}
+PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
+
+inherit eutils fdo-mime gnome2-utils git-r3 l10n multilib qt4-r2
DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be";
-[[ ${PV} == 9999 ]] ||
SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2";
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor";
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git";
LICENSE="GPL-2"
SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps nls libproxy webkit"
+KEYWORDS=""
+IUSE="debug exif gps libproxy qrcode"
-QT_MINIMAL="4.7.2"
RDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ dev-qt/qtwebkit:4
+ >=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
+ >=dev-libs/quazip-0.7[qt4(+)]
>=sci-libs/gdal-1.6.0
>=sci-libs/proj-4.6
- >=dev-qt/qtgui-${QT_MINIMAL}:4
- >=dev-qt/qtsvg-${QT_MINIMAL}:4
- exif? ( media-gfx/exiv2 )
+ sys-libs/zlib
+ exif? ( media-gfx/exiv2:= )
gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
libproxy? ( net-libs/libproxy )
- webkit? ( >=dev-qt/qtwebkit-${QT_MINIMAL}:4 )
+ qrcode? ( media-gfx/zbar )
"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
>=dev-libs/boost-1.46
+ virtual/pkgconfig
"
-DOCS="AUTHORS CHANGELOG HACKING"
+DOCS=( AUTHORS CHANGELOG HACKING )
-MAKEOPTS+=" -j1"
+src_unpack() {
+ git-r3_src_unpack
+}
-merkaartor_use() {
- local useflag=${1}
- [[ -z ${useflag} ]] && die "No useflag specified"
- if use ${useflag}; then
- echo "1"
- else
- echo "0"
+src_prepare() {
+ my_rm_loc() {
+ sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::"
src/src.pro || die
+ rm "translations/${PN}_${1}.ts" || die
+ }
+
+ l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
+
+ if [[ -n "$(l10n_get_locales)" ]]; then
+ l10n_for_each_disabled_locale_do my_rm_loc
+ $(qt4_get_bindir)/lrelease src/src.pro || die
fi
+
+ epatch "${FILESDIR}"/${P}-system-libs.patch
+ epatch_user
}
src_configure() {
- local myconf
- myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
- myconf+=" GEOIMAGE=$(${PN}_use exif)"
- myconf+=" GPSDLIB=$(${PN}_use gps)"
- myconf+=" LIBPROXY=$(${PN}_use libproxy)"
- myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
- myconf+=" NOUSEWEBKIT=$(use webkit && echo "0" || echo "1")" # inverse
logic
- myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations
TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671
+ # TRANSDIR_SYSTEM is for bug #385671
+ eqmake4 \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" \
+ TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
+ SYSTEM_QTSA=1 \
+ SYSTEM_QUAZIP=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
+}
- if use nls; then
- lrelease src/src.pro || die "lrelease failed"
- fi
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
- eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf}
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
}
1.31 sci-geosciences/merkaartor/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.31&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?rev=1.31&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/ChangeLog?r1=1.30&r2=1.31
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog 28 Feb 2015 17:39:49 -0000 1.30
+++ ChangeLog 31 Mar 2015 13:15:04 -0000 1.31
@@ -1,6 +1,16 @@
# ChangeLog for sci-geosciences/merkaartor
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.30
2015/02/28 17:39:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.31
2015/03/31 13:15:04 jlec Exp $
+
+*merkaartor-0.18.1-r1 (31 Mar 2015)
+
+ 31 Mar 2015; Justin Lecher <[email protected]>
+ +files/merkaartor-0.18.1-system-libs.patch,
+ +files/merkaartor-9999-system-libs.patch, +merkaartor-0.18.1-r1.ebuild,
+ merkaartor-0.17.2.ebuild, merkaartor-0.18.1.ebuild, merkaartor-9999.ebuild,
+ metadata.xml:
+ Use system libs instead of bundled ones, bug #487512; thanks Nikoli for the
+ patch; update live ebuild to new repo location, bug #544862
28 Feb 2015; Agostino Sarubbo <[email protected]> merkaartor-9999.ebuild:
Move KEYWORDS to another line to avoid bug #399061
1.1 sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: merkaartor-0.18.1-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild,v
1.1 2015/03/31 13:15:04 jlec Exp $
EAPI=5
PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
inherit eutils fdo-mime gnome2-utils l10n multilib qt4-r2
DESCRIPTION="A Qt4 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"
RDEPEND="
dev-qt/qtcore:4
dev-qt/qtgui:4
dev-qt/qtsvg:4
dev-qt/qtwebkit:4
>=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
>=sci-libs/gdal-1.6.0
>=sci-libs/proj-4.6
sys-libs/zlib
exif? ( media-gfx/exiv2:= )
gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
libproxy? ( net-libs/libproxy )
qrcode? ( media-gfx/zbar )
"
DEPEND="${RDEPEND}
>=dev-libs/boost-1.46
virtual/pkgconfig
"
DOCS=( AUTHORS CHANGELOG HACKING )
src_prepare() {
my_rm_loc() {
sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::"
src/src.pro || die
rm "translations/${PN}_${1}.ts" || die
}
l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
if [[ -n "$(l10n_get_locales)" ]]; then
l10n_for_each_disabled_locale_do my_rm_loc
$(qt4_get_bindir)/lrelease src/src.pro || die
fi
epatch "${FILESDIR}"/${P}-system-libs.patch
epatch_user
}
src_configure() {
# TRANSDIR_SYSTEM is for bug #385671
eqmake4 \
PREFIX="${EPREFIX}/usr" \
LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
TRANSDIR_MERKAARTOR="${EPREFIX}/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
}
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
}
