gentoo resync : 25.08.2020

9 files changed, 2 insertions, 364 deletions

diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index eb73e31533b8..e39e66e9b478 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,15 +1,4 @@
 AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
-AUX dwarves-1.16-no-libebl.patch 3974 BLAKE2B 88a5170bfed028cf7919ac010112ad21124a994e364af71f5124263b73c0aec00e7c75f73dd26255534a794065e1b17f15b8f27b566cf77a2a7aaf0832760f98 SHA512 9925c01104ccd0f5abc17488673a51b2a674751117a615a87f5b8efd1b6670bc778a5590e6a55e65cb6219d8521040b266b2dc63a31bf9618302e695a815cd71
-DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b0f4f888577722466aaf7958cab7b04c15154faa8cbfcaa44fe60fc549e09b2fb68747cc3cdd08b8bce487cfdf SHA512 20644344e694253b79ede65e489696a319f10eaf424af81882414ae6efeaf34a82132321430d647916b78f97ef504907b3bd32919420f2cd14384910e283ff27
-DIST dwarves-1.13.tar.xz 222008 BLAKE2B db73f5c9a319a1a57ef37127350a9da117e3f5c89e199445393e3e312139ce8f88f46e6e5bbf302d708c0b075b1c2b2cd75dc7bc213ed144d1db792c55358220 SHA512 26485b183b4c7b608dd0392f9155dd570a14c86fdeafee232e44ad30f14a1357b408b61b0e8a31ea4bf976ed7fc44e7d5a4a3ccede9713c47265ad52c13dadf0
-DIST dwarves-1.15.tar.xz 222272 BLAKE2B a33d128ec899da0f0a1e2fc96703f0425fd1a2082675ddf886df55507b29b5fbad1a1cefd6b0a9002f50193b4c70f87a2eeacd50d94388776bb338fe678849e0 SHA512 29a8a15b7190480e79c2f423c7104d0fd275cd4c3df17518a1dd3c63cce1c528fad4b6f580baa397d9aa9323703009009e2d529939b12dd1af2c65cf7120b237
-DIST dwarves-1.16.tar.xz 273060 BLAKE2B a4cd976ff1cf6af0e2848a337400f4b1961ec5aff528d1c5893053967c0d1e7fc77de8220ae67c4b8a3eb387b659fbfd72113b29b2bf6a20d1fc45a59008a3e0 SHA512 6d57b26db70736353d8797d1f7d68c7c73b6df3ae69eb66dd7cb07d6b50a26c4f2adaa576a8915a4a7f8c41b67dcebbfc8cbdf3ba507dbf941f63941b13d65b1
 DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
