Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/
Date: Tue, 04 Oct 2016 19:41:41
Message-Id: 1475610060.155aebfc2c92f6eea70f2ee70c2497ce47b91243.amynka@gentoo
1 commit: 155aebfc2c92f6eea70f2ee70c2497ce47b91243
2 Author: Amy Winston <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 4 19:41:00 2016 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 4 19:41:00 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155aebfc
7
8 sci-geosciences/merkaartor: remove old version
9
10 Package-Manager: portage-2.2.28
11
12 sci-geosciences/merkaartor/Manifest | 1 -
13 .../merkaartor/merkaartor-0.17.2.ebuild | 69 ----------------------
14 2 files changed, 70 deletions(-)
15
16 diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
17 index ed07d72..c012668 100644
18 --- a/sci-geosciences/merkaartor/Manifest
19 +++ b/sci-geosciences/merkaartor/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
22 DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d WHIRLPOOL fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
23 DIST merkaartor-0.18.2.tar.gz 6267866 SHA256 9e04d554ebc4f9999d0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 SHA512 577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d WHIRLPOOL 00ae2547625442697d74084ea939e8d5ca588aeed3d67d82e2239ebfe2bd33703ad51871c4e4e38353c2692eb14a63664af5eddbeed2c6862b20122d0f5fbb0d
24 DIST merkaartor-0.18.3.tar.gz 7104234 SHA256 d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915 WHIRLPOOL 6013770bfbde1360afc8106bc3ba250228e5c864483efa402033055ab0376c41b661ac188783b79a639ecb1404e38d28dc554bbbb923dc5fd17c24cefd3e192d
25
26 diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
27 deleted file mode 100644
28 index 70efafc..00000000
29 --- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
30 +++ /dev/null
31 @@ -1,69 +0,0 @@
32 -# Copyright 1999-2015 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI=4
37 -
38 -REDMINE_HASH="253"
39 -
40 -inherit multilib qt4-r2 ${SCM_ECLASS}
41 -
42 -DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
43 -HOMEPAGE="http://www.merkaartor.be"
44 -SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="0"
48 -
49 -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
50 -KEYWORDS="~amd64 ~x86"
51 -
52 -IUSE="debug exif gps nls libproxy"
53 -
54 -QT_MINIMAL="4.7.2"
55 -DEPEND="
56 - >=dev-libs/boost-1.46
57 - >=sci-libs/gdal-1.6.0
58 - >=sci-libs/proj-4.6
59 - >=dev-qt/qtgui-${QT_MINIMAL}:4
60 - >=dev-qt/qtsvg-${QT_MINIMAL}:4
61 - >=dev-qt/qtwebkit-${QT_MINIMAL}:4
62 - exif? ( media-gfx/exiv2 )
63 - gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
64 - libproxy? ( net-libs/libproxy )
65 -"
66 -RDEPEND="${DEPEND}"
67 -
68 -DOCS="AUTHORS CHANGELOG HACKING"
69 -
70 -PATCHES=(
71 - "${FILESDIR}/${PV}-includes.patch"
72 - "${FILESDIR}/${PV}-libproxy.patch"
73 -)
74 -
75 -merkaartor_use() {
76 - local useflag=${1}
77 - [[ -z ${useflag} ]] && die "No useflag specified"
78 - if use ${useflag}; then
79 - echo "1"
80 - else
81 - echo "0"
82 - fi
83 -}
84 -
85 -src_configure() {
86 - local myconf
87 - myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
88 - myconf+=" GEOIMAGE=$(${PN}_use exif)"
89 - myconf+=" GPSDLIB=$(${PN}_use gps)"
90 - myconf+=" LIBPROXY=$(${PN}_use libproxy)"
91 - myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
92 - myconf+=" NOUSEWEBKIT=0" # fails to link if disabled, upstream needs to fix
93 - myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671
94 -
95 - if use nls; then
96 - lrelease src/src.pro || die "lrelease failed"
97 - fi
98 -
99 - eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf}
100 -}