Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/diff-pdf/, app-text/diff-pdf/files/
Date: Wed, 03 Aug 2022 20:05:59
Message-Id: 1659557077.42d41d633e98b3afa5d3b6b5e1742d8e5d474367.mjo@gentoo
1 commit: 42d41d633e98b3afa5d3b6b5e1742d8e5d474367
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 3 20:03:42 2022 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 20:04:37 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d41d63
7
8 app-text/diff-pdf: drop 0.4.1-r2
9
10 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
11
12 app-text/diff-pdf/Manifest | 1 -
13 app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild | 45 ----------------------
14 .../diff-pdf-0.4.1-no-poppler-cairo-check.patch | 24 ------------
15 3 files changed, 70 deletions(-)
16
17 diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
18 index 0af00322a81c..9486bceaf457 100644
19 --- a/app-text/diff-pdf/Manifest
20 +++ b/app-text/diff-pdf/Manifest
21 @@ -1,2 +1 @@
22 -DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
23 DIST diff-pdf-0.5.tar.gz 135755 BLAKE2B e4b9599b4f443171473ef483fe868c58e0a0c9f23838895aa08f1bd662c4df920fdb50277d2d0a5b28d5bb66054e700012a98be636a12d34ec919ad85d332cc0 SHA512 62a868118fc807b433e504edfefdc6a9598a8197aaf5cd4e46451b67d5d73fcf9234bd6efbe6307ed7c3821aabef8edea81cbb0bbe5f4d34365c5f8d6dd9a51d
24
25 diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
26 deleted file mode 100644
27 index ec808cb9bab2..000000000000
28 --- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
29 +++ /dev/null
30 @@ -1,45 +0,0 @@
31 -# Copyright 1999-2021 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -WX_GTK_VER="3.0-gtk3"
37 -inherit autotools wxwidgets
38 -
39 -DESCRIPTION="A simple tool for visually comparing two PDF files"
40 -HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
41 -SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
42 -
43 -# The COPYING.icons file states that two icons were taken from
44 -# version 2.16.5 of GTK+, which is licensed LGPL-2+.
45 -LICENSE="GPL-2+ LGPL-2+"
46 -SLOT="0"
47 -KEYWORDS="amd64"
48 -IUSE=""
49 -
50 -# The build system checks for "poppler-glib", which is provided only
51 -# when app-text/poppler is built with USE=cairo. Moreover the glib ABI
52 -# of poppler is relatively stable, and I can only assume that diff-pdf
53 -# uses that rather than the low-level libpoppler.so API. Since the
54 -# subslot on app-text/poppler is ONLY for the low-level API, we
55 -# therefore don't need a subslot dependency on app-text/poppler.
56 -#
57 -# Since diff-pdf.cpp includes glib.h directly, I've included
58 -# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo.
59 -DEPEND="app-text/poppler[cairo]
60 - dev-libs/glib
61 - x11-libs/cairo
62 - x11-libs/wxGTK:${WX_GTK_VER}[X]"
63 -RDEPEND="${DEPEND}"
64 -
65 -PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" )
66 -
67 -src_prepare() {
68 - default
69 - eautoreconf
70 -}
71 -
72 -src_configure() {
73 - setup-wxwidgets
74 - default
75 -}
76
77 diff --git a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
78 deleted file mode 100644
79 index ecef020a998a..000000000000
80 --- a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
81 +++ /dev/null
82 @@ -1,24 +0,0 @@
83 -From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001
84 -From: FX Coudert <fxcoudert@×××××.com>
85 -Date: Sat, 12 Dec 2020 16:18:59 +0100
86 -Subject: [PATCH] Remove legacy poppler-cairo dependency (#69)
87 -
88 -poppler-glib already depended on it, so this is non-breaking,
89 -and it is removed in poppler 0.18.1.
90 ----
91 - configure.ac | 2 +-
92 - 1 file changed, 1 insertion(+), 1 deletion(-)
93 -
94 -diff --git a/configure.ac b/configure.ac
95 -index 382e220..2e9b6e5 100644
96 ---- a/configure.ac
97 -+++ b/configure.ac
98 -@@ -41,7 +41,7 @@ AC_LANG(C++)
99 - dnl === Library checks ===
100 -
101 - PKG_CHECK_MODULES(POPPLER,
102 -- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf])
103 -+ [poppler-glib >= 0.10 cairo-pdf])
104 -
105 - AM_OPTIONS_WXCONFIG
106 - AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base])