gentoo resync : 13.06.2020

3 files changed, 15 insertions, 19 deletions

diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index 3214e38a6c2c..06c49c419713 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,5 +1,3 @@
-DIST crash-7.2.7.tar.gz 32249495 BLAKE2B 410f851afc8b4f5a4685985b58236efb6f88ae82465dbe553c8f2133cc5ca14013dc8e0efd242b3fb1b8fdd6cf0de85fabb5308252306e8c9831f9f9eb6ad56e SHA512 14e0c5842b752faa7f2c5667517c9cb214a172cea5b779df5cd38feec6472eb6fd6508346c1c4eec02d4565fd6dade270e851ebf571e778023f32ac7f82836b7
 DIST crash-7.2.8.tar.gz 32253097 BLAKE2B 26a8a07749cb62947053992ba761b541ba5d06f0f3bf67312d8228c9d851f51edf1201e732574f7f2f2768d6087324b8dd1f843ea47916bd9f95e514df967589 SHA512 3269760a50b49f25af0e1c43d60432e603036793aa542f8ccfb0b8019376da45afa7c053d3860ae2130b6471f3ac72cff78f1096e9ffa8c6f1d34afb52208e70
-EBUILD crash-7.2.7.ebuild 510 BLAKE2B 9889ba6e360fe4dcef061d967d777268aef964086b3a0d381043c45b822eb7b093a7d778c444c8b7fd4a53867ba47c899fae586f175afcc7a54fb508be285dd8 SHA512 f9cdb3f60fcec48accd88a54e5880355a6862722ea1b6c16fd036abc48493e171397036cbf63abe3d387addf59281a736eff08105d36e63dc47be0eac9815218
-EBUILD crash-7.2.8.ebuild 510 BLAKE2B a5e8d5434a23353541a323ab0584e70d14ed59f14a9d9840d5ea2771aba4c752503fd7e3719ab820dceec3a9f5eb767cfab627e969b4741bc90a61689d3b19c6 SHA512 981d4638e4e454005a8025b47714d42b26ef952cc417376ac9af9047980cbf751689aa194ac669d12837a6c76a0182ad579b1fa6fd17b0d5a500afeb79095ae1
+EBUILD crash-7.2.8-r1.ebuild 726 BLAKE2B fabf144cafa8db8a85471125ff2453ff15fa6eacda32c0d95559ff9b06848b14f02d24b4510878668c2d261906be26f284bcb5ebb2a9d5e83000abf2ec7c90f7 SHA512 dfa2ef151656aa2488bf4f836efa377cdd2c73b3ec1839156f4e34057a96f4449f187b9095be313bc73ca44b49f4ee674888a407a545eb5686592bd9bbce904e
 MISC metadata.xml 640 BLAKE2B 65450e02ac8c60f56fa7e82bc8b20f3d6b36bae290ad891265f9cd19ac405bf8452a5712e2c83c85c6635e4bc75f396c1b7976a7b7341efee3a8475f720d6c15 SHA512 c131b6f87a36deff7f2bc599000a692315f016774d0e87aa186c1ebe660ef85da04f2c3e5b89afa90473a65acf40f493d9434d677a621c9e77a0ae8ae81ed0da
diff --git a/dev-util/crash/crash-7.2.7.ebuild b/dev-util/crash/crash-7.2.7.ebuild
deleted file mode 100644
index d9bbae491a70..000000000000
--- a/dev-util/crash/crash-7.2.7.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
-HOMEPAGE="https://people.redhat.com/anderson/"
-SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
-IUSE=""
-# there is no "make test" target, but there is a test.c so the automatic
-# make rules catch it and tests fail
-RESTRICT="test"
diff --git a/dev-util/crash/crash-7.2.8.ebuild b/dev-util/crash/crash-7.2.8-r1.ebuild
index 47cd7b835092..45bbff515903 100644
--- a/dev-util/crash/crash-7.2.8.ebuild
+++ b/dev-util/crash/crash-7.2.8-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI="7"
 
+inherit toolchain-funcs
+
 DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
 HOMEPAGE="https://people.redhat.com/anderson/"
 SRC_URI="https://people.redhat.com/anderson/${P}.tar.gz"
@@ -14,3 +16,15 @@ IUSE=""
 # there is no "make test" target, but there is a test.c so the automatic
 # make rules catch it and tests fail
 RESTRICT="test"
+
+src_prepare() {
+	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
+	default
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}