gentoo resync : 25.11.2020

5 files changed, 45 insertions, 61 deletions

diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index abbfe7b8735b..a8b1b0034f8a 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -1,7 +1,5 @@
-AUX libebook-0.1.2-boost-1.59-makefile.patch 335 BLAKE2B 21b62202de334b214e4dd04ea2d06e23fdacb49d35020a7e874f27cadecc13dd96221826469bac50d063583b2f10e93cd325d53fa6cff181ab806bb83623cf02 SHA512 fe435d531d0b4646d8642dfa471352519e3e606b31c3fe727ebbd1ebecdeef58663aadbd7ae95ac902055074b550b659c7eb5cc981a078315462da9a892abe43
-AUX libebook-0.1.2-tests.patch 784 BLAKE2B b7f2aa5b5abace8fb1276c534ef564d8e088b514569540d940f433b5d293a497e211782059186688d94db8139b1f9f0859180f59ea4ac7c0e9c86ca10d11a934 SHA512 e176746ed85e0564332b7ed6e375f0869931e7f489d734dc1ecbd685af595ce1247f933a82736c239df322d57505c40cd23af434db711b8087ee77e26de2c1ad
-DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
+AUX libebook-0.1.3-icu-68.patch 991 BLAKE2B d8b7cbd831e65cdd82131d13c50558e2ffe4ed5ab72c6f576267921176ff5d65be2a0c71b3c1cbd853db9456d6a7c20ba27516fbb7f4b7a83e22fa0680cd23ad SHA512 5378d95e926e4b385b8dfa957254b5a1d2b943be5562124b897ead5a81e2922a39d37768afdd010e18655f2a184d82c837b19ab7f862b19ff71c0d5e664c076b
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
-EBUILD libebook-0.1.2-r1.ebuild 1102 BLAKE2B 746d4d4dda955395419b8c316650e2048496da0ea0684732b668edbbf4e1fb3859c22ff7e08e3388d707cbc1f8bba6923a5d4e89ccb45e95ef8512615b9e0b30 SHA512 cefcdac481822765c7ff42d90183e3c90c3122b75b8380f694d3bba000205a184ff114772aff47fe1266528a6ea4a7c90845454af7f8c3e9db48065d9e9c968d
+EBUILD libebook-0.1.3-r1.ebuild 1062 BLAKE2B 34ec7e280b67c138c15a47f46d867490150cbfdf95e520824a267bbe0734c715ea1dc9aa784d388b0a7673146668af0043ef3038672cdf0f3f2a8fa7eea052ed SHA512 2c98c078ebb77ff932f760b68316a98e0bc0d0989bf6d05d58208b1948a0bbd5407d7cde85d6539f2ec06e6997f115d45aa6418dfe599f0082f9939ed8eb1586
 EBUILD libebook-0.1.3.ebuild 1039 BLAKE2B 78ed938aef8e76bd9470bfb0fb2de9d318c5c503efaf49d82f5ddcf973190d042715271a62204fc7b0b3d33be827a7e042dc85bd0b6cb44fe995e590a891892a SHA512 98eb112d3ff3c5b5b2572b38c42a933b47860622f21980b703f7d9154189915d93a4b54b33a759c0e16ddd9f36761e30944da12eac25b52014467141c861db0f
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch b/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
deleted file mode 100644
index 9869b308c73c..000000000000
--- a/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -64,6 +64,7 @@
- libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_SOURCES = \
- 	EBOOKDocument.cpp
- 
-+libe_book_internal_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
- libe_book_internal_la_SOURCES = \
- 	EBOOKBitStream.cpp \
- 	EBOOKBitStream.h \
diff --git a/app-text/libebook/files/libebook-0.1.2-tests.patch b/app-text/libebook/files/libebook-0.1.2-tests.patch
deleted file mode 100644
index 624051a757aa..000000000000
--- a/app-text/libebook/files/libebook-0.1.2-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 263d95ce191421a51d4b2d088297700032a8987b Mon Sep 17 00:00:00 2001
-From: eroen <eroen@occam.eroen.eu>
-Date: Mon, 19 Dec 2016 19:53:15 +0100
-Subject: [PATCH] Check for librevenge-stream if tests are enabled
-
-X-Gentoo-Bug: 603098
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=603098
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 6e00ed5..ecbd14b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -357,6 +357,8 @@ AS_IF([test "x$with_tools" = "xyes"],[
-     PKG_CHECK_MODULES([REVENGE_GENERATORS],[
-         librevenge-generators-0.0
-     ])
-+])
-+AS_IF([test "x$with_tools" = "xyes" || test "x$enable_tests" = "xyes"],[
-     PKG_CHECK_MODULES([REVENGE_STREAM],[
-         librevenge-stream-0.0
-     ])
--- 
-2.11.0
-
diff --git a/app-text/libebook/files/libebook-0.1.3-icu-68.patch b/app-text/libebook/files/libebook-0.1.3-icu-68.patch
new file mode 100644
index 000000000000..964b8b7e195d
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.3-icu-68.patch
@@ -0,0 +1,27 @@
+From 9ea3b4c2552770b66b83d44b6e6ccdd338296316 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 10:52:10 +0100
+Subject: [PATCH] Fix build with icu-68.0
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/lib/EBOOKCharsetConverter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/EBOOKCharsetConverter.cpp b/src/lib/EBOOKCharsetConverter.cpp
+index 0d85fa3..c9f8be0 100644
+--- a/src/lib/EBOOKCharsetConverter.cpp
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *const in, const unsigned le
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
+-- 
+2.29.2
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.3-r1.ebuild
index d7fb8e609183..8f1af5bceffe 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.3-r1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-MY_PN="libe-book"
-MY_P="${MY_PN}-${PV}"
+EAPI=7
 
+MY_P="libe-book-${PV}"
 inherit autotools flag-o-matic
 
 DESCRIPTION="Library parsing various ebook formats"
-HOMEPAGE="https://www.sourceforge.net/projects/libebook/"
+HOMEPAGE="https://sourceforge.net/projects/libebook/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc test tools"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	app-text/liblangtag
 	dev-libs/icu:=
 	dev-libs/librevenge
 	dev-libs/libxml2
@@ -35,10 +35,7 @@ RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-boost-1.59-makefile.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-icu-68.patch" )
 
 src_prepare() {
 	default
@@ -46,18 +43,17 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug 618854
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable test tests) \
+	local myeconfargs=(
+		--disable-static
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable test tests)
 		$(use_with tools)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }