1 |
commit: ace87f9e81825c100b6a4dc1479bbd46db67dcab |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 2 21:00:28 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 2 21:19:18 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace87f9e |
7 |
|
8 |
app-cdr/mirage2iso: Bump to EAPI 6, clean up |
9 |
|
10 |
...iso-0.4.1.ebuild => mirage2iso-0.4.1-r1.ebuild} | 14 +++---- |
11 |
app-cdr/mirage2iso/mirage2iso-9999.ebuild | 46 +++++++--------------- |
12 |
2 files changed, 21 insertions(+), 39 deletions(-) |
13 |
|
14 |
diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild |
15 |
similarity index 83% |
16 |
rename from app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild |
17 |
rename to app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild |
18 |
index 22b637f..bc44d40 100644 |
19 |
--- a/app-cdr/mirage2iso/mirage2iso-0.4.1.ebuild |
20 |
+++ b/app-cdr/mirage2iso/mirage2iso-0.4.1-r1.ebuild |
21 |
@@ -1,10 +1,8 @@ |
22 |
-# Copyright 1999-2015 Gentoo Foundation |
23 |
+# Copyright 1999-2016 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
# $Id$ |
26 |
|
27 |
-EAPI=5 |
28 |
- |
29 |
-inherit autotools-utils versionator |
30 |
+EAPI=6 |
31 |
|
32 |
TESTS_PV=0.3 |
33 |
|
34 |
@@ -27,15 +25,17 @@ DEPEND="${COMMON_DEPEND} |
35 |
RDEPEND="${COMMON_DEPEND} |
36 |
pinentry? ( app-crypt/pinentry )" |
37 |
|
38 |
+RESTRICT="!test? ( test )" |
39 |
+ |
40 |
src_configure() { |
41 |
- myeconfargs=( |
42 |
+ local myconf=( |
43 |
$(use_with pinentry libassuan) |
44 |
) |
45 |
|
46 |
- autotools-utils_src_configure |
47 |
+ econf "${myconf[@]}" |
48 |
} |
49 |
|
50 |
src_test() { |
51 |
mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die |
52 |
- autotools-utils_src_test |
53 |
+ default |
54 |
} |
55 |
|
56 |
diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild |
57 |
index 55d9c69..327133a 100644 |
58 |
--- a/app-cdr/mirage2iso/mirage2iso-9999.ebuild |
59 |
+++ b/app-cdr/mirage2iso/mirage2iso-9999.ebuild |
60 |
@@ -1,60 +1,42 @@ |
61 |
-# Copyright 1999-2014 Gentoo Foundation |
62 |
+# Copyright 1999-2016 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
# $Id$ |
65 |
|
66 |
-EAPI=5 |
67 |
+EAPI=6 |
68 |
|
69 |
-#if LIVE |
70 |
-AUTOTOOLS_AUTORECONF=yes |
71 |
EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git" |
72 |
- |
73 |
-inherit git-r3 |
74 |
-#endif |
75 |
- |
76 |
-inherit autotools-utils versionator |
77 |
- |
78 |
-TESTS_PV=0.3 |
79 |
+inherit autotools git-r3 |
80 |
|
81 |
DESCRIPTION="CD/DVD image converter using libmirage" |
82 |
HOMEPAGE="https://bitbucket.org/mgorny/mirage2iso/" |
83 |
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2 |
84 |
- test? ( https://www.bitbucket.org/mgorny/${PN}/downloads/${PN}-${TESTS_PV}-tests.tar.xz )" |
85 |
+SRC_URI="" |
86 |
|
87 |
LICENSE="BSD" |
88 |
SLOT="0" |
89 |
-KEYWORDS="~amd64 ~x86" |
90 |
+KEYWORDS="" |
91 |
IUSE="pinentry test" |
92 |
|
93 |
COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0= |
94 |
dev-libs/glib:2= |
95 |
pinentry? ( dev-libs/libassuan:0= )" |
96 |
DEPEND="${COMMON_DEPEND} |
97 |
+ dev-libs/libassuan |
98 |
virtual/pkgconfig |
99 |
test? ( app-arch/xz-utils )" |
100 |
RDEPEND="${COMMON_DEPEND} |
101 |
pinentry? ( app-crypt/pinentry )" |
102 |
|
103 |
-#if LIVE |
104 |
-DEPEND="${DEPEND} |
105 |
- dev-libs/libassuan" |
106 |
-KEYWORDS= |
107 |
-SRC_URI= |
108 |
-#endif |
109 |
+RESTRICT="!test? ( test )" |
110 |
+ |
111 |
+src_prepare() { |
112 |
+ default |
113 |
+ eautoreconf |
114 |
+} |
115 |
|
116 |
src_configure() { |
117 |
- myeconfargs=( |
118 |
+ local myconf=( |
119 |
$(use_with pinentry libassuan) |
120 |
) |
121 |
|
122 |
- autotools-utils_src_configure |
123 |
-} |
124 |
- |
125 |
-src_test() { |
126 |
-#if LIVE |
127 |
- autotools-utils_src_test |
128 |
- return ${?} |
129 |
- |
130 |
-#endif |
131 |
- mv "${WORKDIR}"/${PN}-${TESTS_PV}/tests/* tests/ || die |
132 |
- autotools-utils_src_test |
133 |
+ econf "${myconf[@]}" |
134 |
} |