gentoo resync : 05.12.2021

4 files changed, 2 insertions, 74 deletions

diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 73aca8e16a66..819fb14a3ffb 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,6 +1,3 @@
-AUX cmark-0.29.0-python38_tests.patch 1136 BLAKE2B 788a0022fb2d2575ea18133f57863cd8c12958b4fb6f79ea8611c6358ed66531a3b923e9959ff2b29348a2506f5ad7b0fb7a5b4402cb299feb1c6939e1160a62 SHA512 bb07e53f4ead6022863edb738986761a1e7b5184737265166fcee9f9bc00124c71eb49643bcb4ea9d0634c08f1c1ca3916e3a4c76b0f801dd011a184bdc0f39e
-DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
 DIST cmark-0.30.2.tar.gz 246033 BLAKE2B 487f5adf47afdd4133e16b6cca1403cd555f8722b47c423960909de73aacac1d0f8b16311f6d5349addb5f03a86562545bb2ec80771b822bb8e5b82816375124 SHA512 aaa9b2103cf89c522f9b42a2b43c07ecf75e07eb42214c0be5de17682ea1faf9c85e3dd28fe91d446b69a34f9980bcab6e276a99b42540c40c9ee1481b3a0d17
-EBUILD cmark-0.29.0.ebuild 787 BLAKE2B 027d8eb0f2f1250a6af14bf310ab2cb1a1cfb95550dbdd93205d718b98d80dc32713cb0c81c827b3af4fe37e123bb68681dd1b111c0304a6a3052c732b01920e SHA512 b22bddd41344a49b331f3ba1ed7a8ac2d5f38bdf5d89916a5576363ca89bd58c456bd0ecbfa9e50bfac9a4ab37883f9a0ddcd70416f18a4e7284e2c2c9f0d902
-EBUILD cmark-0.30.2.ebuild 737 BLAKE2B 131b21f5b64684a9b432644c6ab30de400c792fc92512fdcbe089f5591ae1fb07a5eace219afd1ea35b37512af75141d76838f9bb5ab545d47dbcf47d95e8171 SHA512 f6c82ae0804aa270f4803840d450d2782ff7dd158eb0cca4be324c4e49b9bfdde1f3a51698b5acbf3b155f482eb48ccd41352261d792756b3cf3b586fcfa27a4
+EBUILD cmark-0.30.2.ebuild 733 BLAKE2B 626642b2db6194a4d975b13a78d9d1ea41e479acdba8b9102a7aff257644dad633fb86c234bc515ee0087788e03d750904a7e400c59a4059b8b457b61b4ab10f SHA512 15e82a99258da3804b2f348b812978689ce019fc8a8662e64e0bacdd3e3c8aed6addbf4c3847ad800b4be2a85fab5cf369883d2bf4d3703df197a5b73cb9a1f6
 MISC metadata.xml 504 BLAKE2B 5b9b29ddcf02b115bc37aeb217236e5092363991b75247f7d7c5da7e7fe0c5bf15ff0a397b332faefd2b150ff9cc239d4996caf6131306240efd641bffe52431 SHA512 f2ebd2271483a1847c63df11e0e6fa057abe8f19323d86f0632904e03ae321b1e689a98ab941e4d7ebaa50ee9220242f1488b35b08f73cec736df5c0a0024713
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
deleted file mode 100644
index a1db9210003d..000000000000
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="CommonMark parsing and rendering library and program in C"
-HOMEPAGE="https://github.com/commonmark/cmark"
-SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/0.29.0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python38_tests.patch"
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMARK_LIB_FUZZER=OFF
-		-DCMARK_SHARED=ON
-		-DCMARK_STATIC=OFF
-		-DCMARK_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
diff --git a/app-text/cmark/cmark-0.30.2.ebuild b/app-text/cmark/cmark-0.30.2.ebuild
index 67faa19c8c54..97d0f495a45e 100644
--- a/app-text/cmark/cmark-0.30.2.ebuild
+++ b/app-text/cmark/cmark-0.30.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/cmark/files/cmark-0.29.0-python38_tests.patch b/app-text/cmark/files/cmark-0.29.0-python38_tests.patch
deleted file mode 100644
index 13cd71815941..000000000000
--- a/app-text/cmark/files/cmark-0.29.0-python38_tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 92697d564042d5b914048e087e4274c3c71e0055 Mon Sep 17 00:00:00 2001
-From: Christopher Fujino <christopherfujino@gmail.com>
-Date: Sun, 12 Jul 2020 16:11:42 -0700
-Subject: [PATCH] replace cgi.escape with html.escape (#656)
-
----
- test/normalize.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/normalize.py b/test/normalize.py
-index 6073bf01..f8ece18d 100644
---- a/test/normalize.py
-+++ b/test/normalize.py
-@@ -13,7 +13,7 @@ class HTMLParseError(Exception):
- from html.entities import name2codepoint
- import sys
- import re
--import cgi
-+import html
- 
- # Normalization code, adapted from
- # https://github.com/karlcow/markdown-testsuite/
-@@ -66,7 +66,7 @@ def handle_starttag(self, tag, attrs):
-                     self.output += ("=" + '"' +
-                             urllib.quote(urllib.unquote(v), safe='/') + '"')
-                 elif v != None:
--                    self.output += ("=" + '"' + cgi.escape(v,quote=True) + '"')
-+                    self.output += ("=" + '"' + html.escape(v,quote=True) + '"')
-         self.output += ">"
-         self.last_tag = tag
-         self.last = "starttag"