-EBUILD dwarves-1.12.ebuild 1062 BLAKE2B 2e436733a3e3525194482c9f2d2d0327a51a1b6b49454dfce06769e01546eca86ff2f603e78fc0c4ebf1a000eacca8d0e86dd4b30db062ceee22303d75ca2422 SHA512 cbd4523e3135ad2d3b5336ecf970af7a7172f67e2b9a0f17919403d66f536a63654fd623ed37fbb200e2431c7af661181ce5270c4e61763fde7753991c1e9f68
-EBUILD dwarves-1.13.ebuild 1061 BLAKE2B 729f6f13b1b030171888139074499c0841ebbfa9ec4b1605706c3a1defda1a18bc5a56c41c89221b0ef78b294f5f8dbfea19eaa06dc4f0680af8eeea853c8c52 SHA512 a7aa494a88ac6f476d5001c2dfba81d1c372b3b4baaf2bc3a677cda395776b2f8c3eae60f151ece20a62e9d68a3922340ead94ce66f4bab0e181c741ef86e5a6
-EBUILD dwarves-1.15.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
-EBUILD dwarves-1.16-r1.ebuild 981 BLAKE2B 73d0c73c70e17641b914ac177c3423a02592bc555c876aa99b2f23bfbf79a8ae3a74b11d593ef28bf34ec47f2b6e9d28637a8f49db9f03f90d25974edf65d69e SHA512 54a0e1425ac72e753e8c70534617f84863897b74689ea1f08602601c490a130830eae1ba3f984cd5a77eb9637131ba7ff7384e27542870871b40f972b932d1e4
-EBUILD dwarves-1.16.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
-EBUILD dwarves-1.17.ebuild 931 BLAKE2B c471d826b831c5d663909c19a221ca96f18349e82f2f36486cc124185ff89377935282732423a5f1836c7a53dfe9f1e103443581a278bc238625b390d1447198 SHA512 18ef62683512041aaade7bce5bb443c0b3107e2d6f59453b64345102a7592ccc1876cecf82697124a907da3b6da660a6f8d4ab45b9a981110c190179dc4b30e3
-EBUILD dwarves-9999.ebuild 831 BLAKE2B f6abb8e145532fe61e11b32695938c214c98b4f7adff2ea708af5d6794a1fb909a2ae779ebb07f9150af6d323f4cbd202200e1b1f6b4690d926408f84175f7bd SHA512 543e00d8572be3d4035cbe1c68adf5d3a3aab3a5dfbd9f47a976bccc8b0f73a3d382d0e96f796181afa9d130f00fe6fa623e6c3b674fb1efd8a1a1675ee7e694
+EBUILD dwarves-1.17.ebuild 936 BLAKE2B 52c32717be8cd449941f32e9745bb6a7876f40e37738a3cf56de8673d98e3c81e51fb1c865157a74208633fc88a72becfc25d3787b669e087d72418200c2420e SHA512 fdca096be1fc9d4ca6ef133b38119f1ffdec68a578c7cd854eb4dae588e5d009e8faa0e5aa9d1f7295bd7144589d5411fc321faf3f3006b41001e573934b77f8
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.12.ebuild b/dev-util/dwarves/dwarves-1.12.ebuild
deleted file mode 100644
index bcd44c849ea3..000000000000
--- a/dev-util/dwarves/dwarves-1.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.bz2"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.13.ebuild b/dev-util/dwarves/dwarves-1.13.ebuild
deleted file mode 100644
index cb99e78f1ffb..000000000000
--- a/dev-util/dwarves/dwarves-1.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${D}"/usr/bin/ostra-cg \
-		"${D}"/usr/share/dwarves/runtime/python/ostra.py
-}
diff --git a/dev-util/dwarves/dwarves-1.15.ebuild b/dev-util/dwarves/dwarves-1.15.ebuild
deleted file mode 100644
index d4a49fba59f5..000000000000
--- a/dev-util/dwarves/dwarves-1.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.16-r1.ebuild b/dev-util/dwarves/dwarves-1.16-r1.ebuild
deleted file mode 100644
index c58ef0fd660d..000000000000
--- a/dev-util/dwarves/dwarves-1.16-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-	"${FILESDIR}"/${PN}-1.16-no-libebl.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.16.ebuild b/dev-util/dwarves/dwarves-1.16.ebuild
deleted file mode 100644
index d4a49fba59f5..000000000000
--- a/dev-util/dwarves/dwarves-1.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.131
-	<=dev-libs/elfutils-0.177
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
-	S=${WORKDIR}
-else
-	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
-fi
-
-DOCS=( README README.ctracer NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/dwarves-1.17.ebuild b/dev-util/dwarves/dwarves-1.17.ebuild
index 900e391c2b62..f1c8095ab8b1 100644
--- a/dev-util/dwarves/dwarves-1.17.ebuild
+++ b/dev-util/dwarves/dwarves-1.17.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
deleted file mode 100644
index 7eb6207bcb2e..000000000000
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
-
-PYTHON_COMPAT=( python3_6 )
-inherit multilib cmake-utils git-r3 python-single-r1
-
-DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
-HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-
-LICENSE="GPL-2" # only
-SLOT="0"
-KEYWORDS=""
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/elfutils-0.178
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS=( README README.ctracer NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10-python-import.patch
-)
-
-src_configure() {
-	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
-	cmake-utils_src_configure
-}
-
-src_test() { :; }
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch b/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
deleted file mode 100644
index 78c6a4e3964f..000000000000
--- a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From fb56a460e23f44a4225d4f507b9ec7cf0790c75b Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Mon, 16 Dec 2019 21:51:45 +0100
-Subject: [PATCH] cmake: libebl was merged into libdw
-
-Since elfutils 178, libebl is now part of libdw, so searching for libebl
-always fails. Simply remove it from the search.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- cmake/modules/FindDWARF.cmake | 23 +++++++----------------
- 1 file changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/cmake/modules/FindDWARF.cmake b/cmake/modules/FindDWARF.cmake
-index f4feec4..027d06e 100644
---- a/cmake/modules/FindDWARF.cmake
-+++ b/cmake/modules/FindDWARF.cmake
-@@ -37,14 +37,9 @@ find_library(ELF_LIBRARY
- 	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
- )
- 
--find_library(EBL_LIBRARY
--	NAMES ebl
--	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
--)
--
--if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 	set(DWARF_FOUND TRUE)
--	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
-+	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
- 
- 	set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
- 	# check if libdw have the dwfl_module_build_id routine, i.e. if it supports the buildid
-@@ -52,10 +47,10 @@ if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AN
- 	# in distributions such as fedora). We do it against libelf because, IIRC, some distros
- 	# include libdw linked statically into libelf.
- 	check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
--else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 	set(DWARF_FOUND FALSE)
- 	set(DWARF_LIBRARIES)
--endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
-+endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
- 
- if (DWARF_FOUND)
- 	if (NOT DWARF_FIND_QUIETLY)
-@@ -63,7 +58,6 @@ if (DWARF_FOUND)
- 		message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
- 		message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
- 		message(STATUS "Found libelf library: ${ELF_LIBRARY}")
--		message(STATUS "Found libebl library: ${EBL_LIBRARY}")
- 	endif (NOT DWARF_FIND_QUIETLY)
- else (DWARF_FOUND)
- 	if (DWARF_FIND_REQUIRED)
-@@ -73,9 +67,9 @@ else (DWARF_FOUND)
- 		find_path(FEDORA fedora-release /etc)
- 		find_path(REDHAT redhat-release /etc)
- 		if (FEDORA OR REDHAT)
--			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
-+			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
- 				message(STATUS "Please install the elfutils-devel package")
--			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
-+			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
- 			if (NOT DWARF_LIBRARY)
- 				message(STATUS "Please install the elfutils-libs package")
- 			endif (NOT DWARF_LIBRARY)
-@@ -89,9 +83,6 @@ else (DWARF_FOUND)
- 			if (NOT LIBDW_INCLUDE_DIR)
- 				message(STATUS "Could NOT find libdw include dir")
- 			endif (NOT LIBDW_INCLUDE_DIR)
--			if (NOT EBL_LIBRARY)
--				message(STATUS "Could NOT find libebl library")
--			endif (NOT EBL_LIBRARY)
- 			if (NOT DWARF_LIBRARY)
- 				message(STATUS "Could NOT find libdw library")
- 			endif (NOT DWARF_LIBRARY)
-@@ -103,7 +94,7 @@ else (DWARF_FOUND)
- 	endif (DWARF_FIND_REQUIRED)
- endif (DWARF_FOUND)
- 
--mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
-+mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
- include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
- 
--- 
-2.24.1
-