summaryrefslogtreecommitdiff
path: root/app-text/htmltidy
diff options
context:
space:
mode:
Diffstat (limited to 'app-text/htmltidy')
-rw-r--r--app-text/htmltidy/Manifest13
-rw-r--r--app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch (renamed from app-text/htmltidy/files/11CVE-2015-5522.patch)0
-rw-r--r--app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch (renamed from app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch)0
-rw-r--r--app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch (renamed from app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch)0
-rw-r--r--app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch37
-rw-r--r--app-text/htmltidy/htmltidy-0.99.0.ebuild (renamed from app-text/htmltidy/htmltidy-20090325-r2.ebuild)11
-rw-r--r--app-text/htmltidy/htmltidy-5.8.0-r1.ebuild76
-rw-r--r--app-text/htmltidy/metadata.xml12
8 files changed, 136 insertions, 13 deletions
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 9c5fb0fb3f9e..e5daf21e9b84 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,7 +1,10 @@
-AUX 11CVE-2015-5522.patch 1387 BLAKE2B 0a33769a37f78693025a3fb7e2bdcb6d02634df7c7cb417bad760ddc6318a51d1def3dc318a06b4182a916e664a0b47e2e3b8e40dfaff3616745c668b5b81a56 SHA512 d543dcf963fca7eaf644033a6f0252ec16b628984e1acd86fdb6d4657f01a2b3010c4c5f41b48126ce91cd38b5902349289ae4e11376cdc827813aac84b83f2c
-AUX htmltidy-20090325-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce68cc97488dd0fda0214b4437b6f9bc29e0e29f046328bd1df4eb0143757d7b866df06fd302d2b2c367817e0deec5202a SHA512 2acef36a990196c4c995a4678988f5f4bc51b87c17a01843b1f7cefc4ff1062425d366b29ace0839ea8b6b64a8923c5f56ac4048106825b946059eae8951e326
-AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
+AUX htmltidy-0.99.0-CVE-2015-5522.patch 1387 BLAKE2B 0a33769a37f78693025a3fb7e2bdcb6d02634df7c7cb417bad760ddc6318a51d1def3dc318a06b4182a916e664a0b47e2e3b8e40dfaff3616745c668b5b81a56 SHA512 d543dcf963fca7eaf644033a6f0252ec16b628984e1acd86fdb6d4657f01a2b3010c4c5f41b48126ce91cd38b5902349289ae4e11376cdc827813aac84b83f2c
+AUX htmltidy-0.99.0-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
+AUX htmltidy-0.99.0-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce68cc97488dd0fda0214b4437b6f9bc29e0e29f046328bd1df4eb0143757d7b866df06fd302d2b2c367817e0deec5202a SHA512 2acef36a990196c4c995a4678988f5f4bc51b87c17a01843b1f7cefc4ff1062425d366b29ace0839ea8b6b64a8923c5f56ac4048106825b946059eae8951e326
+AUX htmltidy-5.8.0-no_static_lib.patch 1282 BLAKE2B 6c5dd8ce16b0e05ce0cca9ea268b85bffa371f99e20d909f606c20c5fb6d06464f65daf7a297989966656f3eda0d5cc920a8f9e60dbbbba21927aab180567f9b SHA512 8742a0db922098f46d377861d56c6202144ed02c9603e3899817c9d1b5a903bc10e729066c2bc95b0a9c9b63603c6ed42a3b8486264d3560b78255b096b62000
+DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fcbe5cfbd56c29d9d67ffe11fcdc20aa03aace65e6dc5315988dc0dd1fc148be616549f4f84f37928e662633bd7ec SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44
DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
-EBUILD htmltidy-20090325-r2.ebuild 1965 BLAKE2B 7e90c59b30fb3888b51fcae2b901c69c364f9b994728dafd7a3125430db13e918c98feca48ce7d862d76da0a4bcdb49ebdffa612fe193d95e4c11304094471f5 SHA512 bd5cd045050d4dc99d982dbc6532cb003cf34b20123e0b782aa1649c3558f6d49c789c56274f6181d1fac7e4868e57f78d6e501ce7ba99af13d367d4492e541b
-MISC metadata.xml 299 BLAKE2B 45af58b9f27f8329d072008a1089edae34741b855b1626cc56eb97efef684b316ce5573308ef1e73d4aa7e1cde74b0c10d5d7becee71707f5b3439f451a433ea SHA512 cd21089fbc56a2608734a5821826da373a5112e1676bf3c3481320236f5583ff1240e118e0021130625826c76cb426ca681e0dec3c6e4d2df22f8967da15321d
+EBUILD htmltidy-0.99.0.ebuild 1970 BLAKE2B 3070aed3a7fd97500449b0a9d15e94310d0fc6e1132031eb780c219341906c9c28d18c17510768a39f7c0abeada96ba536281d4e363cd9a5dee333cf05d80ef5 SHA512 c2daf06a319549320e4510df60f240e9f6a9504657fc230ca3d6af535804b1daf47fae2c6f92bab84fdc31b3968683e30228196249b60e92d480540006c89c2d
+EBUILD htmltidy-5.8.0-r1.ebuild 1673 BLAKE2B ba7ea7bc6a05fc3d21c31bae0d7fc2d57b1382920b4d98acd04283aca7c65fb45096b759d41ed1940f2cd77c64b559964d558f688d5b6488e6c74f519e5133d1 SHA512 79f2fac07b6d4a75a2b128e5834799737270a5c23b864f02d76dcc78ffad3751cf4342c324565b31b3478413c6075d83f440d89ed3fcdf328db02b1e45ce475d
+MISC metadata.xml 495 BLAKE2B db90fdb2d6e42059e23252b6be26e4d010c2bedbb522fb247b18a06b9f4328f8ef64a170e170cd510e7a677da4c046217914637416e37b0b31bb342362915efd SHA512 c83ecc62f8023d8a9d2ff50580e2a43879c0a99e1249e720ecd5bc90cdb9c33f0a86d4c65db580f25f2061f409ca27ba196b0088670367e40d2e29522e1f704a
diff --git a/app-text/htmltidy/files/11CVE-2015-5522.patch b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
index b4d6158ea04a..b4d6158ea04a 100644
--- a/app-text/htmltidy/files/11CVE-2015-5522.patch
+++ b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
diff --git a/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
index 4c805cf2226f..4c805cf2226f 100644
--- a/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
+++ b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
diff --git a/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
index 942a61e1464c..942a61e1464c 100644
--- a/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
+++ b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
diff --git a/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch b/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch
new file mode 100644
index 000000000000..476db036730f
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-5.8.0-no_static_lib.patch
@@ -0,0 +1,37 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,34 +393,7 @@
+ endif ()
+
+
+-#------------------------------------------------------------------------
+-# Static Library
+-# The static library always builds.
+-#------------------------------------------------------------------------
+-set(name tidy-static)
+-add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} )
+-if (WIN32)
+- set_target_properties( ${name} PROPERTIES
+- OUTPUT_NAME ${LIB_NAME}_static )
+-else ()
+- set_target_properties( ${name} PROPERTIES
+- OUTPUT_NAME ${LIB_NAME} )
+-
+-endif ()
+-if (NOT TIDY_CONSOLE_SHARED) # user wants default static linkage
+- list ( APPEND add_LIBS ${name} )
+-endif ()
+-install(TARGETS ${name}
+- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+- )
+ install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} )
+-if(MSVC)
+- # install(FILES $<TARGET_PDB_FILE:${name}> DESTINATION lib OPTIONAL)
+- INSTALL(FILES ${PROJECT_BINARY_DIR}/${name}.dir/Debug/${name}.pdb
+- DESTINATION lib CONFIGURATIONS Debug )
+-endif()
+
+ #------------------------------------------------------------------------
+ # Dynamic Library
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-0.99.0.ebuild
index dcca33053d66..8cacda80a2a1 100644
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-0.99.0.ebuild
@@ -4,7 +4,8 @@
EAPI=5
MY_PN="tidy"
-MY_P="${MY_PN}-${PV}"
+MY_PV="20090325"
+MY_P="${MY_PN}-${MY_PV}"
inherit epatch autotools
@@ -15,7 +16,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug doc static-libs"
DEPEND="doc? ( app-doc/doxygen )"
@@ -29,13 +30,13 @@ src_prepare() {
cp -R ./build/gnuauto/* . || die "could not prepare autotools environment"
# Stop tidy from appending -O2 to our CFLAGS
- epatch "${FILESDIR}"/htmltidy-5.10.26-strip-O2-flag.patch
+ epatch "${FILESDIR}"/${P}-strip-O2-flag.patch
# Define /etc/tidyrc for system wide config, bug 154834
- epatch "${FILESDIR}"/htmltidy-20090325-tidyrc.patch
+ epatch "${FILESDIR}"/${P}-tidyrc.patch
# Fix security bug 561452
- epatch "${FILESDIR}"/11CVE-2015-5522.patch
+ epatch "${FILESDIR}"/${P}-CVE-2015-5522.patch
eautoreconf
}
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
new file mode 100644
index 000000000000..3ca575025b3c
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby26 ruby27"
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="deprecated test"
+
+# TODO: in principle this works but the new dependencies have got WAY fewer
+# keywords at the moment, keep tests restricted until the situation has improved.
+#RESTRICT="!test? ( test )"
+#ruby_add_bdepend "test? ( dev-ruby/thor dev-ruby/tty-editor )"
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.8.0-no_static_lib.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/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index 295e70001214..d1dfd0869ca2 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>marecki@gentoo.org</email>
+ <name>Marek Szuba</name>
+ </maintainer>
<upstream>
- <remote-id type="cpe">cpe:/a:html-tidy:tidy</remote-id>
- <remote-id type="sourceforge">tidy</remote-id>
+ <remote-id type="cpe">cpe:/a:htacg:tidy</remote-id>
+ <remote-id type="github">htacg/tidy-html5</remote-id>
</upstream>
+ <use>
+ <flag name="deprecated">Install tools and header files which are now considered deprecated</flag>
+ </use>
</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 18:52:22 +0000