gentoo resync : 28.04.2021

3 files changed, 3 insertions, 56 deletions

diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 452d75f9c680..d4ac497c397f 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,5 +1,3 @@
-DIST poke-1.0.tar.gz 6698818 BLAKE2B 4f66e1e5f2aa1c33bf2b2b823e60662c98fe608f53526f5ea5117f84540c75b7f3196c53fd80858c10e12f3005ccce0ff9a457fba7b439f2fecd4c4bad061bfc SHA512 e7c567e5e14fdd5a45e9568c972ba7c93e2b8810428f16d608e638654890854e3dd49ba5f91c9c49bffe4cc846e1ba823fe1d4c9ac2673cde535cb46c24b5a62
-DIST poke-1.1.tar.gz 6754840 BLAKE2B bc7c8562ee918dec3d40219bf3d02220b9ec4934c816620c69d987446375bf69036dda12a91115404b9beed02200262429080320a66e7cc2358eba63a48d5b8d SHA512 ffcc7be254c326947b5e20bb8d659f6d0396bcef6fea8da1b47106dce1670703730d365a5090bfc2c31cf29c1cc7a3c6ad1b5d4022a1ebe1adbe43a33ff45baa
-EBUILD poke-1.0.ebuild 979 BLAKE2B 33b10895f02e85f773e705232d8e2cd063424c2c4cabbc0f29a9a812162decb18f50296d0becdd0dbc08a8becb0bd56f5491fd475cf625a322aad32f9b02f2c4 SHA512 a268a3ec5c3d271dd4857c6a4eb87c0abeb5211f9c09af8ee6ac1ae3d13fa9c2b267ac02b85181cc2590d1eae0ff1e7a961684ea1373656e49923644923ba6df
-EBUILD poke-1.1.ebuild 980 BLAKE2B 00367baac782efc93c38e4d87863fdbc3912a197c686b0944b39683bbdb3902c7ef0b0dd34b26a8b7bc85891b042e09a4256b06626fea59a36301c8c9470616f SHA512 50676247dc082fc7643fae9be0c860aa58bb5fb57a278ac28d4f699a2f6c21e1cbe4f480477b5ff91f937610af623670334b900fea6d11e299d65aa80062f5f4
+DIST poke-1.2.tar.gz 6772669 BLAKE2B 9b3c8c425145be7c93c32f7931f7aba04ae3704920603f8301b8af31cce49ae12c83a697e74f7cec803508bfd165b7bbb1c5a859ce95a791d291528c31b24245 SHA512 70a4b8749ca53e255df76ca32cc401ba58d5bea2ee1c01730dadfb1d76a6c286f44137805c801e0f1e520c59306568a87efe56d44175ec0510954f97b640d331
+EBUILD poke-1.2.ebuild 981 BLAKE2B f8832e1bf8533caa2636b076b0bf3ba9d42b2c3fdde0f411609c337b874afae0b8c367caecd23546c2f0c198dbb06e2ff1e239f7d8f6c08a3fad664241bc3847 SHA512 821b8837f1d07aa245c0a02acda9aa9dc4b098860049f5a315df0d7e78f3dddc4bdb9e134f03b42ce01321c17250cd662cdcb2fe3f1c9311efab4f12889f6921
 MISC metadata.xml 373 BLAKE2B 5a16b41a8e507a250ba57aa741890c395eb484af1535229199399f68d62da619298d10583fd7b8d454139765526307ab3f0486814a5ccc22f32eae413e2f4abb SHA512 a74066509b1ac23992121781cb2befa222e250467e9d54ee1cff7d5e7cf5df81d86a44b0eef3768d22c0105f8f1136843f54ef1f5111e1ed8f3659f9eba1898d
diff --git a/dev-util/poke/poke-1.0.ebuild b/dev-util/poke/poke-1.0.ebuild
deleted file mode 100644
index 0397a46a2393..000000000000
--- a/dev-util/poke/poke-1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="extensible editor for structured binary data"
-HOMEPAGE="http://www.jemarch.net/poke"
-
-SRC_URI="mirror://gnu/poke/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="machine-interface nls static-libs test"
-
-RESTRICT="!test? ( test )"
-
-# TODO: libnbd: not packaged in gentoo yet
-# TODO: gui: does not see to do anything :)
-RDEPEND="
-	dev-libs/boehm-gc:=
-	sys-devel/gettext
-	sys-libs/readline:=
-	machine-interface? ( dev-libs/json-c:= )
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/dejagnu )
-"
-BDEPEND="
-	sys-devel/flex
-	sys-devel/bison
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--disable-gui \
-		--disable-libnbd \
-		$(use_enable machine-interface mi) \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-util/poke/poke-1.1.ebuild b/dev-util/poke/poke-1.2.ebuild
index 0293e5f95c0d..3683b23922d1 100644
--- a/dev-util/poke/poke-1.1.ebuild
+++ b/dev-util/poke/poke-1.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.jemarch.net/poke"
 SRC_URI="mirror://gnu/poke/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="machine-interface nls static-libs test"