app-cdr/mirage2iso: Bump to EAPI 6, clean up

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 22b637fd1ebbbf478297fab945e2b4029934213e..bc44d40c5e437f20fb1436ef7c6f88ff28deab47 100644 (file)
--- 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 55d9c696e8a964fcc3060172e592e0324d606b88..327133abc32549de0dd54f7e6ff935c064f533a0 100644 (file)
--- 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[@]}"
 }