summaryrefslogtreecommitdiff
path: root/dev-util/squashmerge
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-15 15:51:32 +0000
commit21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
treee1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-util/squashmerge
parent7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
gentoo resync : 15.01.2020
Diffstat (limited to 'dev-util/squashmerge')
-rw-r--r--dev-util/squashmerge/Manifest4
-rw-r--r--dev-util/squashmerge/squashmerge-0.1.ebuild17
-rw-r--r--dev-util/squashmerge/squashmerge-9999.ebuild9
3 files changed, 13 insertions, 17 deletions
diff --git a/dev-util/squashmerge/Manifest b/dev-util/squashmerge/Manifest
index 28c4f47a9f2d..95a90b074e72 100644
--- a/dev-util/squashmerge/Manifest
+++ b/dev-util/squashmerge/Manifest
@@ -1,4 +1,4 @@
DIST squashmerge-0.1.tar.bz2 76678 BLAKE2B 01e1a286081af8ac4f19c0c40c206f5d41c287b612e48750a6900d2a182dac31fbf1831e5e85891366c2edce6851f3d0128eda22b2e01f3b45594a06ee656b8b SHA512 a12e78d79a3f212a65c0b979a1ca3de9532ebf33f891ae2fd216425cd044a6f3357496e9f37bebc53a067aa592f7a1eecdeee653929eb443426e48fe342c7683
-EBUILD squashmerge-0.1.ebuild 762 BLAKE2B fa7ffc72dde14fee3a9ffd1086f2ebfaafca66a13b628ffa0c8eef0f80ee0f27651883d05fe127f0fdfcacbaadca58712429ec4f3ff504ffb1337113974cfb65 SHA512 45c8283e5b02e98cbd071d90b0b859d685c67ad13005846a1b3aa979e70d0e66e14b9e49ec299dac3118f31dc1d19eb9145c04937c43afe040d0de795252f66f
-EBUILD squashmerge-9999.ebuild 758 BLAKE2B 0d11cfa67239e6d928cd95534728a9574437f8851780969dec850feede9462b26431a960041311ea88eb548c0f365af1ea2aad9731f478a6414ef62cbee3aae2 SHA512 f62e8b4ff613c37a7f0446fdd24939cef4c40a1f836fce827d58451f2585166054d2220344f806e39f6fc4e3ef18044b28e8187f1a3228feb00b22fbb34a267a
+EBUILD squashmerge-0.1.ebuild 715 BLAKE2B f1c20fecfabf47d62348aa73589207ffc362e268e8d30abd412bfee856dfd5418f68afa4935b1d33d2c1dff27eb5e9906ccf89a40dbf404452748608278fd5af SHA512 f5e16d4ad89335e85e6e431ee076508e757772c5a0f09d770e11a420d4251b5b0e263fb00a0c36e085321c7494a5ca55d15eed75656b357e896cb4adfa2f1a4c
+EBUILD squashmerge-9999.ebuild 754 BLAKE2B 2e352dca7242fd06ff0b858b176bb5dfb5fbe33ada66818d1dfd6827e5b3dfd9898c7d5e737a1772baf2937b3f282e40ebba5959d8a4d7b37e4b7eb67bcecf4a SHA512 2f9df1418b4d79371511f12fd7a6450c2bd3f6672a50a40bc2406e9a867ee9890834e81434e35ab2f0539a09fb725266c71964db5fc2d5c16d2c32b53013e4f2
MISC metadata.xml 511 BLAKE2B 47b35730a38890b46d8f5b7eb5edb2f3825cceb5f14d662f2c0751a93ff0bbd1411ad6a12983caf5726791cc4a32ae0bc42e1a955970c1492c6679ddde89ffa4 SHA512 c9a260116a954e182965420724da8099b6b01857ba27895fe209308f8d1c0231cc468ca43794139abcae7bb2c403af339d21b98b193f40bfdbe23ae24efc119e
diff --git a/dev-util/squashmerge/squashmerge-0.1.ebuild b/dev-util/squashmerge/squashmerge-0.1.ebuild
index b2b4863ee107..b85491ed9427 100644
--- a/dev-util/squashmerge/squashmerge-0.1.ebuild
+++ b/dev-util/squashmerge/squashmerge-0.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit autotools-utils
+EAPI=7
DESCRIPTION="dev-util/squashdelta delta merge tool"
HOMEPAGE="https://github.com/mgorny/squashmerge/"
-SRC_URI="https://www.github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="lz4 +lzo"
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
COMMON_DEPEND="
lz4? ( app-arch/lz4:0= )
@@ -21,16 +21,13 @@ RDEPEND="${COMMON_DEPEND}
dev-util/xdelta:3"
DEPEND=${COMMON_DEPEND}
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
DOCS=( FORMAT )
src_configure() {
- local myeconfargs=(
+ local myconf=(
$(use_enable lz4)
$(use_enable lzo)
)
- autotools-utils_src_configure
+ econf "${myconf[@]}"
}
diff --git a/dev-util/squashmerge/squashmerge-9999.ebuild b/dev-util/squashmerge/squashmerge-9999.ebuild
index 14b136be6184..3c0238bf3d47 100644
--- a/dev-util/squashmerge/squashmerge-9999.ebuild
+++ b/dev-util/squashmerge/squashmerge-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
inherit autotools git-r3
@@ -14,6 +14,8 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS=""
IUSE="lz4 +lzo"
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
COMMON_DEPEND="
lz4? ( app-arch/lz4:0= )
@@ -22,9 +24,6 @@ RDEPEND="${COMMON_DEPEND}
dev-util/xdelta:3"
DEPEND=${COMMON_DEPEND}
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
DOCS=( FORMAT )
src_prepare() {