gentoo auto-resync : 22:10:2023 - 14:44:09

10 files changed, 109 insertions, 87 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 649791bfca03..868ac8ec29e4 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 292bdacc514c..ee34d6cc0755 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,4 +1,6 @@
 AUX htmltidy-5.8.0-no_static_lib.patch 1282 BLAKE2B 6c5dd8ce16b0e05ce0cca9ea268b85bffa371f99e20d909f606c20c5fb6d06464f65daf7a297989966656f3eda0d5cc920a8f9e60dbbbba21927aab180567f9b SHA512 8742a0db922098f46d377861d56c6202144ed02c9603e3899817c9d1b5a903bc10e729066c2bc95b0a9c9b63603c6ed42a3b8486264d3560b78255b096b62000
+AUX htmltidy-5.8.0-ol_type.patch 1567 BLAKE2B fa07da261116af1d3634f8670da0c53b47621323bea883d989225a9b309399003a9a93f0b869550e28f1f655feabf1927d715a139833a00117f4a4f647c7d9f5 SHA512 4a83df6a594f49f7a6e739876e4e874c908ae9d1f92c2291a530950de44dd22313681662ce48fe13cddd0847c664bbd27375ee41e899b82888ccffaa84371e2f
 DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44
 EBUILD htmltidy-5.8.0-r1.ebuild 1523 BLAKE2B 0515e8f8e8852cea83db2f3bbf10c03da3a59771948485d870f9bb388d4175fc849a07919aa8a27d1d545c8aadc952253d867bf736059b4a52a6dbcf799c62b7 SHA512 18e42cd736ad7a26a2aa5c663490e0893523909888b4204faad1ec354e5f5be27d7ad3d7eb28d2fd7cc99b63f5ecae3930cc63a9019fd2fa463dc683bfa02a52
+EBUILD htmltidy-5.8.0-r2.ebuild 1572 BLAKE2B b85d40a9a8221212d5441634ce38999c092d35ed3ad7a1ab243edd6b212b3d59b27a6d904624efe3dca6c9b7e1daef1f7ec710071089541c9bfd828cf8e800dc SHA512 b4efcd5d117a66957ce82c010ef0ffd54e324464a4b24189761a3f570dcb863c3c19a8b8a42cd0f7865f84265ceacc34eb99f16bfa3b605fbc616bb0c1624433
 MISC metadata.xml 608 BLAKE2B 7fcc3eaa3f24191606776cc3a92f97d58f1ba27c3ebeea50727bc334d504ef09ff4387208222080574856db1e6d1d8689a9b22f1ef0f0347f3bb82d9a38a6afc SHA512 adc1857b273dc8bb8fd7215cd733e56dd41eb7e9eaf82ccf183f001afeeaafd2ba4cde4f9b75c2882427ebed7cfcb60a16408d19f9f6c6ad91b6beacc9edefeb
diff --git a/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch b/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch
new file mode 100644
index 000000000000..22d716f01561
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-5.8.0-ol_type.patch
@@ -0,0 +1,29 @@
+https://github.com/htacg/tidy-html5/issues/1012
+https://bugs.gentoo.org/916074
+
+commit e411ad0d2582471fe0961900b2789ee8b5b9cc4c
+Author: Markus Pister <pister@absint.com>
+Date:   Wed Jan 5 08:30:10 2022 +0100
+
+    Attribute 'type' in tag 'ol' allowed for (X)HTML5
+    
+    Mark the attribute 'type' as allowed for tag 'ol' in (X)HTML5.
+    
+    The attribute type was deprecated in HTML4. This decision was reverted
+    for HTML5, see
+    
+        https://www.w3.org/TR/2014/NOTE-html5-diff-20141209/#changed-attributes
+    
+    This fixes htacg#1012.
+
+--- a/src/attrdict.c
++++ b/src/attrdict.c
+@@ -2321,7 +2321,7 @@ const AttrVersion TY_(W3CAttrsFor_OL)[] =
+   { TidyAttr_START,                 xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 },
+   { TidyAttr_STYLE,                 xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|xxxx|HT50|XH50 }, /* CORE override */
+   { TidyAttr_TITLE,                 xxxx|xxxx|H40T|H41T|X10T|H40F|H41F|X10F|H40S|H41S|X10S|XH11|XB10|HT50|XH50 }, /* CORE override */
+-  { TidyAttr_TYPE,                  xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx },
++  { TidyAttr_TYPE,                  xxxx|HT32|H40T|H41T|X10T|H40F|H41F|X10F|xxxx|xxxx|xxxx|xxxx|xxxx|HT50|XH50 },
+   { TidyAttr_XMLNS,                 xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|xxxx|XH11|XB10|HT50|XH50 }, /* CORE override */
+   { TidyAttr_XML_LANG,              xxxx|xxxx|xxxx|xxxx|X10T|xxxx|xxxx|X10F|xxxx|xxxx|X10S|XH11|XB10|xxxx|XH50 }, /* CORE override */
+   INCLUDE_CORE_ATTRIBS
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild
new file mode 100644
index 000000000000..74031ae33649
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-5.8.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27 ruby30 ruby31 ruby32"
+RUBY_OPTIONAL="yes"
+
+inherit cmake ruby-ng
+
+MY_PN="tidy-html5"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="https://www.html-tidy.org/"
+SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/58" # subslot is SOVERSION
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="deprecated test"
+
+RESTRICT="!test? ( test )"
+ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-no_static_lib.patch
+	"${FILESDIR}"/${PN}-5.8.0-ol_type.patch
+)
+
+DOCS=( README.md README/CHANGELOG.md )
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	use test && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	# suppress ruby-ng export
+	default
+}
+
+src_prepare() {
+	# suppress ruby-ng export
+	cmake_src_prepare
+}
+
+src_compile() {
+	# suppress ruby-ng export
+	cmake_src_compile
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIDY_CONSOLE_SHARED=ON
+	)
+	use deprecated && mycmakeargs+=(
+		-DBUILD_TAB2SPACE=ON
+		-DTIDY_COMPAT_HEADERS=ON
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd regression_testing || die
+	rm -f Gemfile.lock
+	${RUBY} ./test.rb test -t "${BUILD_DIR}/tidy" || die "Test execution failed"
+}
+
+src_install() {
+	cmake_src_install
+	use deprecated && dobin "${BUILD_DIR}"/tab2space
+}
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
index f5f5205deb2f..517cd5260683 100644
--- a/app-text/kramdown-rfc/Manifest
+++ b/app-text/kramdown-rfc/Manifest
@@ -3,5 +3,5 @@ AUX kramdown-rfc-1.6.35-Remove-bin-echars.patch 1838 BLAKE2B f069feb771975e6db63
 DIST kramdown-rfc2629-1.6.36.gem 60928 BLAKE2B e1f5a3299ddca462b7ab3935019b95f58aebfc5de52271142b41cbf03102a574181b0d29d5701e0f6b710eb7c8b85dda0f9700b8e47698b6d079cd8c07d720b0 SHA512 d3c32bd0e692ebf5dfb428617ce6ae37ac91ff99021a59e11df205e88c76699c8fabd8dd7922f6e9a5653b12e3c113eeedbb38b6edd656d67cd16b5f03a3136e
 DIST kramdown-rfc2629-1.6.39.gem 62464 BLAKE2B 4063bab5ef8081c5a2aba3d881990d9ea4e6dd5ce01bf85e0ce6bc63b0fc6c1e8e9be413b00588c5e6e473ee26dfb6060aa8767ce6b4053c1b8750f79182e540 SHA512 bdfc611895f734a28e65b8d6b750fec387bb504d35feb8c6bbf4dbaf83b19b65fb61187e9b5e58ec64dbe72cbc9cc6efa78a349752340634ef2dc565bb096589
 EBUILD kramdown-rfc-1.6.36.ebuild 1123 BLAKE2B ddf621bc9496dc4628adf5736f377e5348695e49442c0f6562d1aa0929254383541e70d5f86d1561ac24a7df2b00028151c81402a43d2ecc87fe5237add56f6e SHA512 59eeff2a8bff387cfb3c8fb7c24cafe7edf92dca02c53ed005e9dfad618fd9a7ab092bd31e9a9d4434c2daf04665cf1eeeaba55ce53679b31ddf689251710334
