app-text/html2text: version bump to 2.2.2, cleanup old

Signed-off-by: Fabian Groffen <grobian@gentoo.org>

7 files changed, 28 insertions, 144 deletions

diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index e728da0cc0dd..fcf02de12f06 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,5 +1,2 @@
-DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
-DIST html2text-2.0.1.tar.gz 187962 BLAKE2B 326e3e190e1f062c9fa2057e5774c62366ef40beb1bb6aa586e58f0a46c97c8a505087287b2afffb5847d6a967307413b98228ce97bb9e286c0ad962b6fb331d SHA512 b9116a93d82d28853acdd534320ca4bc27fd4b0d6b07c8513324bdf736d15e5322e8f06f5c640030e4f8fda2d87c643e80bbc2f7b3f0f6a600ea9531891054fb
 DIST html2text-2.1.1.tar.gz 172655 BLAKE2B ab112e41b9cb08664ae9cba2b137b59e67769b2c8cd758022e9b650a2cbd1788064ada1949e9efddc591c819b0c86890e22504bebde68c2973c353b6fa85da33 SHA512 e7fbd795b06895d866e3379c343860dc8816d5069b476cd13abeb066ba1ad222050863c1d52c6b2c05d426a17af7b427913341c8205964b21f18a3d26c3528c4
-DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
-DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
+DIST html2text-2.2.2.tar.gz 328927 BLAKE2B 5b52d555bbeebfb89b1f1e8000328f7a386458aa4f65f77fadd5c36582ee90a2e16fc0e0c862f58bf99b9c69e97761d4338f23558264673081c6fef4b7c522e6 SHA512 e4c03a1d15e9f2cda63b28bba4b1927c920047eac2f9bc4b8b8b78148fbdc59f1df8d7f187df439523b922dd163f199d39a4b0c9b2fd92b72f821b2648283031
diff --git a/app-text/html2text/files/html2text-1.3.2a-compiler.patch b/app-text/html2text/files/html2text-1.3.2a-compiler.patch
deleted file mode 100644
index 19a1341209d4..000000000000
--- a/app-text/html2text/files/html2text-1.3.2a-compiler.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -38,8 +38,8 @@
-   return 0;
- }
- EOF
--CXX=unknown;
--for i in "CC" "g++" "cc" "$CC"; do
-+CXX=${CXX-unknown}
-+for i in "$CXX" "CC" "g++" "cc"; do
-   if $i -c $tmp_file.C 2>/dev/null; then
-     CXX="$i";
-     break;
diff --git a/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch b/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
deleted file mode 100644
index 949d8958a449..000000000000
--- a/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/urlistream.C
-+++ b/urlistream.C
-@@ -362,7 +362,7 @@
- int
- urlistream::get()
- {
--  char ch;
-+  unsigned char ch;
-   int ret = ::read(fd_, &ch, 1);
-   return (ret > 0 ? ch : -1);
- }
diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild
deleted file mode 100644
index 16360f5083c1..000000000000
--- a/app-text/html2text/html2text-1.3.2a-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="HTML to text converter"
-HOMEPAGE="http://www.mbayer.de/html2text/"
-SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
-	http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff
-	http://www.mbayer.de/html2text/downloads/patch-amd64-${P}.diff
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-PATCHES=(
-	"${FILESDIR}/${P}-compiler.patch"
-	"${FILESDIR}/${P}-urlistream-get.patch"
-	"${DISTDIR}/patch-utf8-${P}.diff"
-	"${DISTDIR}/patch-amd64-${P}.diff"
-)
-
-src_prepare() {
-	default
-	gunzip html2text.1.gz html2textrc.5.gz || die
-	tc-export CXX
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin html2text
-	doman html2text.1 html2textrc.5
-	dodoc CHANGES CREDITS KNOWN_BUGS README TODO
-}
diff --git a/app-text/html2text/html2text-2.0.1.ebuild b/app-text/html2text/html2text-2.0.1.ebuild
deleted file mode 100644
index 4da9acfef72e..000000000000
--- a/app-text/html2text/html2text-2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
-else
-	SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="HTML to text converter"
-HOMEPAGE="https://github.com/grobian/html2text"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_configure() {
-	# non-autoconf configure
-	tc-export CXX
-	./configure || die
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		MANDIR="${EPREFIX}/usr/share/man" \
-		DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
-		install
-}
diff --git a/app-text/html2text/html2text-2.2.2.ebuild b/app-text/html2text/html2text-2.2.2.ebuild
new file mode 100644
index 000000000000..990f9f594abc
--- /dev/null
+++ b/app-text/html2text/html2text-2.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+	SRC_URI="https://github.com/grobian/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	emake check
+}
diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
deleted file mode 100644
index 6344e6a73487..000000000000
--- a/app-text/html2text/html2text-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
-else
-	SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="HTML to text converter"
-HOMEPAGE="https://github.com/grobian/html2text"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_configure() {
-	# non-autoconf configure
-	tc-export CXX
-	default
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		MANDIR="${EPREFIX}/usr/share/man" \
-		DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
-		install
-}