| 1 |
commit: 65b4a808b078382a71e50760970b371104843a52 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 5 14:50:05 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 5 15:17:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b4a808 |
| 7 |
|
| 8 |
dev-util/squashmerge: Bump to EAPI 7 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/squashmerge/squashmerge-0.1.ebuild | 15 ++++++--------- |
| 13 |
dev-util/squashmerge/squashmerge-9999.ebuild | 9 ++++----- |
| 14 |
2 files changed, 10 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/squashmerge/squashmerge-0.1.ebuild b/dev-util/squashmerge/squashmerge-0.1.ebuild |
| 17 |
index d4fc299daef..b85491ed942 100644 |
| 18 |
--- a/dev-util/squashmerge/squashmerge-0.1.ebuild |
| 19 |
+++ b/dev-util/squashmerge/squashmerge-0.1.ebuild |
| 20 |
@@ -1,9 +1,7 @@ |
| 21 |
-# Copyright 1999-2019 Gentoo Authors |
| 22 |
+# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=5 |
| 26 |
- |
| 27 |
-inherit autotools-utils |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
DESCRIPTION="dev-util/squashdelta delta merge tool" |
| 31 |
HOMEPAGE="https://github.com/mgorny/squashmerge/" |
| 32 |
@@ -13,6 +11,8 @@ LICENSE="BSD" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="~amd64 ~x86" |
| 35 |
IUSE="lz4 +lzo" |
| 36 |
+# SquashDelta does not make much sense without a compression algo. |
| 37 |
+REQUIRED_USE="|| ( lz4 lzo )" |
| 38 |
|
| 39 |
COMMON_DEPEND=" |
| 40 |
lz4? ( app-arch/lz4:0= ) |
| 41 |
@@ -21,16 +21,13 @@ RDEPEND="${COMMON_DEPEND} |
| 42 |
dev-util/xdelta:3" |
| 43 |
DEPEND=${COMMON_DEPEND} |
| 44 |
|
| 45 |
-# SquashDelta does not make much sense without a compression algo. |
| 46 |
-REQUIRED_USE="|| ( lz4 lzo )" |
| 47 |
- |
| 48 |
DOCS=( FORMAT ) |
| 49 |
|
| 50 |
src_configure() { |
| 51 |
- local myeconfargs=( |
| 52 |
+ local myconf=( |
| 53 |
$(use_enable lz4) |
| 54 |
$(use_enable lzo) |
| 55 |
) |
| 56 |
|
| 57 |
- autotools-utils_src_configure |
| 58 |
+ econf "${myconf[@]}" |
| 59 |
} |
| 60 |
|
| 61 |
diff --git a/dev-util/squashmerge/squashmerge-9999.ebuild b/dev-util/squashmerge/squashmerge-9999.ebuild |
| 62 |
index 14b136be618..3c0238bf3d4 100644 |
| 63 |
--- a/dev-util/squashmerge/squashmerge-9999.ebuild |
| 64 |
+++ b/dev-util/squashmerge/squashmerge-9999.ebuild |
| 65 |
@@ -1,7 +1,7 @@ |
| 66 |
-# Copyright 1999-2017 Gentoo Foundation |
| 67 |
+# Copyright 1999-2020 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
-EAPI=6 |
| 71 |
+EAPI=7 |
| 72 |
|
| 73 |
EGIT_REPO_URI="https://github.com/mgorny/${PN}.git" |
| 74 |
inherit autotools git-r3 |
| 75 |
@@ -14,6 +14,8 @@ LICENSE="BSD" |
| 76 |
SLOT="0" |
| 77 |
KEYWORDS="" |
| 78 |
IUSE="lz4 +lzo" |
| 79 |
+# SquashDelta does not make much sense without a compression algo. |
| 80 |
+REQUIRED_USE="|| ( lz4 lzo )" |
| 81 |
|
| 82 |
COMMON_DEPEND=" |
| 83 |
lz4? ( app-arch/lz4:0= ) |
| 84 |
@@ -22,9 +24,6 @@ RDEPEND="${COMMON_DEPEND} |
| 85 |
dev-util/xdelta:3" |
| 86 |
DEPEND=${COMMON_DEPEND} |
| 87 |
|
| 88 |
-# SquashDelta does not make much sense without a compression algo. |
| 89 |
-REQUIRED_USE="|| ( lz4 lzo )" |
| 90 |
- |
| 91 |
DOCS=( FORMAT ) |
| 92 |
|
| 93 |
src_prepare() { |
Archives