* [gentoo-commits] repo/gentoo:master commit in: app-text/pdf2djvu/files/, app-text/pdf2djvu/, profiles/
@ 2020-10-19 6:48 Michał Górny
0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2020-10-19 6:48 UTC (permalink / raw
To: gentoo-commits
commit: 6c6df7747797614043c9b07529e556f6aa63d586
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 06:46:30 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 06:46:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6df774
app-text/pdf2djvu: Remove last-rited pkg
Closes: https://bugs.gentoo.org/735240
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-text/pdf2djvu/Manifest | 4 --
.../files/pdf2djvu-0.9.12-poppler-0.76-1.patch | 35 -----------
.../files/pdf2djvu-0.9.12-poppler-0.76-2.patch | 69 ----------------------
.../files/pdf2djvu-0.9.12-poppler-0.76-3.patch | 38 ------------
app-text/pdf2djvu/metadata.xml | 11 ----
app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild | 61 -------------------
app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild | 65 --------------------
app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild | 64 --------------------
app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild | 61 -------------------
profiles/package.mask | 1 -
10 files changed, 409 deletions(-)
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
deleted file mode 100644
index c5ec33edf42..00000000000
--- a/app-text/pdf2djvu/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pdf2djvu-0.9.11.tar.xz 291356 BLAKE2B 726d9132c43c7dabdecf1e6174a3f2627db7f6981b3ba1f280ea131272ea0fef38acdaaa0f78ab0c883dd2cd046017edac46bb10d91e10668a6e480322e465fb SHA512 7b47ff4cd3a49f3fa1fec08490a192725899307d9c2a75a65a21d36abcece2f308e56161ec4c4f77f32fbdedcc167520657cad2b06cf178335f7e2169b7ada82
-DIST pdf2djvu-0.9.12.tar.xz 295088 BLAKE2B 6dd8b04f089e464becd7923c96ac2ca35efc28412c1913270c8c85656b58a74a47777b1b5b932d29e3ee2ad4d75bc6bcb85b835e5aa7e9d9c6a0ef7b242b5c46 SHA512 2a3acd8efa682541f45a0650070c0260903dadbd49ac6d4560e2e5ee3c5a68a1310dcb9d170035ee8fec0e588171f2c402047b3d7dc4e7d4033abe95f2ebde74
-DIST pdf2djvu-0.9.15.tar.xz 296208 BLAKE2B 19a88e3d38c80b6a67b5c79b4c9d03b882385ffdf4602a8fcde189bee4d25a70ed8feac7a14310c159327b126607673df57985522b2eff5699e85193729b3529 SHA512 825b1a01ea4fdda8d2354ef5c0702f1deea44a30893bdab3d4292a31a812b093d682c94ad73b85b6bb7dca5d865cc0357e2911aa4edd1133737a14dd102ad34f
-DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
deleted file mode 100644
index 06341298ff6..00000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aa3fdae51c19ad2865f92882ec9007feeb7e477a Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 1 Apr 2019 08:23:51 +0200
-Subject: [PATCH] Put Ref in pdf namespace.
-
----
- pdf-backend.hh | 1 +
- pdf2djvu.cc | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pdf-backend.hh b/pdf-backend.hh
-index 43899c0..d7872c3 100644
---- a/pdf-backend.hh
-+++ b/pdf-backend.hh
-@@ -82,6 +82,7 @@ namespace pdf
- typedef ::Catalog Catalog;
- typedef ::GooString String;
- typedef ::Goffset Offset;
-+ typedef ::Ref Ref;
-
- /* type definitions — annotations
- * ==============================
-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
-index 669eba5..d9e1532 100644
---- a/pdf2djvu.cc
-+++ b/pdf2djvu.cc
-@@ -86,7 +86,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
- int page;
- if (dest->isPageRef())
- {
-- Ref pageref = dest->getPageRef();
-+ pdf::Ref pageref = dest->getPageRef();
- page = catalog->findPage(pageref.num, pageref.gen);
- }
- else
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
deleted file mode 100644
index 356153b5cca..00000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 1 Apr 2019 08:49:02 +0200
-Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
- Catalog::findPage(int, int).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-
- pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
- pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
----
- pdf-backend.cc | 15 +++++++++++++++
- pdf-backend.hh | 2 ++
- pdf2djvu.cc | 2 +-
- 3 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/pdf-backend.cc b/pdf-backend.cc
-index f1d7662..a1b9b63 100644
---- a/pdf-backend.cc
-+++ b/pdf-backend.cc
-@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str)
- }
- #endif
-
-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
-+{
-+ return catalog->findPage(pgref.num, pgref.gen);
-+}
-+
-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
-+{
-+ return catalog->findPage(pgref);
-+}
-+
-+int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
-+{
-+ return find_page_impl<pdf::Catalog>(catalog, pgref);
-+}
-+
- // vim:ts=2 sts=2 sw=2 et
-diff --git a/pdf-backend.hh b/pdf-backend.hh
-index d7872c3..d88c956 100644
---- a/pdf-backend.hh
-+++ b/pdf-backend.hh
-@@ -436,6 +436,8 @@ namespace pdf
-
- const char * get_c_string(const pdf::String *str);
-
-+ int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
-+
- }
-
- #endif
-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
-index d9e1532..21f2d50 100644
---- a/pdf2djvu.cc
-+++ b/pdf2djvu.cc
-@@ -87,7 +87,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
- if (dest->isPageRef())
- {
- pdf::Ref pageref = dest->getPageRef();
-- page = catalog->findPage(pageref.num, pageref.gen);
-+ page = pdf::find_page(catalog, pageref);
- }
- else
- page = dest->getPageNum();
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
deleted file mode 100644
index b3d8cfad6df..00000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Tue, 23 Apr 2019 08:23:46 +0200
-Subject: [PATCH] pdf-backend: simplify find_page() implementation.
-
----
- pdf-backend.cc | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/pdf-backend.cc b/pdf-backend.cc
-index f6f5267..a94383e 100644
---- a/pdf-backend.cc
-+++ b/pdf-backend.cc
-@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str)
- }
- #endif
-
--template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
--{
-- return catalog->findPage(pgref.num, pgref.gen);
--}
--
--template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
--{
-- return catalog->findPage(pgref);
--}
--
- int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
- {
-- return find_page_impl<pdf::Catalog>(catalog, pgref);
-+#if POPPLER_VERSION >= 7600
-+ return catalog->findPage(pgref);
-+#else
-+ return catalog->findPage(pgref.num, pgref.gen);
-+#endif
- }
-
- // vim:ts=2 sts=2 sw=2 et
diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
deleted file mode 100644
index 7ae0b54679c..00000000000
--- a/app-text/pdf2djvu/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>printing@gentoo.org</email>
- <name>Gentoo Printing Project</name>
- </maintainer>
- <upstream>
- <remote-id type="bitbucket">jwilk/pdf2djvu</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
deleted file mode 100644
index 484184a9032..00000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- >=app-text/poppler-0.16.7:=
- dev-libs/libxml2:=
- dev-libs/libxslt:=
- graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
- doc/{changelog,credits,djvudigital,README}
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # bug 626874, poppler headers require C++11
- append-cxxflags -std=c++11
- default
-}
-
-src_configure() {
- local openmp=--disable-openmp
- use openmp && tc-has-openmp && openmp=--enable-openmp
-
- econf \
- ${openmp} \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
deleted file mode 100644
index 549b587cee2..00000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- >=app-text/poppler-0.16.7:=
- dev-libs/libxml2:=
- dev-libs/libxslt:=
- graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
- doc/{changelog,credits,djvudigital,README}
-)
-
-PATCHES=(
- "${FILESDIR}"/${P}-poppler-0.76-{1,2,3}.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # bug 626874, poppler headers require C++11
- append-cxxflags -std=c++11
- default
-}
-
-src_configure() {
- local openmp=--disable-openmp
- use openmp && tc-has-openmp && openmp=--enable-openmp
-
- econf \
- ${openmp} \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild
deleted file mode 100644
index 988a47a28bb..00000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- >=app-text/poppler-0.16.7:=
- dev-libs/libxml2:=
- dev-libs/libxslt:=
- graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
- doc/{changelog,credits,djvudigital,README}
-)
-
-PATCHES=(
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # bug 626874, poppler headers require C++11
- append-cxxflags -std=c++11
- default
-}
-
-src_configure() {
- local openmp=--disable-openmp
- use openmp && tc-has-openmp && openmp=--enable-openmp
-
- econf \
- ${openmp} \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
deleted file mode 100644
index cc21c69c5ee..00000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-text/djvu-3.5.21:=
- >=app-text/poppler-0.16.7:=
- dev-libs/libxml2:=
- dev-libs/libxslt:=
- graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
- dev-cpp/pstreams
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
- )
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
- doc/{changelog,credits,djvudigital,README}
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # bug 626874, poppler headers require C++11
- append-cxxflags -std=c++11
- default
-}
-
-src_configure() {
- local openmp=--disable-openmp
- use openmp && tc-has-openmp && openmp=--enable-openmp
-
- econf \
- ${openmp} \
- $(use_enable nls) \
- $(use_with graphicsmagick)
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 31a7b878e4f..6392f059d80 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -383,7 +383,6 @@ sci-mathematics/axiom
# Removal in 30 days. Please find relevant bugs on tracker bug #694800.
app-backup/genbackupdata
app-i18n/pology
-app-text/pdf2djvu
# Michał Górny <mgorny@gentoo.org> (2020-09-09)
# These packages (or package versions) still require Python 2.7.
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-10-19 6:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-19 6:48 [gentoo-commits] repo/gentoo:master commit in: app-text/pdf2djvu/files/, app-text/pdf2djvu/, profiles/ Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox