[gentoo-commits] repo/gentoo:master commit in: app-office/openoffice-bin/

[David Seifert]

commit:     f73b72a8687357416550e8fb8566abd0ebc40204
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 11:38:04 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 11:38:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f73b72a8

app-office/openoffice-bin: [QA] Fix python metadata

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
index d3a0c2c488b..f6be22d75d2 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.6.ebuild
@@ -3,7 +3,9 @@
 
 EAPI="6"
 
-inherit eutils xdg-utils gnome2-utils pax-utils prefix rpm multilib
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils xdg-utils gnome2-utils pax-utils prefix python-single-r1 rpm multilib
 
 IUSE="gnome java"
 
@@ -49,7 +51,7 @@ RDEPEND="
 	app-arch/unzip
 	app-arch/zip
 	>=dev-lang/perl-5.0
-	dev-lang/python:2.7
+	${PYTHON_DEPS}
 	>=media-libs/freetype-2.1.10-r2
 	sys-libs/ncurses:5/5
 	x11-libs/libXaw
@@ -70,7 +72,6 @@ pkg_setup() {
 }
 
 src_unpack() {
-
 	unpack ${A}
 
 	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
@@ -115,11 +116,9 @@ src_unpack() {
 
 		fi
 	done
-
 }
 
 src_install () {
-
 	INSTDIR="/usr/$(get_libdir)/${NM}"
 	dodir ${INSTDIR}
 	# mv "${WORKDIR}"/opt/${NM}/* "${ED}${INSTDIR}" || die
@@ -166,24 +165,18 @@ src_install () {
 }
 
 pkg_preinst() {
-
 	use gnome && gnome2_icon_savelist
-
 }
 
 pkg_postinst() {
-
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 	use gnome && gnome2_icon_cache_update
 
 	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin
-
 }
 
 pkg_postrm() {
-
 	xdg_desktop_database_update
 	use gnome && gnome2_icon_cache_update
-
 }