diff --git a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.5.1.ebuild b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.5.1.ebuild
index bda801b411..ff07998636 100644
--- a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.5.1.ebuild
+++ b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.5.1.ebuild
@@ -33,8 +33,8 @@ DEPEND="
BDEPEND="
sys-devel/bc
- sys-devel/clang
- sys-devel/llvm
+ llvm-core/clang
+ llvm-core/llvm
"
RESTRICT="strip test"
diff --git a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild
index 53e4514f1e..6473e0ead5 100644
--- a/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild
+++ b/app-admin/opensnitch-ebpf-module/opensnitch-ebpf-module-1.6.6.ebuild
@@ -33,8 +33,8 @@ DEPEND="
BDEPEND="
sys-devel/bc
- sys-devel/clang
- sys-devel/llvm
+ llvm-core/clang
+ llvm-core/llvm
"
RESTRICT="strip test"
diff --git a/app-dicts/seclists/Manifest b/app-dicts/seclists/Manifest
index 6507579714..c4c7c1b218 100644
--- a/app-dicts/seclists/Manifest
+++ b/app-dicts/seclists/Manifest
@@ -1,2 +1,2 @@
-DIST seclists-2023.4.tar.gz 619733074 BLAKE2B bc4216b369da1e74513606c4d8c204aba6743ccb63ec507d3c1d0497c707a3103ec734308989ad14b609e5d3b89a93b24adcbd66875b162b05cf780dd0282858 SHA512 21661fa2ee4380d4b73e6a677ab846ee447f3b30fda4681853d1945921efaf87807fd400905c18a0d93f4abdda9267b1fda388fecd96c4290ab16289ab000b88
DIST seclists-2024.3.tar.gz 676117031 BLAKE2B 5e6f63c6d97e382f12ad355f077ddc32cfaf519d9562431099665fa7470c361d386c68a4899d043cd9e89595f92b1dd7b7c87daf6735b7137bacb4531877e277 SHA512 c00a26a832cb58aa772fa971a4b0c80863d2f71b541e1a969143ae3ee2d640eecd9adeceb1f1128c654e785159085304c3bbc4b47038d115e1ca56f90c9ede82
+DIST seclists-2024.4.tar.gz 695471839 BLAKE2B f849476bcc7917770324c67b41aa2c4872c0a7f3e53651cc08b91cf9566c9a9c9b98096f9dd0f90199fc11a45fd973c1b781ec54cfe7370b969acfc0cdad6989 SHA512 15b009eea16e79515e89146094dbde0a9dfcf7427fa33bea427e6e1d92b105d00bf11f4ec0a372a0f5df92cf85d89b98053175d167e2e9307650021e54c60398
diff --git a/app-dicts/seclists/seclists-2023.4.ebuild b/app-dicts/seclists/seclists-2024.4.ebuild
similarity index 100%
rename from app-dicts/seclists/seclists-2023.4.ebuild
rename to app-dicts/seclists/seclists-2024.4.ebuild
diff --git a/dev-python/pyinstaller/Manifest b/dev-python/pyinstaller/Manifest
index 0697c42be7..0270fe1a02 100644
--- a/dev-python/pyinstaller/Manifest
+++ b/dev-python/pyinstaller/Manifest
@@ -1,2 +1 @@
-DIST PyInstaller-3.6.tar.gz 3539593 BLAKE2B 77f9a9e46ea98a6063beded6870e642775e9ed0ea29f58378fd47cd3ab4f9802c39c1215d5f3252b53ed400b0fa269f1f595e40e25b2839f68c442a66fed527b SHA512 97e7ac3632b5a84a85268c68cb3f3a404ca9f2786396f31016313a15c81c9c453983fd9d0376de0e7543401d3ad8af58b839dde7cefb0dfe7cbb9f3ac360f3e0
DIST pyinstaller-6.2.0.tar.gz 4135706 BLAKE2B 03cce690e7806dd52732671bd854843e23c0798b39f1fceb068237e1e28e3a436dc0c6077be3d03739ec4a14a0145607f6d5dc2137f46aa5fd18dd8adaa9a40e SHA512 dbcf5f7b0c18555eebeddd89f467b5c8c5555f5586ea65f905b9abe6eafa463b3700cb9a3b2777bfbccd9cbc270566590d564ec8191076d84b17034e5f9180c4
diff --git a/dev-python/pyinstaller/metadata.xml b/dev-python/pyinstaller/metadata.xml
index 04b7e82cd0..ed5723f7f3 100644
--- a/dev-python/pyinstaller/metadata.xml
+++ b/dev-python/pyinstaller/metadata.xml
@@ -9,4 +9,7 @@
Support for sys-devel/clang
Support for link with Boehm garbage collector to detect memory leaks
+
+ pyinstaller
+
diff --git a/dev-python/pyinstaller/pyinstaller-3.6-r1.ebuild b/dev-python/pyinstaller/pyinstaller-3.6-r1.ebuild
deleted file mode 100644
index db51de85da..0000000000
--- a/dev-python/pyinstaller/pyinstaller-3.6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Program converting Python programs into stand-alone executables"
-HOMEPAGE="https://www.pyinstaller.org"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/pyinstaller/pyinstaller"
- EGIT_BRANCH="develop"
-else
- MY_PN="PyInstaller"
- MY_P="${MY_PN}-${PV}"
- SRC_URI="https://github.com/pyinstaller/pyinstaller/releases/download/v${PV}/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
-
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="clang debug doc leak-detector"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-QA_PREBUILT="usr/lib/python*/site-packages/PyInstaller/bootloader/Linux-*"
-
-RDEPEND="${PYTHON_DEPS}
- sys-libs/zlib
- >=dev-python/macholib-1.8[${PYTHON_USEDEP}]
- dev-python/altgraph[${PYTHON_USEDEP}]
- >=dev-python/pefile-2018.08.08[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- leak-detector? ( dev-libs/boehm-gc )
- clang? ( sys-devel/clang )
- !clang? ( sys-devel/gcc )"
-
-src_install() {
- distutils-r1_src_install
- insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/50${PN}
-}
diff --git a/dev-python/pyinstaller/pyinstaller-6.2.0.ebuild b/dev-python/pyinstaller/pyinstaller-6.2.0.ebuild
index 0cdb0f7579..4213029367 100644
--- a/dev-python/pyinstaller/pyinstaller-6.2.0.ebuild
+++ b/dev-python/pyinstaller/pyinstaller-6.2.0.ebuild
@@ -44,7 +44,7 @@ RDEPEND="${PYTHON_DEPS}
"
DEPEND="${RDEPEND}
leak-detector? ( dev-libs/boehm-gc )
- clang? ( sys-devel/clang )
+ clang? ( llvm-core/clang )
!clang? ( sys-devel/gcc )"
src_install() {
diff --git a/dev-util/lief/Manifest b/dev-util/lief/Manifest
index 85c417ae64..2cfb935eea 100644
--- a/dev-util/lief/Manifest
+++ b/dev-util/lief/Manifest
@@ -1,2 +1,2 @@
-DIST lief-0.15.0.tar.gz 13502814 BLAKE2B ca55130941cd30806d82e8da1e96cd2d9b9ee7141512a7f439258ecb625ae652d04f348e414ee34c39cb21092cbdd9750a9ef6a3154a04f17da9b04c4e2c114a SHA512 822845932905f1aecb4576e551f08cab27d4290a1835fdecfa6288d728fe2067f9826a9927e7b7dcf78354f69a1897b0ad2a4f329ee872434ac9c3cbc8e316f7
DIST lief-0.15.1.tar.gz 13503234 BLAKE2B b8d10a0d962db6d63e1f2d277756d0e43bb177677712f8c4856bda901ffa9f31ded358985c71c7cfd44936d03dd300d0011790669bd5edddc6dfd46273153a58 SHA512 30f248ce5c77993ccc08a360bfd74562ff1e661233abf7e6017cd11351ee359c67848a1ac4159b82a38e971f41704a6008b8778c817e06ef558efe21b76e04ae
+DIST lief-0.16.0.tar.gz 16420210 BLAKE2B ff5c230ba6c1ee472ddfad31669ed33a39283f73026cf66b2078e81b924948685d0e027b13930cbad962a4055599d46dfb52a851626efef34683e3d66947da5c SHA512 7df75fab6c7023e37a6a4d27fac8dcb4200e0235625fc5952bb23cedb2e582a37fb67ee471c1ae953c0b205fd9cca5538a835f65ef80a771f72dc7ff68000ed9
diff --git a/dev-util/lief/lief-0.15.0.ebuild b/dev-util/lief/lief-0.16.0.ebuild
similarity index 82%
rename from dev-util/lief/lief-0.15.0.ebuild
rename to dev-util/lief/lief-0.16.0.ebuild
index 04feb246fe..ab57df6c31 100644
--- a/dev-util/lief/lief-0.15.0.ebuild
+++ b/dev-util/lief/lief-0.16.0.ebuild
@@ -19,16 +19,18 @@ S=${WORKDIR}/LIEF-${PV}
LICENSE="Apache-2.0"
SLOT="0"
+
KEYWORDS="amd64 x86"
IUSE="examples +python static-libs"
+# lief requires a forked version of nanobind, see LIEF-0.15.1/api/python/CMakeLists.txt
+# So don't try to use a standard one
RDEPEND="python? ( ${PYTHON_DEPS}
dev-python/pydantic[${PYTHON_USEDEP}]
dev-python/pydantic-core[${PYTHON_USEDEP}]
dev-python/tomli[${PYTHON_USEDEP}]
dev-python/xtract[${PYTHON_USEDEP}]
- ~dev-python/nanobind-1.7.0_p20231019[${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}
python? ( dev-python/scikit-build-core[${PYTHON_USEDEP}] )"
@@ -65,25 +67,34 @@ src_configure() {
use x86 && FORCE32=YES
local PYTHON_API=NO
- local NANOBIND_DIR
+# local NANOBIND_DIR
if use python; then
#set EPYTHON variable for python_get_sitedir
python_setup
PYTHON_API=YES
- NANOBIND_DIR=$(python_get_sitedir)/nanobind/cmake
+# NANOBIND_DIR=$(python_get_sitedir)/nanobind/cmake
fi
local mycmakeargs=(
-DBUILD_SHARED_LIBS="$(usex static-libs OFF ON)"
-DLIEF_EXAMPLES="$(usex examples ON OFF)"
-DLIEF_PYTHON_API="$PYTHON_API"
+
+ -DLIEF_MACHO=OFF
+
+# -DLIEF_PY_LIEF_EXT=ON
+# -DLIEF_PYTHON_STATIC=OFF
+# -DLIEF_PY_LIEF_EXT_SHARED=ON
+# -DBUILD_SHARED_LIBS=ON
+# -DLIEF_FORCE_API_EXPORTS=ON
+
-DLIEF_FORCE32="$FORCE32"
)
- use python && mycmakeargs+=(
- -DLIEF_OPT_NANOBIND_EXTERNAL=1
- -Dnanobind_DIR="${NANOBIND_DIR}"
- )
+# use python && mycmakeargs+=(
+# -DLIEF_OPT_NANOBIND_EXTERNAL=1
+# -Dnanobind_DIR="${NANOBIND_DIR}"
+# )
cmake_src_configure
wrap_python ${FUNCNAME}
diff --git a/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild b/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild
index 1f7d0a1511..8304d7f5cb 100644
--- a/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild
+++ b/pentoo/pentoo-mobile/pentoo-mobile-2024.3.ebuild
@@ -36,5 +36,5 @@ PDEPEND="dev-util/frida-tools
app-pda/ideviceinstaller
app-pda/ifuse
app-pda/usbmuxd
- pentoo-full? ( sys-devel/clang )
+ pentoo-full? ( llvm-core/clang )
)"
diff --git a/sys-devel/autofdo/Manifest b/sys-devel/autofdo/Manifest
deleted file mode 100644
index 596a474b2c..0000000000
--- a/sys-devel/autofdo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST autofdo-0.18.tar.gz 62947085 BLAKE2B 2aef2bf35787339b8be86104a484a9a76adb0b54abe272965941c38bf963c7f49062246aefb2f710807ad4d55058c6babd610ba7290fc4c2114bfb2599cd267b SHA512 7f3b735347f69846c085d1ccd528c6cccd098cb6c768bfddfe4e4d5eb53b750775257da2fbf62f046ea073b5a499149d23b57bdf6ee6282630a69ceda0f1dd12
-DIST autofdo-0.19.tar.gz 364598015 BLAKE2B 44647c8c172a0bb65cc8961171cb4acfe09cb6041230db8db3837337ff21bee5cebfb0124d1d6902bccc5c3820958a38774bd4428b12a4b56e384fb2572d99fa SHA512 774fec8ae240c44589519131efc24133eec96dc3387b5c6cd3c02182893e2896ae91241e93b70aa7d3baec803e9a3949a90ee215e1d58e254f0566d48e275e00
diff --git a/sys-devel/autofdo/autofdo-0.18.ebuild b/sys-devel/autofdo/autofdo-0.18.ebuild
deleted file mode 100644
index 52ba268147..0000000000
--- a/sys-devel/autofdo/autofdo-0.18.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="System to simplify real-world deployment of feedback-directed optimization"
-HOMEPAGE="https://gcc.gnu.org/wiki/AutoFDO"
-SRC_URI="https://github.com/google/autofdo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=sys-devel/llvm-5.0.1:*
- sys-devel/gcc:*"
-
-RDEPEND="${DEPEND}"
-
-src_prepare(){
- #has Google forgot got change it?
- sed -i "s|\[0.14\]|\[${PV}\]|" configure.ac
- eautoreconf
- eapply_user
-}
-
-src_configure(){
- econf --with-llvm
-}
diff --git a/sys-devel/autofdo/autofdo-0.19.ebuild b/sys-devel/autofdo/autofdo-0.19.ebuild
deleted file mode 100644
index 7510415014..0000000000
--- a/sys-devel/autofdo/autofdo-0.19.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="System to simplify real-world deployment of feedback-directed optimization"
-HOMEPAGE="https://gcc.gnu.org/wiki/AutoFDO"
-#SRC_URI="https://github.com/google/autofdo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://github.com/google/autofdo/releases/download/0.19/0.19.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=sys-devel/llvm-5.0.1:*
- sys-devel/gcc:*"
-
-RDEPEND="${DEPEND}"
-
-src_prepare(){
- eapply "${FILESDIR}/disable-rpath.diff"
- eapply "${FILESDIR}/link-atomic.diff"
-# eapply "${FILESDIR}/link-libgflags.diff"
-# eapply "${FILESDIR}/link-libglog.diff"
-
- eautoreconf
- eapply_user
-}
-
-src_configure(){
- econf --with-llvm
-}
diff --git a/sys-devel/autofdo/autofdo-9999.ebuild b/sys-devel/autofdo/autofdo-9999.ebuild
deleted file mode 100644
index bdb03cd72a..0000000000
--- a/sys-devel/autofdo/autofdo-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 autotools
-
-DESCRIPTION="System to simplify real-world deployment of feedback-directed optimization"
-HOMEPAGE="https://gcc.gnu.org/wiki/AutoFDO"
-EGIT_REPO_URI="https://github.com/kim-phillips-arm/autofdo.git"
-#EGIT_COMMIT=""
-EGIT_BRANCH="fixissue55try3"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND=">=sys-devel/llvm-5.0.1:*
- sys-devel/gcc:*"
-
-RDEPEND="${DEPEND}"
-
-src_prepare(){
- eautoreconf
- eapply_user
-}
-
-src_configure(){
- econf --with-llvm
-}
diff --git a/sys-devel/autofdo/files/disable-rpath.diff b/sys-devel/autofdo/files/disable-rpath.diff
deleted file mode 100644
index f1490588ed..0000000000
--- a/sys-devel/autofdo/files/disable-rpath.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/m4/ax_llvm.m4
-+++ b/m4/ax_llvm.m4
-@@ -67,8 +67,7 @@ AC_DEFUN([AX_LLVM],
- -ldl -lpthread -ltinfo"
- elif test "x$shared_mode" = "xshared"; then
- rpath="$($ac_llvm_config_path --libdir)"
-- LLVM_LDFLAGS="-Wl,-rpath $rpath \
-- $($ac_llvm_config_path --ldflags)"
-+ LLVM_LDFLAGS="$($ac_llvm_config_path --ldflags)"
- LLVM_LIBS="$($ac_llvm_config_path --libs $1)"
- fi
-
diff --git a/sys-devel/autofdo/files/link-atomic.diff b/sys-devel/autofdo/files/link-atomic.diff
deleted file mode 100644
index 36f1a82b1a..0000000000
--- a/sys-devel/autofdo/files/link-atomic.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/third_party/protobuf/configure.ac
-+++ b/third_party/protobuf/configure.ac
-@@ -189,6 +189,16 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "x$
- # We still keep this for improving pbconfig.h for unsupported platforms.
- AC_CXX_STL_HASH
-
-+AC_MSG_CHECKING([whether linking wiht -latomic succeeds])
-+save_LIBS=$LIBS
-+LIBS="$LIBS -latomic"
-+AC_LINK_IFELSE(
-+ [AC_LANG_SOURCE([int main() { return 0; }])],
-+ [LIBATOMIC=-latomic; AC_MSG_RESULT(yes)],
-+ [LIBATOMIC=; AC_MSG_RESULT(no)])
-+AC_SUBST(LIBATOMIC)
-+LIBS=$save_LIBS
-+
- case "$target_os" in
- mingw* | cygwin* | win* | aix*)
- ;;
---- a/third_party/protobuf/src/Makefile.am
-+++ b/third_party/protobuf/src/Makefile.am
-@@ -211,7 +211,7 @@ libprotobuf_lite_la_SOURCES =
- google/protobuf/io/zero_copy_stream.cc \
- google/protobuf/io/zero_copy_stream_impl_lite.cc
-
--libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
-+libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC)
- libprotobuf_la_LDFLAGS = -version-info 15:1:0 -export-dynamic -no-undefined
- if HAVE_LD_VERSION_SCRIPT
- libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
diff --git a/sys-devel/autofdo/files/link-libgflags.diff b/sys-devel/autofdo/files/link-libgflags.diff
deleted file mode 100644
index 93a240d4ab..0000000000
--- a/sys-devel/autofdo/files/link-libgflags.diff
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -32,6 +32,8 @@ AM_CXXFLAGS = -std=gnu++11 -I./$(PROTOBU
- LIBS += -lpthread
- LIBELF = -lelf
-
-+LDADD_GFLAGS = -lgflags
-+
- COMMON_PROFILE_CREATOR_FILES = addr2line.cc gcov.cc instruction_map.cc \
- module_grouper.cc profile_creator.cc \
- profile_writer.cc sample_reader.cc \
-@@ -40,39 +42,39 @@ COMMON_PROFILE_CREATOR_FILES = addr2line
-
- bin_PROGRAMS = create_gcov
- create_gcov_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) create_gcov.cc
--create_gcov_LDADD = libquipper.a libglog.a libsymbolize.a libgflags.a $(LIBELF) $(PROTOBUF_DEP)
-+create_gcov_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_create_gcov_SOURCES = $(protoc_outputs)
- $(am_create_gcov_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += dump_gcov
- dump_gcov_SOURCES = profile_reader.cc symbol_map.cc module_grouper.cc gcov.cc \
- dump_gcov.cc
--dump_gcov_LDADD = libglog.a libgflags.a libsymbolize.a
-+dump_gcov_LDADD = libglog.a $(LDADD_GFLAGS) libsymbolize.a
-
- bin_PROGRAMS += sample_merger
- sample_merger_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) sample_merger.cc
--sample_merger_LDADD = libquipper.a libglog.a libsymbolize.a libgflags.a $(LIBELF) $(PROTOBUF_DEP)
-+sample_merger_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_sample_merger_SOURCES = $(protoc_outputs)
- $(am_sample_merger_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += profile_merger
- profile_merger_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) profile_reader.cc \
- profile_merger.cc
--profile_merger_LDADD = libquipper.a libglog.a libsymbolize.a libgflags.a $(LIBELF) $(PROTOBUF_DEP)
-+profile_merger_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_profile_merger_SOURCES = $(protoc_outputs)
- $(am_profile_merger_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += profile_diff
- profile_diff_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) profile_reader.cc \
- profile_diff.cc
--profile_diff_LDADD = libquipper.a libglog.a libsymbolize.a libgflags.a $(LIBELF) $(PROTOBUF_DEP)
-+profile_diff_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_profile_diff_SOURCES = $(protoc_outputs)
- $(am_profile_diff_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += profile_update
- profile_update_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) profile_reader.cc \
- profile_update.cc
--profile_update_LDADD = libquipper.a libglog.a libsymbolize.a libgflags.a $(LIBELF) $(PROTOBUF_DEP)
-+profile_update_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_profile_update_SOURCES = $(protoc_outputs)
- $(am_profile_update_OBJECTS): $(protoc_outputs)
-
-@@ -80,7 +82,7 @@ bin_PROGRAMS += create_llvm_prof
- create_llvm_prof_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) \
- llvm_profile_writer.cc create_llvm_prof.cc
- create_llvm_prof_LDADD = $(LLVM_LDFLAGS) $(LLVM_LIBS) libquipper.a libglog.a \
-- libsymbolize.a libgflags.a $(LIBELF) $(PROTOBUF_DEP)
-+ libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- create_llvm_prof_CXXFLAGS = $(LLVM_CXXFLAGS) -DCREATE_LLVM_PROF
- nodist_create_llvm_prof_SOURCES = $(protoc_outputs)
- $(am_create_llvm_prof_OBJECTS): $(protoc_outputs)
-@@ -121,11 +123,6 @@ libglog_a_SOURCES = glog/src/glog/log_se
- glog/src/signalhandler.cc \
- glog/src/base/mutex.h glog/src/base/googleinit.h \
- glog/src/base/commandlineflags.h glog/src/googletest.h
--libglog_a_CXXFLAGS = -DNO_THREADS
--
--noinst_LIBRARIES += libgflags.a
--libgflags_a_SOURCES = gflags/gflags.cc gflags/gflags_completions.cc \
-- gflags/gflags_reporting.cc
-
- noinst_LIBRARIES += libsymbolize.a
- libsymbolize_a_SOURCES = symbolize/addr2line_inlinestack.cc \
diff --git a/sys-devel/autofdo/files/link-libglog.diff b/sys-devel/autofdo/files/link-libglog.diff
deleted file mode 100644
index fd75c864ec..0000000000
--- a/sys-devel/autofdo/files/link-libglog.diff
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -27,12 +27,13 @@ $(protoc_outputs): $(protoc_inputs) $(PR
- $(PROTOC) --cpp_out=`dirname $<` -I`dirname $<` $(protoc_inputs)
-
- ACLOCAL_AMFLAGS = -I m4
--AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/glog/src -I$(top_srcdir)/third_party/perf_data_converter/src/quipper -I./$(PROTOBUF)/src
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/third_party/perf_data_converter/src/quipper -I./$(PROTOBUF)/src
- AM_CXXFLAGS = -std=gnu++11 -I./$(PROTOBUF)/src
- LIBS += -lpthread
- LIBELF = -lelf
-
- LDADD_GFLAGS = -lgflags
-+LDADD_GLOG = -lglog
-
- COMMON_PROFILE_CREATOR_FILES = addr2line.cc gcov.cc instruction_map.cc \
- module_grouper.cc profile_creator.cc \
-@@ -42,46 +43,46 @@ COMMON_PROFILE_CREATOR_FILES = addr2line
-
- bin_PROGRAMS = create_gcov
- create_gcov_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) create_gcov.cc
--create_gcov_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
-+create_gcov_LDADD = libquipper.a $(LDADD_GLOG) libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_create_gcov_SOURCES = $(protoc_outputs)
- $(am_create_gcov_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += dump_gcov
- dump_gcov_SOURCES = profile_reader.cc symbol_map.cc module_grouper.cc gcov.cc \
- dump_gcov.cc
--dump_gcov_LDADD = libglog.a $(LDADD_GFLAGS) libsymbolize.a
-+dump_gcov_LDADD = $(LDADD_GLOG) $(LDADD_GFLAGS) libsymbolize.a
-
- bin_PROGRAMS += sample_merger
- sample_merger_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) sample_merger.cc
--sample_merger_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
-+sample_merger_LDADD = libquipper.a $(LDADD_GLOG) libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_sample_merger_SOURCES = $(protoc_outputs)
- $(am_sample_merger_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += profile_merger
- profile_merger_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) profile_reader.cc \
- profile_merger.cc
--profile_merger_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
-+profile_merger_LDADD = libquipper.a $(LDADD_GLOG) libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_profile_merger_SOURCES = $(protoc_outputs)
- $(am_profile_merger_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += profile_diff
- profile_diff_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) profile_reader.cc \
- profile_diff.cc
--profile_diff_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
-+profile_diff_LDADD = libquipper.a $(LDADD_GLOG) libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_profile_diff_SOURCES = $(protoc_outputs)
- $(am_profile_diff_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += profile_update
- profile_update_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) profile_reader.cc \
- profile_update.cc
--profile_update_LDADD = libquipper.a libglog.a libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
-+profile_update_LDADD = libquipper.a $(LDADD_GLOG) libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- nodist_profile_update_SOURCES = $(protoc_outputs)
- $(am_profile_update_OBJECTS): $(protoc_outputs)
-
- bin_PROGRAMS += create_llvm_prof
- create_llvm_prof_SOURCES = $(COMMON_PROFILE_CREATOR_FILES) \
- llvm_profile_writer.cc create_llvm_prof.cc
--create_llvm_prof_LDADD = $(LLVM_LDFLAGS) $(LLVM_LIBS) libquipper.a libglog.a \
-+create_llvm_prof_LDADD = $(LLVM_LDFLAGS) $(LLVM_LIBS) libquipper.a $(LDADD_GLOG) \
- libsymbolize.a $(LDADD_GFLAGS) $(LIBELF) $(PROTOBUF_DEP)
- create_llvm_prof_CXXFLAGS = $(LLVM_CXXFLAGS) -DCREATE_LLVM_PROF
- nodist_create_llvm_prof_SOURCES = $(protoc_outputs)
-@@ -107,7 +108,6 @@ libquipper_a_SOURCES = \
- nodist_libquipper_a_SOURCES = $(protoc_outputs)
- $(am_libquipper_a_OBJECTS): $(protoc_outputs)
-
--noinst_LIBRARIES += libglog.a
- libglog_a_SOURCES = glog/src/glog/log_severity.h \
- glog/src/logging.cc glog/src/raw_logging.cc \
- glog/src/vlog_is_on.cc \
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@
- AC_PREREQ([2.68])
- AC_INIT([AutoFDO], [m4_esyscmd_s([git describe --abbrev=0 --tags])], [autofdo@googlegroups.com])
- AC_CONFIG_MACRO_DIR([m4])
--AC_CONFIG_HEADERS(config.h glog/src/config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE([subdir-objects])
-
- # Checks for the flag --with-protoc.
-@@ -102,7 +102,5 @@ AC_SUBST(GMOCK_LIBS)
- AS_IF([test -d third_party/perf_data_converter/src/quipper/base],
- [rm -rf third_party/perf_data_converter/src/quipper/base])
-
--AC_CONFIG_FILES([Makefile glog/src/glog/logging.h \
-- glog/src/glog/raw_logging.h glog/src/glog/vlog_is_on.h \
-- glog/src/glog/stl_logging.h])
-+AC_CONFIG_FILES([Makefile])
- AC_OUTPUT