gentoo new year resync : 01.01.2021

5 files changed, 52 insertions, 9 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index bf250216bb11..30fbbc141d99 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index d8d305cb292d..f00b42fb9d80 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,3 +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-r1.ebuild 839 BLAKE2B 3f0b20041c958a443a9be97585cc0927ae5faa22b099409f6fcf6eb8c23f1e778f0200218c44e8739eeaf68ea552e06861adbe305e482efbf0942e56d49fe737 SHA512 96504cbabba0be6546ea50e52900c14bd77edb3c3829fec8689d1d5745546fba0c9e7214c13172f32e41ebe8efb6b95704faf8d559a909fe879cf8fd008deca3
+EBUILD edbrowse-3.7.5.1-r1.ebuild 886 BLAKE2B 38f6650b7598f4eb1714d9bd86d54c7b6d746a7929faba54d7e358c18917e126609142a5f2b32f760556c332249ea3e7876514d91208a433e8dbb5f84044269f SHA512 4f34e911a860786541681d25f6d6899be9ce9820ca6516e634184a382950e45c2c5858feb813377f4133ef04ad00c844784a0a55c9827dc4092291888abafc18
 MISC metadata.xml 265 BLAKE2B 333a998cb5ea96e582d48f5906deaf0a5af3b2b942c3100a2b0b2a100baa0ddc7952cceab5636f6d86759ceaf70f5647fec9b3015ec021cfbd1db02f6551a303 SHA512 33d21e1a3d9fc3a983a0cc5c55b3c1532f5cc63a358eb274e26f53efbb4bd64d25c0d067ce461c9f006592a5301875d41455454d9caa442cf49c5ca44bf79a0f
diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
index 1f0f66a9bb15..fe983eda8197 100644
--- a/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.7.5.1-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
+
+inherit cmake
 
 DESCRIPTION="Combination editor, browser, and mail client that is 100% text based"
 HOMEPAGE="http://edbrowse.org"
@@ -15,24 +16,30 @@ IUSE="odbc"
 
 RDEPEND="
 	app-text/tidy-html5
-	>=net-misc/curl-7.36.0
-	>=dev-libs/libpcre-7.8
-	>=sys-libs/readline-6.0
 	dev-lang/duktape:=
+	dev-libs/libpcre
+	net-misc/curl
+	sys-libs/readline:=
 	odbc? ( dev-db/unixODBC )"
 DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
+BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-manpage.patch
+)
+
 src_prepare() {
-	sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" CMakeLists.txt
-	cmake-utils_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-utils_src_configure
+	cmake_src_configure
 }
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
new file mode 100644
index 000000000000..bf9fa08245da
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..f0d667669113
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.7.5.1-manpage.patch
@@ -0,0 +1,23 @@
+--- 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 ()