gentoo resync : 17.02.2020

4 files changed, 48 insertions, 4 deletions

diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index 48fcef79e872..18088fafd8e0 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1,6 +1,8 @@
 DIST diffball-1.0.1-bug_543310_stack_buffer_overflows.patch 2945 BLAKE2B 17aa01d64464edccc490e7714dc9db8767d19b0c8b6d14223359d266d38e47aae822454aa14446c038b2b3477a4d8a8db228be7e28666528883ebf02ac2cb65b SHA512 be9a44cd9abfb41f32683d0363375902477f739f9c0dd23b30cfcd9fc6fced61111a2b101cb46db2d6320b4d70ed04627a1c178d44f23530f248bcb87e6efd32
+DIST diffball-1.0.1-bug_708736_cseek_xz_reset_avail_in_out.patch 1041 BLAKE2B de4ac71445f30546eeaaa28201640f3295bc288d83b75b8f84d3134f070249248c777edfe9b0dc705ff7990e6d4dce37d53aa1a9e153bc9a71cff6192b09f8f3 SHA512 eaa9f55b1de0d82a7c21280c4d7e6effcb90944c65f42e0230ef18044f6651512befd425128619c4ca3641111be3cef1418f1800e1854cced24433e1deffe5e7
 DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
 DIST diffball-1.0.1.tar.gz 86387 BLAKE2B 1e2c6d522b00a643666e88d19d2d6986ce02c7835378dfc9799e43fa291683bf08e129546a85c332b04ab549788ae4ac3b4d57fd6140a29a9556bece4293cbf9 SHA512 3344f03a65e2b44615eaf9210d26a4438712684c438fcea9caabe89688fe3b3d5436703f0ed63412a18a63acb49ca0dacff190fa002ea76b346bbccba3388ee4
-EBUILD diffball-1.0.1-r1.ebuild 1030 BLAKE2B 7af7578802bdd739f1245c8576c1b823493f79c0134b09d94e5eccc0ddc3c6a57990091d11578773f6c3d5aa8dc5e2884d95d9006a90bc8de98b9c68e702090f SHA512 5838dea4ec0f4a13c4838447f2bef461eee2bfa093e71439669a62c503725785e218c2e66fa2f4a1e17accf5fe697c0441d2562d8261a4ee43576b81fdf2e902
-EBUILD diffball-1.0.1.ebuild 868 BLAKE2B 6623438469419d464c155b2be4ad93701c662b7df6299c366e72c90cd6637964d39dfc6c1b5bdc51a289be35b98eb7a0b2a345cfc1ac318e488d3abf017a724e SHA512 df3bb20b2c8b668ab75b706d330f407fd8b30859aef28ccbcb9d93af13910208ef6986dcfbb91c561db458cc756b3a488b30b761fdb4d568714a0b9ea7eda47c
+EBUILD diffball-1.0.1-r1.ebuild 1030 BLAKE2B 6c858fa68fc164f1635faa36c825397adeaf882161b142f1c970318439c9f27278b1cf60a0c92e2b40abf84c8f920cde73825f4cf7a3bedafd3b0af1447932d8 SHA512 d42aaf98f289db6f4da12777c52b60ae1cdeb8c573b72df0c6d39fc21679c4378e34aa3b0c280752681d1bb832dc57bf0f7367d8d1a3641e6b2b99d5a8ff70c3
+EBUILD diffball-1.0.1-r2.ebuild 1200 BLAKE2B f209ecb80472d5534655b6acd7981993c380fa3b05d1c1d6107d5e7e8f49f81378925935a567241ea1099864d01361c88104e3a0a7c97fc884df9e4575d7c9fc SHA512 b3f4d294b69baf112b9612a4e88d9b6b3bef19881f945971f4a7fe27e377d347a12c388d7df2501210cfe6ef9f7bb73a9c10ca074eaae6cc9727b1f4a2e57348
+EBUILD diffball-1.0.1.ebuild 868 BLAKE2B ddc35ed4d64411b2ecb3eb107d2147cb9a91ee7caca9896b6f9fc824fcc671ddc87ca7f44247772052a0073243c9a26266185302851275704f41a13e20d4b759 SHA512 51281e45a844bec0ed30d14471b98f8b6cc06b34962d9dd63f64cc27c2a1945a8b45775ebf7b10bf90eb5aa570e3ceb048f040c189a2453158db44906de59d4a
 MISC metadata.xml 325 BLAKE2B d2fe2133512a06976ca331af0d318fbe888fac115af9e2635a3f682eb1ffcc0c9088e87437c39803cfa5183aaa2a5df091113efa6f7259e91960340ce095717d SHA512 8c9cb7fc1861a080e525eed799e80650b9c8ec4b0416959c9b754099cec1c26651beb5364992b8a3c80ed3285bff74f0a0b72a4032e3b243cab0191d8fd8856a
diff --git a/dev-util/diffball/diffball-1.0.1-r1.ebuild b/dev-util/diffball/diffball-1.0.1-r1.ebuild
index 804abc61444b..4b2dae447bee 100644
--- a/dev-util/diffball/diffball-1.0.1-r1.ebuild
+++ b/dev-util/diffball/diffball-1.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/diffball/diffball-1.0.1-r2.ebuild b/dev-util/diffball/diffball-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..ab5bc9dfe7b4
--- /dev/null
+++ b/dev-util/diffball/diffball-1.0.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Delta compression suite for using/generating binary patches"
+HOMEPAGE="https://github.com/zmedico/diffball"
+SRC_URI="https://github.com/zmedico/diffball/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/zmedico/diffball/pull/1.patch -> ${P}-bug_543310_stack_buffer_overflows.patch
+	https://github.com/zmedico/diffball/pull/2.patch -> ${P}-bug_708736_cseek_xz_reset_avail_in_out.patch"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=app-arch/bzip2-1.0.2
+	app-arch/xz-utils"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# Invalid RESTRICT for source package. Investigate.
+RESTRICT="strip"
+
+PATCHES=(
+	"${DISTDIR}/${P}-bug_543310_stack_buffer_overflows.patch"
+	"${DISTDIR}/${P}-bug_708736_cseek_xz_reset_avail_in_out.patch"
+)
+
+src_prepare() {
+	# fix bug 548316 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static $(use_enable debug asserts)
+}
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
index 98f7e891a94f..00f22c0d31d9 100644
--- a/dev-util/diffball/diffball-1.0.1.ebuild
+++ b/dev-util/diffball/diffball-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6