gentoo resync : 15.06.2021

4 files changed, 2 insertions, 91 deletions

diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index c3e4102b37be..4f02be99acfc 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,7 +1,4 @@
-AUX libcdr-0.1.6-icu-68.patch 977 BLAKE2B ef4fa0e61607847aa0f7d1105775224f7ebed349d163cf0dd2d190f719aef041415ec87833d39fdc90c8a128b1aa052d1b7b8dda7c1cfeed962506d6556a04ec SHA512 fd0d109a48208596a86ba6df3a022bf60a02295af686a5fe924a866e808ef00023e92b40c9dceed701dac9c4243e61c017cf04b1ced9e73903e870ca379cd1e6
-DIST libcdr-0.1.6.tar.xz 612068 BLAKE2B ec5226a28f101472ea3044e9e5b87dba57b584fc813dfda29e00281182d067126bf8a5740c32bc5cb545f230f6f96163aac2fdf08879ec64379b7845839bc88a SHA512 629d55da71c7333f41f60a32e2880deffcf80088096af1bbc8c572b80ef21d851102fdebce56f77245ed60822ca98e02c0867b192abef496a2313fde54a97bb6
 DIST libcdr-0.1.7.tar.xz 618528 BLAKE2B 7e74b1936f80078f4b0a07e2e37f9d59489ad27acee66175032ba7250ab492310e4042c7b6d7995b1ffffee7da1c7562f5c2fc24457c3efe0b19fe7e00d8e42b SHA512 9af327fcf9f3f3ef1c446e92f4d2ff06ebaccb54d4c65b021960a212bf416f7098006324625f3e1c00500597eaa9da39832cc27b83a6cd593e97b76b1eb63d38
-EBUILD libcdr-0.1.6.ebuild 1152 BLAKE2B a59172d3b3950e253f94c167f6398ff1587bc268d528b05b1f8d3c112369c1c04ba7413600b5a3d897b5d287909ae721707ccca17da7c5c003acd902b4e46e90 SHA512 8ae02a13f6ab9e0acc47821afc731c6a7d04991b99248c9cb1740f46753601d6977805ce339e5d64cb3638a4bf93f8c1695bc3b602b8f802ea9672fab67efba3
-EBUILD libcdr-0.1.7.ebuild 1099 BLAKE2B ec4c040ff08e55e36a99ee0aabc127164cd2c461c53f7583fe3b09995f3712fb2c3dada933a380572d852aed9edd0fdaa2f670e2f878d8f1d5f2ed47ef406f2d SHA512 74abfd3de4d90dd85d43216d92f2f3b537244e9c875eeb54c005eb74540adc189900988d08086e9dddf0b890df2f53f6d5dfc54494499a0145a0652300af75ab
+EBUILD libcdr-0.1.7.ebuild 1094 BLAKE2B 053e77cc0eb6c077b10f47049a1c077785e465f79df2dd88ec6733b810e005bb1e2478310c3967f8ed66a2332ce7dcde7e4ba93d422bb8ef43ef09ae95b0aa7b SHA512 1683e1184785b8ae244c597030081c5c1a253c75700e2be0b19310018d8219f9dd235b9265e62d28b2b345a5b006041c334a7d517309611b3dfadb3e6f4743fd
 EBUILD libcdr-9999.ebuild 1099 BLAKE2B c0ca8298f6f3d222a9d94bee445be4f079bfe381db7b334a5dd3146096938b637e454383eee00f8dcdcf3257264e2be022f87f4693e864cb50489c669c771498 SHA512 2f505734658a48e57552aebf7d216a737443712da0178500a21bb6408212adb55e4c20c914b4b8e1cc4f739c90b1fb1655bc6d17b5cf056ca05bd2dcf6169545
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
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
deleted file mode 100644
index b8e7ba919a96..000000000000
--- a/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0dc41f8f6bd099813acb3972f75e4bbb2a5cdb2d Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 30 Oct 2020 14:28:08 +0100
-Subject: [PATCH] Fix build with icu-68.1
-
-icu-68.1 removed public macro definitions for TRUE and FALSE
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/lib/libcdr_utils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp
-index 09ab42e..250f0a0 100644
---- a/src/lib/libcdr_utils.cpp
-+++ b/src/lib/libcdr_utils.cpp
-@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLe
-     csd = ucsdet_open(&status);
-     if (U_FAILURE(status) || !csd)
-       return 0;
--    ucsdet_enableInputFilter(csd, TRUE);
-+    ucsdet_enableInputFilter(csd, true);
-     ucsdet_setText(csd, (const char *)buffer, bufferLength, &status);
-     if (U_FAILURE(status))
-       throw libcdr::EncodingException();
--- 
-2.29.2
diff --git a/media-libs/libcdr/libcdr-0.1.6.ebuild b/media-libs/libcdr/libcdr-0.1.6.ebuild
deleted file mode 100644
index 1e277da8ed11..000000000000
--- a/media-libs/libcdr/libcdr-0.1.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Library parsing the Corel cdr documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/icu:=
-	dev-libs/librevenge
-	media-libs/lcms:2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=( "${FILESDIR}/${P}-icu-68.patch" ) # bug 751934
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_with doc docs)
-		$(use_enable test tests)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libcdr/libcdr-0.1.7.ebuild b/media-libs/libcdr/libcdr-0.1.7.ebuild
index fb7137dfd9bc..25594ca8356f 100644
--- a/media-libs/libcdr/libcdr-0.1.7.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.7.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Library parsing the Corel cdr documents"