-EBUILD kramdown-rfc-1.6.39.ebuild 1124 BLAKE2B 5f766d0bc384d55e6d6c9e92d44c206d2bc4c72d5f1a5f9d3cb612f1aaa5f2205e493e59b6c0d60ef506267f21eed5b52a22de99c6ddaf793e15d14f9a2ced1c SHA512 a363354ca02e9ed9d64fa6bb4a81847b18b60c3e8faba8860f5c4780bc6506a0a4cbe94be5b1b449c2fbaa5e1e97a4473a7b5905282d42b1ac65870a03627d7c
+EBUILD kramdown-rfc-1.6.39.ebuild 1123 BLAKE2B ddf621bc9496dc4628adf5736f377e5348695e49442c0f6562d1aa0929254383541e70d5f86d1561ac24a7df2b00028151c81402a43d2ecc87fe5237add56f6e SHA512 59eeff2a8bff387cfb3c8fb7c24cafe7edf92dca02c53ed005e9dfad618fd9a7ab092bd31e9a9d4434c2daf04665cf1eeeaba55ce53679b31ddf689251710334
 MISC metadata.xml 329 BLAKE2B 9185c25e51c2e8b627f4b429b3b9de5c751e05fe6d78831704f32811ec9962e7f05f057c6c8e68bbcf58b95b7f791357cc3ae4598f49e3e073063994bcd30e95 SHA512 8638caf7ae842a1cffccea4795d4769ec20a56107721b5a401bf430151c682332adee04fb1bc551d1ce4de875572a356b1f4bce0dad435c4c7bc4f91c686b9ff
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild
index ff1033582610..eca764b9c1dd 100644
--- a/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.39.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/cabo/kramdown-rfc"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.27-Drop-dependency-on-certified.patch
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 9efefb0db394..63dd397db0f5 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,5 +1,4 @@
 DIST pdftk-v3.3.3.tar.bz2 2205902 BLAKE2B 7802554cef4389670392ca2fda3dc4c041943ad21ecf47cfcd333dc1f0899796fabf9538388586f4e64a8a1fa5d7278a93f9e88c19a1ec510b24b85027888ad4 SHA512 48173d0c4698bc984221b56dff3e6434df7cf144dddfdbf684f8fa28b9eacfd0ebf9ebca0b87df3f9534a1ed13caa4c0866bd3e7a8cd06a21b46dfaedda9ea21
 EBUILD pdftk-3.3.3-r2.ebuild 1873 BLAKE2B a751ea87e638814712bf28c3ff6fe70040f214739165727160eccc8e8931ee5d090338ba6e6e56d651d0a02e27cccd218d6122032a33714280e32ac258109b8a SHA512 90f8cb1931e29591658818a47b1a8c8a961c3734a0587e506b49a8e8f309c9744338ab489bfb11a766ec1fa1d8ff0c9b135dc1816f70b546ddccda52e178a985
-EBUILD pdftk-3.3.3.ebuild 1927 BLAKE2B 706c5b3a723275644ab5d76382af3b6d0471573bfb46c168df064aff8c51754be9c4ff12b88fa996937b4c993473a00e6cf1b4826b39d7c46816baa21d5c459e SHA512 0775f3238877b793b5a0493cc422c965ac562b127c360054139ab3eef628a8c768f3c6e747f422422cb5f41199e66192074f9fc99f7422c6b0885c462c1f5e00
 EBUILD pdftk-9999.ebuild 2015 BLAKE2B 86616bdc94ec8c804061c8866f1e3aeed9d4c53e6686766d8b282699850415ad3ae5436d88fd057905d127d92474b4825a1bb4ece7ab96026eb0871527d20dd3 SHA512 762d6f5aad18159e9f8fea419379624484724703ee2932adfe22fe3dcffb149d851f3c4f8f7445322061f7ad16756209ec47bc7d60b0e4cb2515cb66e630f3d2
 MISC metadata.xml 427 BLAKE2B d839579ab02144cd303ff7094601b4db0473bfd39479cd24183e4012469fb2ccd4320c1c0d6bf36e1ed08a6ea51469eaabe19712a3d3a1e21c45a2b066cd3e79 SHA512 a015f4405e987d543783d3fcf36876b6d8d0bc986570f47baaf2ab12eb08be77024ad75450b98867d9e9a625168af51542ffe90214fd4f997dbb6c25b1f9324b
