gentoo resync : 29.12.2022

3 files changed, 64 insertions, 9 deletions

diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index ecda679cdbcb..d9d66ef672ba 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,5 +1,6 @@
+AUX edbrowse-3.8.2.1-quickjs-respect-flags.patch 1090 BLAKE2B 2f47f98bdbac25911650577bfe469291f9e489786eb5eb971283589a3dad8f582f9423a4c08d9696ad18217a7e47f70c21d50cb2bfbc2b737c3a8c731c1693a3 SHA512 a86f8fc67b319311b72c919e5829943c406926a535b90ab01fbd9aeb9559b40d25ad912068a8df090804c2324ce47b8610e10b2a0bf6e793d4d1ee29d01122f7
 AUX edbrowse-3.8.2.1-respect-ldflags.patch 392 BLAKE2B 65237beadceab3928786d56c6ac8872564f085b886e80e4638cf4872f2104fffa34119b7fa7443dc1d90fae0e5a3a9b124691ee69877aad8f6d786286b85c850 SHA512 cc7f096f30fb93f5fd3d15af77edfab43ef83df1ab341ff8984372c1c4a22aaf4cfb823446d2ed8da380a2baf178debb647dde05c1d633dd88cb6987b172cb0f
 DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b SHA512 b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927
 DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879 SHA512 4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0
-EBUILD edbrowse-3.8.2.1-r1.ebuild 1266 BLAKE2B e7328e8263f61e0025200b1a586d647eaf0c146b4c78af3604fe6826c085e8913b4ea4cb9c0d59fcc7ddafd4b7f6b1a043a23023995c00c19787247aa4d56a6c SHA512 6fc658efeec35a44bff32fdb2af4e09ee1a12b2ce7f12111290bede9b2865378547670bdf42568327f19f9ed428351869bcdf589b3ca11d654a5744a2a720585
+EBUILD edbrowse-3.8.2.1-r2.ebuild 1442 BLAKE2B 8bdaa3d9e6afb074dedfb2de9f93e7f669170393a50ef606cf6651862864ce4f9030223c34facd8ef3765316bde87495f1c3d1ee058ce2ac014bf5321368f0eb SHA512 7e31b07b7ef601120aa6d67dff1f00c27d7cea7147ddb77de3dd204c053038ddc89d867838514c1fa6d86fa11f7efb1d76c1acc438c61b4cb602d6f1ef7b5a7c
 MISC metadata.xml 340 BLAKE2B 13c88efa300cbf9a242554fa41b530a764b874060608cc3720ce7e835a3fff28524efb121270bc80a5ef8aeac04e1a0b51ac5eb421c7173b9896b9c8fa56e02f SHA512 03dd5a0561636f582985dc98b8d1b37a268f6d7a4109844be462066cae2162f53f8f09dd3d63f5a87e188c6754297b9daca190e481cd323ab6c9c045e8c33cc2
diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
index d9e6b8f22449..98763b8f9d32 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
+inherit edo toolchain-funcs
+
 QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
 QUICKJS_SHORT=2788d71
 QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
@@ -15,29 +18,39 @@ SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="odbc"
 
 RDEPEND="
 	>=app-text/htmltidy-5.0.0:=
+	dev-db/unixODBC
 	dev-libs/libpcre2:=
 	net-misc/curl
 	sys-libs/readline:=
-	odbc? ( dev-db/unixODBC )"
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/perl
 	sys-apps/ed
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-respect-ldflags.patch
+)
 
-	PATCHES=(
-		"${FILESDIR}/${P}"-respect-ldflags.patch
-	)
+src_prepare() {
+	default
+
+	cd "${QUICKJS_S}" || die
+	eapply "${FILESDIR}/${P}"-quickjs-respect-flags.patch
+}
 
 src_compile() {
 	# First build quickjs so we can link to its static library.
 	# Also, quickjs doesn't appear to tag releases.
-	tools/quickjobfixup "${QUICKJS_S}" || die
-	emake -C "${QUICKJS_S}"
+	edo tools/quickjobfixup "${QUICKJS_S}"
+	emake -C "${QUICKJS_S}" CC="$(tc-getCC)" AR="$(tc-getAR)" libquickjs.a
+
+	tc-export CC
 	emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
 }
 
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch
new file mode 100644
index 000000000000..f0af474427f0
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch
@@ -0,0 +1,41 @@
+* Don't overwrite CFLAGS
+* Respect CPPFLAGS
+
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@
+ ifdef CONFIG_CLANG
+   HOST_CC=clang
+   CC=$(CROSS_PREFIX)clang
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wextra
+   CFLAGS += -Wno-sign-compare
+   CFLAGS += -Wno-missing-field-initializers
+@@ -87,7 +87,7 @@
+ else
+   HOST_CC=gcc
+   CC=$(CROSS_PREFIX)gcc
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wno-array-bounds -Wno-format-truncation
+   ifdef CONFIG_LTO
+     AR=$(CROSS_PREFIX)gcc-ar
+@@ -110,7 +110,7 @@
+ CFLAGS+=$(DEFINES)
+ CFLAGS_DEBUG=$(CFLAGS) -O0
+ CFLAGS_SMALL=$(CFLAGS) -Os
+-CFLAGS_OPT=$(CFLAGS) -O2
++CFLAGS_OPT=$(CFLAGS)
+ CFLAGS_NOLTO:=$(CFLAGS_OPT)
+ LDFLAGS=-g
+ ifdef CONFIG_LTO
+@@ -269,7 +269,7 @@
+ 	$(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $<
+ 
+ $(OBJDIR)/%.nolto.o: %.c | $(OBJDIR)
+-	$(CC) $(CFLAGS_NOLTO) -c -o $@ $<
++	$(CC) $(CFLAGS_NOLTO) $(CPPFLAGS) -c -o $@ $<
+ 
+ $(OBJDIR)/%.m32.o: %.c | $(OBJDIR)
+ 	$(CC) -m32 $(CFLAGS_OPT) -c -o $@ $<