gentoo resync : 12.05.2022

3 files changed, 45 insertions, 4 deletions

diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 2b3eb89f7911..91e41113363c 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -2,9 +2,11 @@ AUX html2text-1.3.2a-compiler.patch 247 BLAKE2B 83c719d6dbbc18e347ca45e6e0df8958
 AUX html2text-1.3.2a-urlistream-get.patch 186 BLAKE2B 600aac564090a318cd600858360b16e4cedc0005981d8c392ca450b7182fd0497cdbed6388d9429406756734ba2a204baaf314b73a2f69978574698e631289c2 SHA512 388c30725c72e3d7b372544b4a4fec871d3069fe050aec3212b047d8bdb0c31575e2703e46374b3b7d0422ca8cf2ce2f2d3960d56c32977d85a93d4d94b41659
 DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
 DIST html2text-2.0.0.tar.gz 162901 BLAKE2B 878ff3bfb55523f2bd2721f2320b55729ac84e250fe651c2347b8cfb0f6d524c18c4e820e255b474d59b5179c255b8acbfc51f7213539979b5d3977c42383ebd SHA512 94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8
+DIST html2text-2.0.1.tar.gz 187962 BLAKE2B 326e3e190e1f062c9fa2057e5774c62366ef40beb1bb6aa586e58f0a46c97c8a505087287b2afffb5847d6a967307413b98228ce97bb9e286c0ad962b6fb331d SHA512 b9116a93d82d28853acdd534320ca4bc27fd4b0d6b07c8513324bdf736d15e5322e8f06f5c640030e4f8fda2d87c643e80bbc2f7b3f0f6a600ea9531891054fb
 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
 EBUILD html2text-1.3.2a-r2.ebuild 958 BLAKE2B 8ec2e489b36030befdc0c0eba73feb43d0a723ffebabe9222666edfe9592152992a4b25385566326cde8fec7270c80bb8526125f4c13c9d4e1bb2c092932f157 SHA512 16881d04627f3d372edf2dae0640e1c7fc41a68b4f68934728d1030683cd3358243c88e2ef0309770cd1646d8bb0bb57e4c7228502c7a78f51b229eefe8d4275
 EBUILD html2text-2.0.0.ebuild 886 BLAKE2B 780ae465e27819ac3583d900c9a5fbfb208d291072f8dc47604bbe857a6bb61b42c46f6516fb1fd6652dfd8dc7d9d797ac1e2c3e3e4c75bf53f5baefde962abf SHA512 876343870bbab2e889c4a62edf67d84d2bc1a1cbb13d95e72e25950015186cace38231d5c445a20c72ac99197dde98964c66f3c5564f02a35027916b772133ca
-EBUILD html2text-9999.ebuild 886 BLAKE2B 780ae465e27819ac3583d900c9a5fbfb208d291072f8dc47604bbe857a6bb61b42c46f6516fb1fd6652dfd8dc7d9d797ac1e2c3e3e4c75bf53f5baefde962abf SHA512 876343870bbab2e889c4a62edf67d84d2bc1a1cbb13d95e72e25950015186cace38231d5c445a20c72ac99197dde98964c66f3c5564f02a35027916b772133ca
+EBUILD html2text-2.0.1.ebuild 925 BLAKE2B 1c5ff0129584d19f5a4a449775ac52ed8df2b50f246ec6e855031583669bbed942f89501e3b9eec469b7a6fb304fb53e1f50bf60553e44dcb24367c1cc7bb576 SHA512 2c837b2ce2eec4d5090132beeb03e1dcdb51fd8b804ecef7ccaeec8edf56648fe63f65d6307d6656d9b7f5dace48b20bd13d7ef4c7be774a07fd06d0303714d5
+EBUILD html2text-9999.ebuild 925 BLAKE2B 1c5ff0129584d19f5a4a449775ac52ed8df2b50f246ec6e855031583669bbed942f89501e3b9eec469b7a6fb304fb53e1f50bf60553e44dcb24367c1cc7bb576 SHA512 2c837b2ce2eec4d5090132beeb03e1dcdb51fd8b804ecef7ccaeec8edf56648fe63f65d6307d6656d9b7f5dace48b20bd13d7ef4c7be774a07fd06d0303714d5
 MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49
diff --git a/app-text/html2text/html2text-2.0.1.ebuild b/app-text/html2text/html2text-2.0.1.ebuild
new file mode 100644
index 000000000000..124d0962c321
--- /dev/null
+++ b/app-text/html2text/html2text-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
index f7558b5e8e28..124d0962c321 100644
--- a/app-text/html2text/html2text-9999.ebuild
+++ b/app-text/html2text/html2text-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,9 +19,10 @@ HOMEPAGE="https://github.com/grobian/html2text"
 LICENSE="GPL-2"
 SLOT="0"
 
-src_prepare() {
-	default
+src_configure() {
+	# non-autoconf configure
 	tc-export CXX
+	./configure || die
 }
 
 src_compile() {