diff --git a/app-text/pdftk/pdftk-3.3.3.ebuild b/app-text/pdftk/pdftk-3.3.3.ebuild
deleted file mode 100644
index 27913e759f19..000000000000
--- a/app-text/pdftk/pdftk-3.3.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.gitlab.pdftk-java:pdftk-java:3.3.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A port of pdftk into java"
-HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
-SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-CP_DEPEND="
-	dev-java/bcprov:0
-	dev-java/commons-lang:3.6
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.github.stefanbirkner:system-rules:1.19.0 -> !!!groupId-not-found!!!
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-	test? (
-		app-text/poppler[cairo]
-		dev-java/system-rules:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-JAVA_MAIN_CLASS="com.gitlab.pdftk_java.pdftk"
-JAVA_SRC_DIR="java"
-JAVA_RESOURCE_DIRS="resources/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,system-rules"
-JAVA_TEST_SRC_DIR="test"
-
-src_prepare() {
-	default
-	mkdir resources || die
-	cp -r {,resources/}java || die
-	rm -r resources/java/com/gitlab/pdftk_java/com/lowagie/text/pdf/codec || die
-	find resources/java -type f \( -name '*.java' -o -name '*.sh' \) -exec rm -rf {} + || die
-}
-
-src_test() {
-	# some tests seem to need special treatment
-	einfo "Runnig first test"
-	JAVA_TEST_RUN_ONLY=(
-		com.gitlab.pdftk_java.CatTest
-		com.gitlab.pdftk_java.DataTest
-		com.gitlab.pdftk_java.FormTest
-		com.gitlab.pdftk_java.MultipleTest
-	)
-	java-pkg-simple_src_test
-	einfo "Running second test"
-	JAVA_TEST_RUN_ONLY=()
-	JAVA_TEST_EXCLUDES=(
-		com.gitlab.pdftk_java.CatTest
-		com.gitlab.pdftk_java.DataTest
-		com.gitlab.pdftk_java.FormTest
-		com.gitlab.pdftk_java.MultipleTest
-	)
-	java-pkg-simple_src_test
-}
diff --git a/app-text/xml2rfc/Manifest b/app-text/xml2rfc/Manifest
index f4c8826be47a..8ba46c02b5e4 100644
--- a/app-text/xml2rfc/Manifest
+++ b/app-text/xml2rfc/Manifest
@@ -1,5 +1,5 @@
 DIST xml2rfc-3.17.4.gh.tar.gz 2858770 BLAKE2B b29b8a102668a5aa943a32b28a9d1669e2a6b0af03085a550c21a08e5bfb5ff3ee8979b03a3d7ae8e820ac8bf60455682914fd06a882e17183ca51aaf1dedf86 SHA512 3fc620eed12fc2a7f6015df8b6a5b1aa422cd8c26807e01d75498aee9257faad1bca68606f77598fb040a8dae074e35ffa0e2994a1ae8d59ee27d25fc6a755e5
 DIST xml2rfc-3.18.0.gh.tar.gz 2856552 BLAKE2B b2397d10c770694e8eb354220803f89525e64638fd1043c2672ce0849be72a397ab6f2bff03f689721f00e63ac034ec7b7aec20cf93b759f42a415ab66293908 SHA512 afd88bad84c6f5b734dd091e34ec41bff63fcf38f3bfab777818954dec31363300e13dd745b602e2c145fbe0df0be4e69918ddc71aac276bf0833ad4563c19f1
 EBUILD xml2rfc-3.17.4.ebuild 1462 BLAKE2B fe65e9102f5df75bf13c31ceb76cb0b26516fcee144646abc81b8b3152f3521145b3310f1779227473af2f574541e1aa2ba3d5561eabaaead94b3533e3afc001 SHA512 437da193162e5ad93dba2cbbfc2e8b970c4db1f03b1ee3ca3565f0224a792ea48b6904f66db911775372edbac8cd8a5ee09c946f54d4d757a01ba6bbd00cc6f0
-EBUILD xml2rfc-3.18.0.ebuild 1463 BLAKE2B 4feb72cc205dbc2ca958be8120ec71dae362802d0eea03add1f74762489c8b1ccb1306f9a06cd645d83cf5f9ca40cea6fe34ba78c8cc7075f4d72c6c16a1a6f9 SHA512 904e255b62c97f9b9b6151e182f7dc8a7fbe45d619932a31a6f5439346da919f3f1c6648e5fe4da89a2d15b38b943ea285b60ecaff950dc1304df4d60d9e4e32
+EBUILD xml2rfc-3.18.0.ebuild 1462 BLAKE2B fe65e9102f5df75bf13c31ceb76cb0b26516fcee144646abc81b8b3152f3521145b3310f1779227473af2f574541e1aa2ba3d5561eabaaead94b3533e3afc001 SHA512 437da193162e5ad93dba2cbbfc2e8b970c4db1f03b1ee3ca3565f0224a792ea48b6904f66db911775372edbac8cd8a5ee09c946f54d4d757a01ba6bbd00cc6f0
 MISC metadata.xml 374 BLAKE2B 3514fd485c7ca895f1b9f4a809ed97bb55396c1abd6a52ae6602e61b836fac3a0fbcbeec7dcb0789a6510cabb9920a33bfae4dfeb9bfba86ad9d02fbf917a720 SHA512 0e4697e08615993939416355b5d112f5f6ab1aad0bc74a3e33f6d3e7d0178ddf9b5fba70aa50fc6babed1ca27d89d1b0bff53223c1a55e636e82b6c617860cb9
diff --git a/app-text/xml2rfc/xml2rfc-3.18.0.ebuild b/app-text/xml2rfc/xml2rfc-3.18.0.ebuild
index 3b8c97ef1ad8..4e0aa2aed4e5 100644
--- a/app-text/xml2rfc/xml2rfc-3.18.0.ebuild
+++ b/app-text/xml2rfc/xml2rfc-3.18.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 RESTRICT="!test? ( test )"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	test? (