gentoo resync : 12.05.2022

6 files changed, 67 insertions, 83 deletions

diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index a858139bfc47..ecda679cdbcb 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,5 +1,5 @@
-AUX edbrowse-3.7.5.1-fno-common.patch 508 BLAKE2B b7908cf4019500da7df9f37c59e76b204227fefc16e068a1f5f3454ba6c33f30f7740cf89f6d6a9d193e79fd4b35d8f9584bc43b89c888b339742f5708bb8d27 SHA512 8adaa0621546b24b471f1afe5c93991876320170619dae5babe48099a3ef14286914136efb6643924be84ab5b6d7f709f4f5728d117d45f502db3befe3e4195d
-AUX edbrowse-3.7.5.1-manpage.patch 946 BLAKE2B 34ee1e54da6d1f980f8876bf43dff170136ce18fa216df14e9bb62b62bafb7d33b622a01df6fdc8db9af95e27d2149b0916e0e7834960e647919e1a237257cdb SHA512 5aa93520e1765db0cf38c9d85debed9e97f08f3941c104611850a5bb496d13882ab12d850eec509378ed8c878049c659af460a334eaa5dcce7ed48fa85d8b906
-DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e SHA512 ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a
-EBUILD edbrowse-3.7.5.1-r3.ebuild 896 BLAKE2B c8ef654c3a52fc5f85441d33ee21a93a2554e28fa8f6dc85c387a3e87374647df70e8d6c6d259fc963657c638f7371723bdc6ae3671bf23cfe8f8af757dc1638 SHA512 700c1b9595b877965146e05fdc45a0f7dfd28aaf78168c259eb04c2ba7c49c95374b1037277fe1dd18622ded12843aec1eaa7a339684f3a8ac4b0240a0541f93
+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
 MISC metadata.xml 340 BLAKE2B 13c88efa300cbf9a242554fa41b530a764b874060608cc3720ce7e835a3fff28524efb121270bc80a5ef8aeac04e1a0b51ac5eb421c7173b9896b9c8fa56e02f SHA512 03dd5a0561636f582985dc98b8d1b37a268f6d7a4109844be462066cae2162f53f8f09dd3d63f5a87e188c6754297b9daca190e481cd323ab6c9c045e8c33cc2
diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
deleted file mode 100644
index 5fc5f1ffa3c1..000000000000
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
-HOMEPAGE="http://edbrowse.org"
-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-lang/duktape:=
-	dev-libs/libpcre:=
-	net-misc/curl
-	sys-libs/readline:=
-	odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-manpage.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${PF}:" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EDBR_ODBC=$(usex odbc)
-	)
-	cmake_src_configure
-}
diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
new file mode 100644
index 000000000000..d9e6b8f22449
--- /dev/null
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
+QUICKJS_SHORT=2788d71
+QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
+QUICKJS_P="quickjs-${QUICKJS_SHORT}"
+
+DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
+HOMEPAGE="https://edbrowse.org"
+SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/bellard/quickjs/archive/${QUICKJS_HASH}.tar.gz -> ${QUICKJS_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="odbc"
+
+RDEPEND="
+	>=app-text/htmltidy-5.0.0:=
+	dev-libs/libpcre2:=
+	net-misc/curl
+	sys-libs/readline:=
+	odbc? ( dev-db/unixODBC )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	sys-apps/ed
+	virtual/pkgconfig"
+
+	PATCHES=(
+		"${FILESDIR}/${P}"-respect-ldflags.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}"
+	emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
+}
+
+src_install() {
+	dobin src/edbrowse
+	newman doc/man-edbrowse-debian.1 edbrowse.1
+	DOCS="doc/sample*"
+	HTML_DOCS="doc/*.html"
+	einstalldocs
+}
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
deleted file mode 100644
index bf9fa08245da..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/eb.h
-+++ b/src/eb.h
-@@ -287,7 +287,7 @@ extern char *sslCerts;		/* ssl certificates to validate the secure server */
- extern int verifyCertificates;	/* is a certificate required for the ssl connection? */
- extern int displayLength;	// when printing a line
- extern int formatLineLength;	// when formatting html
--bool formatOverflow;
-+extern bool formatOverflow;
- extern int webTimeout, mailTimeout;
- extern uchar browseLocal;
- extern bool sqlPresent;		/* Was edbrowse compiled with SQL built in? */
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
deleted file mode 100644
index f0d667669113..000000000000
--- a/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -249,19 +249,7 @@ if (UNIX)
-     endif()
-     # copy to build dir
-     configure_file( ${UnixManFile} ${CMAKE_BINARY_DIR}/edbrowse.1 )
--    # find 'gzip' - warn if not...
--    find_program(GZIP_EXE gzip PATHS /bin )
--    if (GZIP_EXE)
--        # gzip it in place
--        execute_process(COMMAND ${GZIP_EXE} -f "edbrowse.1"
--            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--            INPUT_FILE edbrowse.1
--            OUTPUT_FILE edbrowse.1.gz )
--        # install it
--	install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1.gz DESTINATION ${UnixManDir})
--    else ()
--        message(WARNING "Unable to locate 'gzip'! No man page...")
--    endif ()
-+    install(FILES ${CMAKE_BINARY_DIR}/edbrowse.1 DESTINATION ${UnixManDir})
-     # install user guide
-     install(FILES doc/usersguide.html doc/usersguide_fr.html doc/sample.ebrc doc/sample_fr.ebrc doc/sample_it.ebrc DESTINATION ${UnixDocDir})
- endif ()
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
new file mode 100644
index 000000000000..3b511e1d2b38
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/makefile b/src/makefile
+index d65369a3..410d3e9d 100644
+--- a/src/makefile
++++ b/src/makefile
+@@ -31,7 +31,7 @@ endif
+ CFLAGS += $(DEBUGFLAGS)
+ 
+ #  Libraries and linker flags for edbrowse.
+-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm
++LDFLAGS += $(STRIP) $(LINKER_LIBS) -lpthread -lm
+ 
+ # LDFLAGS for quickjs loading.
+ QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl