gentoo resync : 21.06.2020

3 files changed, 42 insertions, 3 deletions

diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index f93fdd93ad6b..c52db3aab518 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -1,8 +1,10 @@
 AUX html2text-1.3.2a-compiler.patch 247 BLAKE2B 83c719d6dbbc18e347ca45e6e0df8958a615fb2c1d1f27119978d6efd15aeec6a32fa83e0d9524e4b5863dfec88787427e7c5f2757f8c5eafb0ee4d88fb96860 SHA512 f7c2192e65fe6976ac9d21d45fcb3eb9cd460314945fd9e8f62ada1189935c3799aea43b6ebb15a86b6f313fb95e4115d6aa67a148f11d1b8774d9ca115b538e
 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 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 968 BLAKE2B 00c6c5b53923a5954ea71126a4bd47cbe437a1482f0da36a44bc8862cf92f03fc6ba69a328e8e80e0dd61ec0a41eb35e66375ec940bf57fd98c1c68e5eb228c4 SHA512 fa461dcf03442c9b9d3d4e19ebdc6005f4dce9749120fba622d9aac7dfa2fe60fb3b33d4d701e67207869deedf98bb64089d8a03f2b77e4eaf8a8b620bb23964
-EBUILD html2text-9999.ebuild 759 BLAKE2B a4c2524bf3b2445986a9796725e8ce29a14fa5bb90d5908de154d2bb6ce2dcbdbd5815bc000accd4595d8cf6226fff3c7e1a1fbec870c8e0cc0b1d644fd37ac6 SHA512 4b33544b93d2943af6d8c2be96c578ccd833ef15931d4cf33a3a1e183fb750cd1dff5e8405c576ff43a8bb1f31dffef61c525e188c2f8e1202b8dbf62d4589c9
+EBUILD html2text-2.0.0.ebuild 897 BLAKE2B 76d33a641400dd2f26fd569530ecdf6835e9713b031f24e66c547b4a6abb98af435599de1f8a93e1e01dc4ca72a00074ee0f3aaba637214d5371749208d8d859 SHA512 b5b8222d66777f437be3e8ab747a920aa702ed3e8fac45723ab0dbcf162205efb53394722880a4e3dc1729d8e94085e2e612dc189fa90ab65f5ff4a1348d7633
+EBUILD html2text-9999.ebuild 897 BLAKE2B 76d33a641400dd2f26fd569530ecdf6835e9713b031f24e66c547b4a6abb98af435599de1f8a93e1e01dc4ca72a00074ee0f3aaba637214d5371749208d8d859 SHA512 b5b8222d66777f437be3e8ab747a920aa702ed3e8fac45723ab0dbcf162205efb53394722880a4e3dc1729d8e94085e2e612dc189fa90ab65f5ff4a1348d7633
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-text/html2text/html2text-2.0.0.ebuild b/app-text/html2text/html2text-2.0.0.ebuild
new file mode 100644
index 000000000000..564b1370c781
--- /dev/null
+++ b/app-text/html2text/html2text-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 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 ~x86-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_prepare() {
+	default
+	tc-export CXX
+}
+
+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 1e7099098c7f..564b1370c781 100644
--- a/app-text/html2text/html2text-9999.ebuild
+++ b/app-text/html2text/html2text-9999.ebuild
@@ -9,8 +9,8 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
 else
-	SRC_URI=""
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+	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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTML to text converter"