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 251A3139696 for ; Mon, 6 Mar 2017 23:55:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2242F21C06B; Mon, 6 Mar 2017 23:55:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E349621C06B for ; Mon, 6 Mar 2017 23:55:00 +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 64FA434105A for ; Mon, 6 Mar 2017 23:54:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDCE65EE4 for ; Mon, 6 Mar 2017 23:54:57 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1488844449.e106187a132852c135da81fc6d7e54d07958805f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gebabbel/, sci-geosciences/gebabbel/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch sci-geosciences/gebabbel/gebabbel-0.4.ebuild sci-geosciences/gebabbel/metadata.xml X-VCS-Directories: sci-geosciences/gebabbel/files/ sci-geosciences/gebabbel/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e106187a132852c135da81fc6d7e54d07958805f X-VCS-Branch: master Date: Mon, 6 Mar 2017 23:54:57 +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: 59c8a5c5-8244-45ab-8ca9-7956beb51e70 X-Archives-Hash: 1ef86b3e8dadf70811140b53ce41c7ae commit: e106187a132852c135da81fc6d7e54d07958805f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 6 23:07:08 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 6 23:54:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e106187a sci-geosciences/gebabbel: Bump to EAPI 6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../gebabbel/files/gebabbel-0.3-gcc45.patch | 4 ++-- sci-geosciences/gebabbel/gebabbel-0.4.ebuild | 22 +++++++++++++--------- sci-geosciences/gebabbel/metadata.xml | 14 +++++++------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch index e8064e366c9..f8e7b47f338 100644 --- a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch +++ b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch @@ -2,8 +2,8 @@ Fixing build with gcc 4.5 http://bugs.gentoo.org/show_bug.cgi?id=318579 ---- src/MyMainWindow.cpp -+++ src/MyMainWindow.cpp +--- a/src/MyMainWindow.cpp ++++ b/src/MyMainWindow.cpp @@ -219,7 +219,7 @@ // Creating the toolbar diff --git a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild index 671a59af4e3..38141acd13b 100644 --- a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild +++ b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 MY_P=${P/g/G} -inherit eutils qt4-r2 +inherit qmake-utils -DESCRIPTION="QT-Frontend to load and convert gps tracks with gpsbabel" +DESCRIPTION="Qt-Frontend to load and convert gps tracks with gpsbabel" HOMEPAGE="http://gebabbel.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${MY_P}-Src.tar.gz" @@ -24,21 +24,25 @@ RDEPEND="${DEPEND} sci-geosciences/gpsbabel " -PATCHES=( - "${FILESDIR}"/${PN}-0.3-gcc45.patch -) +DOCS=( CHANGELOG CREDITS ) + +PATCHES=( "${FILESDIR}"/${PN}-0.3-gcc45.patch ) S=${WORKDIR}/${MY_P} src_prepare() { - qt4-r2_src_prepare + default # do not mess with cflags sed \ -e "/QMAKE_CXXFLAGS/s:=.*$:= ${CXXFLAGS}:g" \ -i *.pro || die } +src_configure() { + eqmake4 Gebabbel.pro +} + src_install() { dobin bin/${PN} - dodoc CHANGELOG CREDITS + einstalldocs } diff --git a/sci-geosciences/gebabbel/metadata.xml b/sci-geosciences/gebabbel/metadata.xml index 35ccac22a7a..e9dd5e2e89a 100644 --- a/sci-geosciences/gebabbel/metadata.xml +++ b/sci-geosciences/gebabbel/metadata.xml @@ -1,11 +1,11 @@ - - sci-geosciences@gentoo.org - Gentoo Geosciences Project - - - gebabbel - + + sci-geosciences@gentoo.org + Gentoo Geosciences Project + + + gebabbel +