[gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/

[gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/

[Andreas Hüttel]

commit:     571da4a2bc45467e775491ef7fdb88657be1b41d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 13:57:02 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 13:57:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571da4a2

app-text/libebook: Fix build with boost-1.59, bug 574764

Package-Manager: portage-2.2.27

 .../files/libebook-0.1.2-boost-1.59-makefile.patch | 10 ++++
 app-text/libebook/libebook-0.1.2-r1.ebuild         | 57 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)

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
new file mode 100644
index 0000000..9869b30
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
@@ -0,0 +1,10 @@
+--- 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/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
new file mode 100644
index 0000000..9ee438d
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="libe-book"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils autotools
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="http://www.sourceforge.net/projects/libebook/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost:=
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/${P}-boost-1.59-makefile.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/

[Andreas Sturmlechner]

commit:     a06c43e79621adb834e423ac7ae95ed4095a4562
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 01:35:05 2016 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 01:42:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06c43e7

app-text/libebook: Fix tests

Gentoo-bug: 603098

Thanks to eroen <eroen <AT> occam.eroen.eu> for the patch
and taking it upstream.

Package-Manager: portage-2.3.0

 app-text/libebook/files/libebook-0.1.2-tests.patch | 27 ++++++++++++++++++++++
 app-text/libebook/libebook-0.1.2-r1.ebuild         |  5 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/app-text/libebook/files/libebook-0.1.2-tests.patch b/app-text/libebook/files/libebook-0.1.2-tests.patch
new file mode 100644
index 00000000..624051a
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.2-tests.patch
@@ -0,0 +1,27 @@
+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/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
index 53db1d6..deaff8a 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -35,7 +35,10 @@ RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${P}-boost-1.59-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.59-makefile.patch"
+	"${FILESDIR}/${P}-tests.patch"
+)
 
 src_prepare() {
 	default

[gentoo-commits] repo/gentoo:master commit in: app-text/libebook/files/, app-text/libebook/

[David Seifert]

commit:     892954cc08b34103186121c8e7552921ba18859b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 11:16:32 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 11:16:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892954cc

Reverts: a228bb748aa2c136269471a8efe74bee45a17af0 "app-text/libebook: Add patch for icu 68.1"

* Patch was already in, missed it when looking at the log

Closes: https://bugs.gentoo.org/751925
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-text/libebook/files/libebook-0.1.3-icu68.patch | 28 ----------------------
 app-text/libebook/libebook-0.1.3.ebuild            |  2 --
 2 files changed, 30 deletions(-)

diff --git a/app-text/libebook/files/libebook-0.1.3-icu68.patch b/app-text/libebook/files/libebook-0.1.3-icu68.patch
deleted file mode 100644
index 5fef619fbf9..00000000000
--- a/app-text/libebook/files/libebook-0.1.3-icu68.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
index 227b6d2509c..ebf1a337366 100644
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -36,8 +36,6 @@ RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${P}-icu68.patch )
-
 src_prepare() {
 	default
 	eautoreconf