gentoo resync : 02.02.2022

6 files changed, 134 insertions, 6 deletions

diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 712f970c2d3b..a7ba8ed805f6 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,6 +1,9 @@
+AUX mold-1.0.1-no-gold-in-version.patch 1872 BLAKE2B 8ffed5c0c78235011bce727a4f750c548515c5eb3b3e7831e706c64c4cb7233478362e0a7fff5d819e2e6221126e1bb622f0a58cee8dab66558692cfe3795c2d SHA512 4438893a26cec8825e30df3fac112f5257f1bf0aab955431d097f4563707b4899e781d134d81279f1d8559302a9df1aab2b723b4aeeac5aec0e3d786ca6ebaff
 DIST mold-1.0.0.tar.gz 3482927 BLAKE2B 56ebc267370548a2f91a71ebeed87871cede6f564c29dc7d44a499b95fe570f6e9c8a717baf2d9e235c7057c41e735b315493bd23d3b44574d2a44b14aaf5ef8 SHA512 99ffd0b9e2ff7157cc8b26808675c9d3147bf88961155ae19ed9b99990ac647b7ec31ee78d05062decc6d41e66d99aa0fdc398d119803929b8dbff51eb3d077c
 DIST mold-1.0.1.tar.gz 3675262 BLAKE2B 0e40860d3c0a221d368c94b9f58c20b245ee61de6f9eb6d1454ed3b6f103933c79ddd7358049e2aacf497221232d952c2117ba2b3371cbe37fb8ad4ae42461c2 SHA512 cc03a7db395362b97879c28942397d4443d12b72e067b6f979b1ece4d8aab06154b4c1a0f4c57d6ac505bcd4f892bf9a355ad281d628d4d544d8f70edaf34b72
+DIST mold-1.0.2.tar.gz 4501088 BLAKE2B 51bac4bd44a785893c04dd03ccef6119b41a036789938a354545e7a22f16852b52079b3a3e4d27db860748e13966be18bbe813bf04b15c496f35d16ecca4b22c SHA512 27f6664e63c76c32a6e3ec8bfc4b204138926001f5431be94da9ce47a5d9d3b51aa634c5cd6df45be660d52ac0507f7b7eec17134e35db402db5747d2ecc3715
 EBUILD mold-1.0.0-r1.ebuild 1259 BLAKE2B 912f223181163deda23ecebb0f245296eb6a86fa0224faa88ff4e59d8f773bd87454d69a9e447f7374b7905c31bf539bda57cabe6607fda3b9d4072848cc8e71 SHA512 cce5444f42579f060b4842f2115b6b8c57f5f27489a19e37bdcfcada508d6a8e03a07652cf98560d97a96f57cd2e5a27eff092407b1d5d133d5716bf3f9e621b
