gentoo resync : 15.01.2020

4 files changed, 52 insertions, 20 deletions

diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
index 21d04d193cf8..48dde3fbb9f3 100644
--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@@ -1,6 +1,8 @@
 AUX timeout.patch 460 BLAKE2B 66cb2918b2ad85cb987ecae492626a0ca06344cac4e9fab1f6a141bcb7822356936439e2239ac586aed8a163e297a5b563e51d382e372c2435256933a4ca3612 SHA512 00ccee1c2040149432565abf4cc0bc8966801202a88c75f246d4b4c986dd43288f30045d4e966c973efa946532eec1f07a6bdff0b9307bd9c12475c9309f3fa5
 DIST unoconv-0.8.2.tar.gz 104072 BLAKE2B 1ac16159f939a06cc75f3ff23f5aa7f1c4d49a41d4cce5e9c5866714ef1b3b969f94c074d36fff19d6af22375d5598033fb69761a09d3e60b81d794841c0e0d8 SHA512 cd6a4d06559895c0aebb5fda51ca86928474dd0ca0aa908e81762643186c29cf8436c889eedbb18bc74ed6016414d1aa831cd034614244d5aae677a6b4cdd4c9
+DIST unoconv-0.9.0.tar.gz 108493 BLAKE2B 36761f5cabd8cf0186ffa74202d8a9e0388ab9dc1a135b8e6b2275ed380de79da85d4955bca446810f4f71dff61bd38d7b131a91930729cbabfb10d656ba3891 SHA512 37d63ada32675fd0ebd089a74db453fdb7332a24e62cbf3e060d6d15cc503c76ede9ccc5e09467f4a38833a8358c09fde23cc8780a77c343268f20e0c37f2469
 DIST unoconv-0.9.tar.gz 108547 BLAKE2B 6620a7adb32c25182fbb5d0b141ec15d461ee7a73d8644e92337fd7748607d0d33a5978add4c72abf2b35f769f8bbfa35d411f77c4750606e22d6cbc7d7b3454 SHA512 1d6448154ec41776ed4d2ffd87b1caa15e231676a1161072676b1f5a466ea6dbae904de3eafb9ab2718fe4ed0ab7a2c9a91b1d19d79ea382c1e7576ea21e7f04
-EBUILD unoconv-0.8.2.ebuild 801 BLAKE2B 43b1244cbab0c4c401317d0345efeb972b15de886723667a0946febef7256efdd7ec710b1f380eafb19ca2cdff6c6d12f6021090a487100bdd9fee62664c07ec SHA512 b3f5eb06daf6ecadb5266fea27bba7aa92ab75fe3120e544b7344d1c6bd04c00634fb241904ecd59f066bf04653f1c6365b15d2aebd9aa4b843d061296d47064
-EBUILD unoconv-0.9.ebuild 803 BLAKE2B 4df34fd861ca141ddc570ef75b88776c6633c81c761787ff50fdf821455197dbf1d6cf7dc554877a1d9b70eaa535ddc235050670c978d0a5bed87abf837252a8 SHA512 7f39424a987d71f347db901af12134d80a1db2f8dc2b5379f943f2743d8fc794d01b3cb67ae581c16db6fd914a55e04ea46e2c0b25bb44186d5620820405526d
+EBUILD unoconv-0.8.2.ebuild 797 BLAKE2B b0fd7b2e196368a00260827264b21793eefa6ff37b77c5bb70d8f9ed9cad14132cfa7f7ef406a16fb5ff136499d770f78d5c80ba2ac3a0c20c50f9b459c1141a SHA512 180e24e8442424b0093719b4aa75c5fea4eb911165ef1b9817f04a070d121086491367a40c5fa870f18bdfcbf2d222180a621bb67ac622629630c80d4a3ffd37
+EBUILD unoconv-0.9.0.ebuild 764 BLAKE2B 9be7c977a94198731b2c4b87151b6651ea94233b44febc72e22bbc07c625c1589f23b2deda3b161e2f2b37f757f0f73e777680559525e7d96b7b8847bcf7fa41 SHA512 bd8c1004e8e0549d66432d17c2c82c67b23167f31ba0244960010713d14a04f26fbb1146707da80fe8db902e2f8986a5dfd23154c80c3c752ef456c6bac97bde
+EBUILD unoconv-0.9.ebuild 764 BLAKE2B 9be7c977a94198731b2c4b87151b6651ea94233b44febc72e22bbc07c625c1589f23b2deda3b161e2f2b37f757f0f73e777680559525e7d96b7b8847bcf7fa41 SHA512 bd8c1004e8e0549d66432d17c2c82c67b23167f31ba0244960010713d14a04f26fbb1146707da80fe8db902e2f8986a5dfd23154c80c3c752ef456c6bac97bde
 MISC metadata.xml 429 BLAKE2B c863daa05c0d7d265b60a04e0b1336067296b3854c83aa2c08891bbfe0d3fd45971312b6385b50c7ccb47676b65e97afee953a675176643c4bde348a6a3f0162 SHA512 3875bd4f015c8ffc902a3aedf042cd46cbe86f4ef6dfd1a493d3d7c171bf12248763e64d1f448800fa571157d3e5adac0aa191c9ad40667762ed17eadf3840ed
