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 634011382DE for ; Sat, 2 Jul 2016 21:19:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC019E08D2; Sat, 2 Jul 2016 21:19: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 1E094E08D2 for ; Sat, 2 Jul 2016 21:19:39 +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 AF68A340D9E for ; Sat, 2 Jul 2016 21:19:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB43916C4 for ; Sat, 2 Jul 2016 21:19:35 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1467494358.ace87f9e81825c100b6a4dc1479bbd46db67dcab.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-cdr/mirage2iso/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild app-cdr/mirage2iso/mirage2iso-9999.ebuild X-VCS-Directories: app-cdr/mirage2iso/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ace87f9e81825c100b6a4dc1479bbd46db67dcab X-VCS-Branch: master Date: Sat, 2 Jul 2016 21:19:35 +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: 6b8ba2b7-371a-4b7f-8a09-ad6bd6e4d4d1 X-Archives-Hash: 50997345d3665ac15fbd975f68e4efb0 commit: ace87f9e81825c100b6a4dc1479bbd46db67dcab Author: Michał Górny gentoo org> AuthorDate: Sat Jul 2 21:00:28 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jul 2 21:19:18 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace87f9e app-cdr/mirage2iso: Bump to EAPI 6, clean up ...iso-0.4.1.ebuild => mirage2iso-0.4.1-r1.ebuild} | 14 +++---- app-cdr/mirage2iso/mirage2iso-9999.ebuild | 46 +++++++--------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild similarity index 83% rename from app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild rename to app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild index 22b637f..bc44d40 100644 --- a/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild +++ b/app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 - -inherit autotools-utils versionator +EAPI=6 TESTS_PV=0.3 @@ -27,15 +25,17 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} pinentry? ( app-crypt/pinentry )" +RESTRICT="!test? ( test )" + src_configure() { - myeconfargs=( + local myconf=( $(use_with pinentry libassuan) ) - autotools-utils_src_configure + econf "${myconf[@]}" } src_test() { mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die - autotools-utils_src_test + default } diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild index 55d9c69..327133a 100644 --- a/app-cdr/mirage2iso/mirage2iso-9999.ebuild +++ b/app-cdr/mirage2iso/mirage2iso-9999.ebuild @@ -1,60 +1,42 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -#if LIVE -AUTOTOOLS_AUTORECONF=yes EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git" - -inherit git-r3 -#endif - -inherit autotools-utils versionator - -TESTS_PV=0.3 +inherit autotools git-r3 DESCRIPTION="CD/DVD image converter using libmirage" HOMEPAGE="https://bitbucket.org/mgorny/mirage2iso/" -SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2 - test? ( https://www.bitbucket.org/mgorny/${PN}/downloads/${PN}-${TESTS_PV}-tests.tar.xz )" +SRC_URI="" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="" IUSE="pinentry test" COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0= dev-libs/glib:2= pinentry? ( dev-libs/libassuan:0= )" DEPEND="${COMMON_DEPEND} + dev-libs/libassuan virtual/pkgconfig test? ( app-arch/xz-utils )" RDEPEND="${COMMON_DEPEND} pinentry? ( app-crypt/pinentry )" -#if LIVE -DEPEND="${DEPEND} - dev-libs/libassuan" -KEYWORDS= -SRC_URI= -#endif +RESTRICT="!test? ( test )" + +src_prepare() { + default + eautoreconf +} src_configure() { - myeconfargs=( + local myconf=( $(use_with pinentry libassuan) ) - autotools-utils_src_configure -} - -src_test() { -#if LIVE - autotools-utils_src_test - return ${?} - -#endif - mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die - autotools-utils_src_test + econf "${myconf[@]}" }