-EBUILD mold-1.0.1.ebuild 1297 BLAKE2B 320d55e239daa5d9e3932fcab349523dce7b210854dee80e5979d69b1282aae3eac602bfc8c03aa15a9eaf3cff06cb45ea98c7c3d86e5e6cb643ea99d416d59d SHA512 f319595d3a908132f384f29baf677ae89c5d9ea987e3e596fe8c3068be36da76db4188ddb2980a4b198fe320f52dbcd046d3daa8489bc194323a1bdd5f66fc85
-EBUILD mold-9999.ebuild 1297 BLAKE2B 320d55e239daa5d9e3932fcab349523dce7b210854dee80e5979d69b1282aae3eac602bfc8c03aa15a9eaf3cff06cb45ea98c7c3d86e5e6cb643ea99d416d59d SHA512 f319595d3a908132f384f29baf677ae89c5d9ea987e3e596fe8c3068be36da76db4188ddb2980a4b198fe320f52dbcd046d3daa8489bc194323a1bdd5f66fc85
-MISC metadata.xml 315 BLAKE2B 985e05e19ef9d575e83c8782db1272bc8a97967f2a9caa1971867bd0906bb97a2aa5ddf3ac3c31cfd46840d830a578158d3d02ef2ef2f6160693044271deb8f1 SHA512 054f3c1c92750e957e92d8c13711a3898e807a2a950f9d2a30b4960b8f49aefd51c7a2ccb19df4ab55d1e40fd04876efc6f719a5fa4020d667fc21538165b2d2
+EBUILD mold-1.0.1-r1.ebuild 1359 BLAKE2B c7b460def8cf4603de0553e759da91f8c5d7b36f39f73233792625a2107b18dd8607457922235f855ada7df098c667341a430ef51c72558ea97632ae25e79768 SHA512 537b87c6f3e19d151392f7fea74bb648ac0abdb72736917543c30de6678f8860618e425cbe7799d6f9b00c19ccfbbc1d06cda467d433c5759055268d888d7c32
+EBUILD mold-1.0.2.ebuild 1352 BLAKE2B 761a69baacc74d315dd35b4f9ae9d1faeef8c417fbfe01551ddf095b0d27ae8b304b72538f9684ee825644765c730dc4a2ef2fea3ee39901d13e39a1a3cbcd5b SHA512 03957051fb4287c7a630e99e1e6cd769f10355d2116037e1970890e948132ec75306c9a9ec82116f9b4176e2051e2a488ab4575517607a9f3771332bfff6b889
+EBUILD mold-9999.ebuild 1352 BLAKE2B 761a69baacc74d315dd35b4f9ae9d1faeef8c417fbfe01551ddf095b0d27ae8b304b72538f9684ee825644765c730dc4a2ef2fea3ee39901d13e39a1a3cbcd5b SHA512 03957051fb4287c7a630e99e1e6cd769f10355d2116037e1970890e948132ec75306c9a9ec82116f9b4176e2051e2a488ab4575517607a9f3771332bfff6b889
+MISC metadata.xml 316 BLAKE2B a401da48c61b75724482345622902367a2332b3d7475941f98ee49be00fc689d42831d9ab4139aae085e26ff2160f08ed6d3be1fb4551d82761727cc41c7e44b SHA512 c07529c0453fdfc6fdf3508d4af36a8706c6692cbb9c3c5320e55562e8eccfbb55559e1cdb330063cf7e51329c4067ccde25a017c05b25b2ab7d6f1b1e38481b
diff --git a/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch b/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch
new file mode 100644
index 000000000000..429e55cc51a9
--- /dev/null
+++ b/sys-devel/mold/files/mold-1.0.1-no-gold-in-version.patch
@@ -0,0 +1,50 @@
+From cea6a569afa544826c91fda7ef0f9941f50c9459 Mon Sep 17 00:00:00 2001
+From: Rui Ueyama <ruiu@cs.stanford.edu>
+Date: Wed, 12 Jan 2022 16:31:04 +0900
+Subject: [PATCH] [ELF] Remove "GNU gold" from the --version string
+
+That substring was introduced in de7ba9014f9d9d70b9173c4bfac6c3433186ba49
+to appease Gentoo's dev-libs/jansson-2.13.1-r1 package. But I think I
+shouldn't done that from the beginning to avoid the sitaution of the
+"User-Agent" string of the web browser, which everybody claims they
+are Mozilla, AppleWebKit, Chrome and Safari simultaneously.
+---
+ main.cc             | 4 ++--
+ test/elf/version.sh | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/main.cc b/main.cc
+index 38a41cdf..8831f7f2 100644
+--- a/main.cc
++++ b/main.cc
+@@ -26,10 +26,10 @@ std::string_view errno_string() {
+ 
+ #ifdef GIT_HASH
+ const std::string mold_version =
+-  "mold " MOLD_VERSION " (" GIT_HASH "; compatible with GNU ld and GNU gold)";
++  "mold " MOLD_VERSION " (" GIT_HASH "; compatible with GNU ld)";
+ #else
+ const std::string mold_version =
+-  "mold " MOLD_VERSION " (compatible with GNU ld and GNU gold)";
++  "mold " MOLD_VERSION " (compatible with GNU ld)";
+ #endif
+ 
+ void cleanup() {
+diff --git a/test/elf/version.sh b/test/elf/version.sh
+index ae52b504..4ca576ef 100755
+--- a/test/elf/version.sh
++++ b/test/elf/version.sh
+@@ -10,10 +10,10 @@ mold="$(pwd)/mold"
+ t=out/test/elf/$testname
+ mkdir -p $t
+ 
+-"$mold" -v | grep -q 'mold .*compatible with GNU ld and GNU gold'
+-"$mold" --version | grep -q 'mold .*compatible with GNU ld and GNU gold'
++"$mold" -v | grep -q 'mold .*compatible with GNU ld'
++"$mold" --version | grep -q 'mold .*compatible with GNU ld'
+ 
+-"$mold" -V | grep -q 'mold .*compatible with GNU ld and GNU gold'
++"$mold" -V | grep -q 'mold .*compatible with GNU ld'
+ "$mold" -V | grep -q elf_x86_64
+ "$mold" -V | grep -q elf_i386
+ 
diff --git a/sys-devel/mold/metadata.xml b/sys-devel/mold/metadata.xml
index 42610750e82e..05bec5e598ef 100644
--- a/sys-devel/mold/metadata.xml
+++ b/sys-devel/mold/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
diff --git a/sys-devel/mold/mold-1.0.1-r1.ebuild b/sys-devel/mold/mold-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..e0cd2503b621
--- /dev/null
+++ b/sys-devel/mold/mold-1.0.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rui314/mold.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="AGPL-3"
+SLOT="0"
+
+# Try again after 1.0 (nearly there, but path-related issues)
+# https://github.com/rui314/mold/issues/137
+RESTRICT="test"
+
+RDEPEND=">=dev-cpp/tbb-2021.4.0:=
+	dev-libs/xxhash:=
+	sys-libs/zlib
+	!kernel_Darwin? (
+		>=dev-libs/mimalloc-2:=
+		dev-libs/openssl:=
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-no-gold-in-version.patch" )
+
+src_prepare() {
+	default
+
+	# Needs unpackaged dwarfdump
+	rm test/elf/{compress-debug-sections,compressed-debug-info}.sh || die
+}
+
+src_compile() {
+	tc-export CC CXX
+
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		SYSTEM_XXHASH=1 \
+		STRIP="true" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_test() {
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		check
+}
+
+src_install() {
+	emake \
+		SYSTEM_TBB=1 \
+		SYSTEM_MIMALLOC=1 \
+		SYSTEM_XXHASH=1 \
+		DESTDIR="${ED}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		STRIP="true" \
+		install
+}
diff --git a/sys-devel/mold/mold-1.0.1.ebuild b/sys-devel/mold/mold-1.0.2.ebuild
index 9751b231a53f..3e1594e0daec 100644
--- a/sys-devel/mold/mold-1.0.1.ebuild
+++ b/sys-devel/mold/mold-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,6 +42,8 @@ src_compile() {
 	tc-export CC CXX
 
 	emake \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
 		SYSTEM_TBB=1 \
 		SYSTEM_MIMALLOC=1 \
 		SYSTEM_XXHASH=1 \
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
index 9751b231a53f..3e1594e0daec 100644
--- a/sys-devel/mold/mold-9999.ebuild
+++ b/sys-devel/mold/mold-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,6 +42,8 @@ src_compile() {
 	tc-export CC CXX
 
 	emake \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
 		SYSTEM_TBB=1 \
 		SYSTEM_MIMALLOC=1 \
 		SYSTEM_XXHASH=1 \