diff --git a/app-office/unoconv/unoconv-0.8.2.ebuild b/app-office/unoconv/unoconv-0.8.2.ebuild
index 578d57995ee4..6f1c17b6f631 100644
--- a/app-office/unoconv/unoconv-0.8.2.ebuild
+++ b/app-office/unoconv/unoconv-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit eutils python-single-r1
 
diff --git a/app-office/unoconv/unoconv-0.9.0.ebuild b/app-office/unoconv/unoconv-0.9.0.ebuild
new file mode 100644
index 000000000000..53aed7fea67a
--- /dev/null
+++ b/app-office/unoconv/unoconv-0.9.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-single-r1
+
+DESCRIPTION="Convert between document formats supported by LibreOffice"
+HOMEPAGE="http://dag.wiee.rs/home-made/unoconv/"
+SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-text/odt2txt
+	virtual/ooo
+"
+
+PATCHES=( "${FILESDIR}/timeout.patch" )
+
+src_prepare() {
+	default
+	python_fix_shebang .
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake -j1 doc-install install install-links DESTDIR="${D}"
+	dodoc AUTHORS ChangeLog CHANGELOG.md README.adoc
+}
diff --git a/app-office/unoconv/unoconv-0.9.ebuild b/app-office/unoconv/unoconv-0.9.ebuild
index c4555c5eadd4..53aed7fea67a 100644
--- a/app-office/unoconv/unoconv-0.9.ebuild
+++ b/app-office/unoconv/unoconv-0.9.ebuild
@@ -1,35 +1,30 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-single-r1
 
-inherit eutils python-single-r1
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="Convert between document formats supported by Libreoffice"
+DESCRIPTION="Convert between document formats supported by LibreOffice"
 HOMEPAGE="http://dag.wiee.rs/home-made/unoconv/"
 SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND=""
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
+RDEPEND="${PYTHON_DEPS}
 	!app-text/odt2txt
 	virtual/ooo
 "
 
+PATCHES=( "${FILESDIR}/timeout.patch" )
+
 src_prepare() {
-	eapply "${FILESDIR}/timeout.patch"
-	eapply_user
+	default
 	python_fix_shebang .
 }
 
@@ -37,6 +32,5 @@ src_compile() { :; }
 
 src_install() {
 	emake -j1 doc-install install install-links DESTDIR="${D}"
-
-	dodoc ChangeLog CHANGELOG.md README.adoc
+	dodoc AUTHORS ChangeLog CHANGELOG.md README.adoc
 }