* [gentoo-commits] repo/gentoo:master commit in: app-text/htmltidy/, app-text/htmltidy/files/
@ 2021-08-01 21:36 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2021-08-01 21:36 UTC (permalink / raw
To: gentoo-commits
commit: cae8e81c46bbfa5f94aa0e9e90d46f610f8f6e11
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 1 20:47:46 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Aug 1 21:36:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae8e81c
app-text/htmltidy: rename 20090325-r2 to 0.99.0
This is so that it appears to Portage as older than modern versions,
which use semantic versioning. Nb. 0.99 is the version number used in
the name of the library installed by this ebuild so it is sort of
correct.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
...11CVE-2015-5522.patch => htmltidy-0.99.0-CVE-2015-5522.patch} | 0
...6-strip-O2-flag.patch => htmltidy-0.99.0-strip-O2-flag.patch} | 0
...mltidy-20090325-tidyrc.patch => htmltidy-0.99.0-tidyrc.patch} | 0
.../{htmltidy-20090325-r2.ebuild => htmltidy-0.99.0.ebuild} | 9 +++++----
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app-text/htmltidy/files/11CVE-2015-5522.patch b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
similarity index 100%
rename from app-text/htmltidy/files/11CVE-2015-5522.patch
rename to 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
similarity index 100%
rename from app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
rename to 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
similarity index 100%
rename from app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
rename to app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-0.99.0.ebuild
similarity index 90%
rename from app-text/htmltidy/htmltidy-20090325-r2.ebuild
rename to app-text/htmltidy/htmltidy-0.99.0.ebuild
index 84937969eb8..8cacda80a2a 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
@@ -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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/htmltidy/, app-text/htmltidy/files/
@ 2021-08-02 16:42 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2021-08-02 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 435ed81027af89851662958ee3a45aaa7ced5966
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 2 16:27:38 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Aug 2 16:42:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=435ed810
app-text/htmltidy: add subslot, instrument tests, install headers and tab2space
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/htmltidy-5.8.0-no_static_lib.patch | 13 ++--
app-text/htmltidy/htmltidy-5.8.0-r1.ebuild | 76 ++++++++++++++++++++++
app-text/htmltidy/htmltidy-5.8.0.ebuild | 44 -------------
app-text/htmltidy/metadata.xml | 3 +
4 files changed, 85 insertions(+), 51 deletions(-)
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
index d9b1d3f5e50..476db036730 100644
--- 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
@@ -1,9 +1,10 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -394,35 +394,6 @@
+@@ -393,34 +393,7 @@
+ endif ()
- #------------------------------------------------------------------------
+-#------------------------------------------------------------------------
-# Static Library
-# The static library always builds.
-#------------------------------------------------------------------------
@@ -25,14 +26,12 @@
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- )
--install( FILES ${HFILES} DESTINATION ${INCLUDE_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
- # If the user option is still on.
+
#------------------------------------------------------------------------
+ # Dynamic Library
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 00000000000..3ca575025b3
--- /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/htmltidy-5.8.0.ebuild b/app-text/htmltidy/htmltidy-5.8.0.ebuild
deleted file mode 100644
index 5b1dd6ce6a2..00000000000
--- a/app-text/htmltidy/htmltidy-5.8.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-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"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# TODO: get this going - needs Ruby + a bunch of gems
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.8.0-no_static_lib.patch
-)
-
-DOCS=( README.md README/CHANGELOG.md )
-
-S="${WORKDIR}"/${MY_P}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TAB2SPACE=ON # for compatibility with W3C versions
- -DTIDY_COMPAT_HEADERS=ON # ditto
- -DTIDY_CONSOLE_SHARED=ON
- )
- cmake_src_configure
-}
-
-src_test() {
- pushd regression_testing >/dev/null || die
- # FIXME: use the correct Ruby interpreter
- ./test.rb test || die "Test execution failed"
- popd >/dev/null || die
-}
diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index da7f8463f9b..d1dfd0869ca 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -9,4 +9,7 @@
<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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/htmltidy/, app-text/htmltidy/files/
@ 2021-10-04 12:03 Marek Szuba
0 siblings, 0 replies; 3+ messages in thread
From: Marek Szuba @ 2021-10-04 12:03 UTC (permalink / raw
To: gentoo-commits
commit: 945e6972bd0a9ba9f533aa806e8bded164534cb6
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 4 12:01:23 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Oct 4 12:03:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945e6972
app-text/htmltidy: drop 0.99.0
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-text/htmltidy/Manifest | 2 -
.../files/htmltidy-0.99.0-CVE-2015-5522.patch | 34 ---------
.../files/htmltidy-0.99.0-strip-O2-flag.patch | 12 ----
.../htmltidy/files/htmltidy-0.99.0-tidyrc.patch | 31 ---------
app-text/htmltidy/htmltidy-0.99.0.ebuild | 80 ----------------------
5 files changed, 159 deletions(-)
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index bf1af04e9c9..4df9f10537d 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -1,3 +1 @@
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
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch b/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
deleted file mode 100644
index b4d6158ea04..00000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-CVE-2015-5522.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c18f27a58792f7fbd0b30a0ff50d6b40a82f940d Mon Sep 17 00:00:00 2001
-From: Geoff McLane <ubuntu@geoffair.info>
-Date: Wed, 3 Jun 2015 20:26:03 +0200
-Subject: [PATCH] Issue #217 - avoid len going negative, ever...
-
----
- src/lexer.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/lexer.c b/src/lexer.c
-index 376a3d8..664f806 100644
---- a/src/lexer.c
-+++ b/src/lexer.c
-@@ -3739,16 +3740,17 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
- /* and prompts attributes unless --literal-attributes is set to yes */
- /* #994841 - Whitespace is removed from value attributes */
-
-- if (munge &&
-+ /* Issue #217 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
-+ if ((len > 0) && munge &&
- TY_(tmbstrcasecmp)(name, "alt") &&
- TY_(tmbstrcasecmp)(name, "title") &&
- TY_(tmbstrcasecmp)(name, "value") &&
- TY_(tmbstrcasecmp)(name, "prompt"))
- {
-- while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
-+ while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
- --len;
-
-- while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
-+ while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
- {
- ++start;
- --len;
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
deleted file mode 100644
index 4c805cf2226..00000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-strip-O2-flag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN tidy.old/configure.in tidy-26/configure.in
---- tidy.old/configure.in 2006-02-13 17:17:49.000000000 +0100
-+++ tidy-26/configure.in 2006-02-13 17:17:20.000000000 +0100
-@@ -72,7 +72,7 @@
- if test $debug_build = yes; then
- CFLAGS="$save_cflags -g"
- else
-- CFLAGS="-O2 $save_cflags"
-+ CFLAGS="$save_cflags"
- fi
- #
- # =============================================
diff --git a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch b/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
deleted file mode 100644
index 942a61e1464..00000000000
--- a/app-text/htmltidy/files/htmltidy-0.99.0-tidyrc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: tidy-20090325/include/platform.h
-===================================================================
---- tidy-20090325.orig/include/platform.h
-+++ tidy-20090325/include/platform.h
-@@ -24,7 +24,7 @@ extern "C" {
- */
-
- /* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */
--/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */
-+#define TIDY_CONFIG_FILE "/etc/tidyrc"
- /* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */
-
- /*
-@@ -33,7 +33,7 @@ extern "C" {
- It enables tidy to find config files named ~/.tidyrc if
- the HTML_TIDY environment variable is not set.
- */
--/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
-+#define TIDY_USER_CONFIG_FILE "~/.tidyrc"
-
- /*
- Uncomment the following #define if your
-@@ -48,7 +48,7 @@ extern "C" {
- Contributed by Todd Lewis.
- */
-
--/* #define SUPPORT_GETPWNAM */
-+#define SUPPORT_GETPWNAM
-
-
- /* Enable/disable support for Big5 and Shift_JIS character encodings */
diff --git a/app-text/htmltidy/htmltidy-0.99.0.ebuild b/app-text/htmltidy/htmltidy-0.99.0.ebuild
deleted file mode 100644
index 8cacda80a2a..00000000000
--- a/app-text/htmltidy/htmltidy-0.99.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="tidy"
-MY_PV="20090325"
-MY_P="${MY_PN}-${MY_PV}"
-
-inherit epatch autotools
-
-DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
-HOMEPAGE="http://tidy.sourceforge.net/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
- mirror://gentoo/${MY_P}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-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 )"
-RDEPEND=""
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- # Required to setup the source dist for autotools
- einfo "Setting up autotools for source build"
- cp -R ./build/gnuauto/* . || die "could not prepare autotools environment"
-
- # Stop tidy from appending -O2 to our CFLAGS
- epatch "${FILESDIR}"/${P}-strip-O2-flag.patch
-
- # Define /etc/tidyrc for system wide config, bug 154834
- epatch "${FILESDIR}"/${P}-tidyrc.patch
-
- # Fix security bug 561452
- epatch "${FILESDIR}"/${P}-CVE-2015-5522.patch
-
- eautoreconf
-}
-
-src_compile() {
- default
-
- if use doc ; then
- doxygen htmldoc/doxygen.cfg || die "error making apidocs"
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-
- # Now the man page is provided as an xsl file, which
- # we can't use until htmltidy is merged.
- # I have generated the man page and quickref which is on
- # the mirrors. (bug #132429)
- doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1
-
- # Fix name before installing
- mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
- "${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
- cd "${S}"/htmldoc
- # Install basic html documentation
- dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html
-
- # If use 'doc' is set, then we also want to install the
- # api documentation
- use doc && dohtml -r api
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-04 12:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-04 12:03 [gentoo-commits] repo/gentoo:master commit in: app-text/htmltidy/, app-text/htmltidy/files/ Marek Szuba
-- strict thread matches above, loose matches on Subject: below --
2021-08-02 16:42 Marek Szuba
2021-08-01 21:36 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox