From ace87f9e81825c100b6a4dc1479bbd46db67dcab Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sat, 2 Jul 2016 23:00:28 +0200
Subject: app-cdr/mirage2iso: Bump to EAPI 6, clean up

---
 app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild | 41 ++++++++++++++++++++++++
 app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild    | 41 ------------------------
 app-cdr/mirage2iso/mirage2iso-9999.ebuild     | 46 ++++++++-------------------
 3 files changed, 55 insertions(+), 73 deletions(-)
 create mode 100644 app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild
 delete mode 100644 app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild

(limited to 'app-cdr/mirage2iso')

diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..bc44d40c5e43
--- /dev/null
+++ b/app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+TESTS_PV=0.3
+
+DESCRIPTION="CD/DVD image converter using libmirage"
+HOMEPAGE="https://bitbucket.org/mgorny/mirage2iso/"
+SRC_URI="https://bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2
+	test? ( https://bitbucket.org/mgorny/${PN}/downloads/${PN}-${TESTS_PV}-tests.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pinentry test"
+
+COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
+	dev-libs/glib:2=
+	pinentry? ( dev-libs/libassuan:0= )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	test? ( app-arch/xz-utils )"
+RDEPEND="${COMMON_DEPEND}
+	pinentry? ( app-crypt/pinentry )"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local myconf=(
+		$(use_with pinentry libassuan)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die
+	default
+}
diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild
deleted file mode 100644
index 22b637fd1ebb..000000000000
--- a/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils versionator
-
-TESTS_PV=0.3
-
-DESCRIPTION="CD/DVD image converter using libmirage"
-HOMEPAGE="https://bitbucket.org/mgorny/mirage2iso/"
-SRC_URI="https://bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2
-	test? ( https://bitbucket.org/mgorny/${PN}/downloads/${PN}-${TESTS_PV}-tests.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pinentry test"
-
-COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
-	dev-libs/glib:2=
-	pinentry? ( dev-libs/libassuan:0= )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( app-arch/xz-utils )"
-RDEPEND="${COMMON_DEPEND}
-	pinentry? ( app-crypt/pinentry )"
-
-src_configure() {
-	myeconfargs=(
-		$(use_with pinentry libassuan)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_test() {
-	mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die
-	autotools-utils_src_test
-}
diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild
index 55d9c696e8a9..327133abc325 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[@]}"
 }
-- 
cgit v1.2.3-65-gdbad