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 1E156138330 for ; Tue, 4 Oct 2016 19:41:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52071E0AA9; Tue, 4 Oct 2016 19:41:39 +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 2377EE0AA9 for ; Tue, 4 Oct 2016 19:41:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 4660A34102D for ; Tue, 4 Oct 2016 19:41:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCF3624A0 for ; Tue, 4 Oct 2016 19:41:34 +0000 (UTC) From: "Amy Winston" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Amy Winston" Message-ID: <1475610060.155aebfc2c92f6eea70f2ee70c2497ce47b91243.amynka@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/merkaartor/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/merkaartor/Manifest sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild X-VCS-Directories: sci-geosciences/merkaartor/ X-VCS-Committer: amynka X-VCS-Committer-Name: Amy Winston X-VCS-Revision: 155aebfc2c92f6eea70f2ee70c2497ce47b91243 X-VCS-Branch: master Date: Tue, 4 Oct 2016 19:41:34 +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: 1b8a9b2d-e7e4-4de1-b123-08a76374b833 X-Archives-Hash: 234beef7c9e84867887f66aa337989b0 commit: 155aebfc2c92f6eea70f2ee70c2497ce47b91243 Author: Amy Winston gentoo org> AuthorDate: Tue Oct 4 19:41:00 2016 +0000 Commit: Amy Winston gentoo org> CommitDate: Tue Oct 4 19:41:00 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155aebfc sci-geosciences/merkaartor: remove old version Package-Manager: portage-2.2.28 sci-geosciences/merkaartor/Manifest | 1 - .../merkaartor/merkaartor-0.17.2.ebuild | 69 ---------------------- 2 files changed, 70 deletions(-) diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest index ed07d72..c012668 100644 --- a/sci-geosciences/merkaartor/Manifest +++ b/sci-geosciences/merkaartor/Manifest @@ -1,4 +1,3 @@ -DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487 DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d WHIRLPOOL fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c DIST merkaartor-0.18.2.tar.gz 6267866 SHA256 9e04d554ebc4f9999d0dd6d0cdf4e50a38135f34ded68f5dfd8cb295e20bf508 SHA512 577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d WHIRLPOOL 00ae2547625442697d74084ea939e8d5ca588aeed3d67d82e2239ebfe2bd33703ad51871c4e4e38353c2692eb14a63664af5eddbeed2c6862b20122d0f5fbb0d DIST merkaartor-0.18.3.tar.gz 7104234 SHA256 d6b3e4d982b2c7b82331bc5bc8d993d733c443250f02919c3c4dbd6924e6e947 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915 WHIRLPOOL 6013770bfbde1360afc8106bc3ba250228e5c864483efa402033055ab0376c41b661ac188783b79a639ecb1404e38d28dc554bbbb923dc5fd17c24cefd3e192d diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild deleted file mode 100644 index 70efafc..00000000 --- a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -REDMINE_HASH="253" - -inherit multilib qt4-r2 ${SCM_ECLASS} - -DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project" -HOMEPAGE="http://www.merkaartor.be" -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 -KEYWORDS="~amd64 ~x86" - -IUSE="debug exif gps nls libproxy" - -QT_MINIMAL="4.7.2" -DEPEND=" - >=dev-libs/boost-1.46 - >=sci-libs/gdal-1.6.0 - >=sci-libs/proj-4.6 - >=dev-qt/qtgui-${QT_MINIMAL}:4 - >=dev-qt/qtsvg-${QT_MINIMAL}:4 - >=dev-qt/qtwebkit-${QT_MINIMAL}:4 - exif? ( media-gfx/exiv2 ) - gps? ( >=sci-geosciences/gpsd-2.92[cxx] ) - libproxy? ( net-libs/libproxy ) -" -RDEPEND="${DEPEND}" - -DOCS="AUTHORS CHANGELOG HACKING" - -PATCHES=( - "${FILESDIR}/${PV}-includes.patch" - "${FILESDIR}/${PV}-libproxy.patch" -) - -merkaartor_use() { - local useflag=${1} - [[ -z ${useflag} ]] && die "No useflag specified" - if use ${useflag}; then - echo "1" - else - echo "0" - fi -} - -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=0" # fails to link if disabled, upstream needs to fix - myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671 - - if use nls; then - lrelease src/src.pro || die "lrelease failed" - fi - - eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf} -}