Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libcdr/files/, media-libs/libcdr/
Date: Thu, 10 Jun 2021 15:34:53
Message-Id: 1623339137.bc46c866bbec747a7dfc2531e65af515d6f47a33.asturm@gentoo
1 commit: bc46c866bbec747a7dfc2531e65af515d6f47a33
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 6 16:59:17 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 10 15:32:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc46c866
7
8 media-libs/libcdr: Drop 0.1.6
9
10 Package-Manager: Portage-3.0.19, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-libs/libcdr/Manifest | 1 -
14 media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch | 27 -----------
15 media-libs/libcdr/libcdr-0.1.6.ebuild | 59 -----------------------
16 3 files changed, 87 deletions(-)
17
18 diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
19 index a2591d52618..9a0875ed191 100644
20 --- a/media-libs/libcdr/Manifest
21 +++ b/media-libs/libcdr/Manifest
22 @@ -1,2 +1 @@
23 -DIST libcdr-0.1.6.tar.xz 612068 BLAKE2B ec5226a28f101472ea3044e9e5b87dba57b584fc813dfda29e00281182d067126bf8a5740c32bc5cb545f230f6f96163aac2fdf08879ec64379b7845839bc88a SHA512 629d55da71c7333f41f60a32e2880deffcf80088096af1bbc8c572b80ef21d851102fdebce56f77245ed60822ca98e02c0867b192abef496a2313fde54a97bb6
24 DIST libcdr-0.1.7.tar.xz 618528 BLAKE2B 7e74b1936f80078f4b0a07e2e37f9d59489ad27acee66175032ba7250ab492310e4042c7b6d7995b1ffffee7da1c7562f5c2fc24457c3efe0b19fe7e00d8e42b SHA512 9af327fcf9f3f3ef1c446e92f4d2ff06ebaccb54d4c65b021960a212bf416f7098006324625f3e1c00500597eaa9da39832cc27b83a6cd593e97b76b1eb63d38
25
26 diff --git a/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch b/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch
27 deleted file mode 100644
28 index b8e7ba919a9..00000000000
29 --- a/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch
30 +++ /dev/null
31 @@ -1,27 +0,0 @@
32 -From 0dc41f8f6bd099813acb3972f75e4bbb2a5cdb2d Mon Sep 17 00:00:00 2001
33 -From: Lars Wendler <polynomial-c@g.o>
34 -Date: Fri, 30 Oct 2020 14:28:08 +0100
35 -Subject: [PATCH] Fix build with icu-68.1
36 -
37 -icu-68.1 removed public macro definitions for TRUE and FALSE
38 -
39 -Signed-off-by: Lars Wendler <polynomial-c@g.o>
40 ----
41 - src/lib/libcdr_utils.cpp | 2 +-
42 - 1 file changed, 1 insertion(+), 1 deletion(-)
43 -
44 -diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp
45 -index 09ab42e..250f0a0 100644
46 ---- a/src/lib/libcdr_utils.cpp
47 -+++ b/src/lib/libcdr_utils.cpp
48 -@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLe
49 - csd = ucsdet_open(&status);
50 - if (U_FAILURE(status) || !csd)
51 - return 0;
52 -- ucsdet_enableInputFilter(csd, TRUE);
53 -+ ucsdet_enableInputFilter(csd, true);
54 - ucsdet_setText(csd, (const char *)buffer, bufferLength, &status);
55 - if (U_FAILURE(status))
56 - throw libcdr::EncodingException();
57 ---
58 -2.29.2
59
60 diff --git a/media-libs/libcdr/libcdr-0.1.6.ebuild b/media-libs/libcdr/libcdr-0.1.6.ebuild
61 deleted file mode 100644
62 index 1e277da8ed1..00000000000
63 --- a/media-libs/libcdr/libcdr-0.1.6.ebuild
64 +++ /dev/null
65 @@ -1,59 +0,0 @@
66 -# Copyright 1999-2020 Gentoo Authors
67 -# Distributed under the terms of the GNU General Public License v2
68 -
69 -EAPI=7
70 -
71 -if [[ ${PV} = 9999 ]]; then
72 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git"
73 - inherit autotools git-r3
74 -else
75 - SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
76 - KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
77 -fi
78 -
79 -DESCRIPTION="Library parsing the Corel cdr documents"
80 -HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
81 -
82 -LICENSE="MPL-2.0"
83 -SLOT="0"
84 -IUSE="doc test"
85 -
86 -RESTRICT="!test? ( test )"
87 -
88 -RDEPEND="
89 - dev-libs/icu:=
90 - dev-libs/librevenge
91 - media-libs/lcms:2
92 - sys-libs/zlib
93 -"
94 -DEPEND="${RDEPEND}
95 - dev-libs/boost
96 -"
97 -BDEPEND="
98 - sys-devel/libtool
99 - virtual/pkgconfig
100 - doc? ( app-doc/doxygen )
101 - test? ( dev-util/cppunit )
102 -"
103 -
104 -PATCHES=( "${FILESDIR}/${P}-icu-68.patch" ) # bug 751934
105 -
106 -src_prepare() {
107 - default
108 - [[ -d m4 ]] || mkdir "m4"
109 - [[ ${PV} == 9999 ]] && eautoreconf
110 -}
111 -
112 -src_configure() {
113 - local myeconfargs=(
114 - --disable-static
115 - $(use_with doc docs)
116 - $(use_enable test tests)
117 - )
118 - econf "${myeconfargs[@]}"
119 -}
120 -
121 -src_install() {
122 - default
123 - find "${D}" -name '*.la' -delete || die
124 -}