Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/unoconv/
Date: Mon, 06 Jan 2020 17:16:55
Message-Id: 1578331002.6571bb8f3153ff84246ea39b85e56bc8e3af0f4b.asturm@gentoo
1 commit: 6571bb8f3153ff84246ea39b85e56bc8e3af0f4b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 6 17:12:34 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 6 17:16:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6571bb8f
7
8 app-office/unoconv: Add python3_{7,8}, drop python2_7, unused eutils
9
10 Overhaul the ebuild a bit.
11
12 Package-Manager: Portage-2.3.84, Repoman-2.3.20
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 app-office/unoconv/unoconv-0.9.ebuild | 24 +++++++++---------------
16 1 file changed, 9 insertions(+), 15 deletions(-)
17
18 diff --git a/app-office/unoconv/unoconv-0.9.ebuild b/app-office/unoconv/unoconv-0.9.ebuild
19 index 3f411bf6cd0..53aed7fea67 100644
20 --- a/app-office/unoconv/unoconv-0.9.ebuild
21 +++ b/app-office/unoconv/unoconv-0.9.ebuild
22 @@ -3,33 +3,28 @@
23
24 EAPI=7
25
26 -PYTHON_COMPAT=( python2_7 python3_6 )
27 +PYTHON_COMPAT=( python3_{6,7,8} )
28 +inherit python-single-r1
29
30 -inherit eutils python-single-r1
31 -
32 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
33 -
34 -DESCRIPTION="Convert between document formats supported by Libreoffice"
35 +DESCRIPTION="Convert between document formats supported by LibreOffice"
36 HOMEPAGE="http://dag.wiee.rs/home-made/unoconv/"
37 SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
38
39 LICENSE="GPL-2"
40 SLOT="0"
41 -
42 KEYWORDS="~amd64 ~x86"
43
44 -IUSE=""
45 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
46
47 -DEPEND=""
48 -RDEPEND="${DEPEND}
49 - ${PYTHON_DEPS}
50 +RDEPEND="${PYTHON_DEPS}
51 !app-text/odt2txt
52 virtual/ooo
53 "
54
55 +PATCHES=( "${FILESDIR}/timeout.patch" )
56 +
57 src_prepare() {
58 - eapply "${FILESDIR}/timeout.patch"
59 - eapply_user
60 + default
61 python_fix_shebang .
62 }
63
64 @@ -37,6 +32,5 @@ src_compile() { :; }
65
66 src_install() {
67 emake -j1 doc-install install install-links DESTDIR="${D}"
68 -
69 - dodoc ChangeLog CHANGELOG.md README.adoc
70 + dodoc AUTHORS ChangeLog CHANGELOG.md README.adoc
71 }