commit: 0522ca6afbd48561311d8797b52f73358efcb9a2 Author: Jan Chren <dev.rindeal <AT> gmail <DOT> com> AuthorDate: Tue Apr 26 21:49:10 2016 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Sun May 22 10:37:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0522ca6a
app-portage/elogviewer-2.6: update - EAPI6 - readme.gentoo -> readme.gentoo-r1 - distutils-r1 -> python-single-r1 - proper src_install() - minor fixes Closes: https://github.com/gentoo/gentoo/pull/1360 Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org> app-portage/elogviewer/elogviewer-2.6-r2.ebuild | 30 ++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/app-portage/elogviewer/elogviewer-2.6-r2.ebuild b/app-portage/elogviewer/elogviewer-2.6-r2.ebuild index d7033fb..41cb8ee 100644 --- a/app-portage/elogviewer/elogviewer-2.6-r2.ebuild +++ b/app-portage/elogviewer/elogviewer-2.6-r2.ebuild @@ -2,10 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -PYTHON_COMPAT=(python{2_7,3_3,3_4}) +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_{3,4}} ) + DISABLE_AUTOFORMATTING=true -inherit distutils-r1 eutils readme.gentoo + +inherit python-single-r1 eutils readme.gentoo-r1 DESCRIPTION="Elog viewer for Gentoo" HOMEPAGE="https://sourceforge.net/projects/elogviewer" @@ -16,15 +19,17 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" IUSE="" -RDEPEND="|| ( +RDEPEND=" + || ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] dev-python/PyQt4[${PYTHON_USEDEP},X] - dev-python/pyside[${PYTHON_USEDEP},X] ) + dev-python/pyside[${PYTHON_USEDEP},X] + ) >=sys-apps/portage-2.1 $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3}) !dev-python/PyQt5[-gui] !dev-python/PyQt5[-widgets] - " +" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" @@ -40,9 +45,14 @@ ${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage. To start the software as a user, add yourself to the portage group." src_install() { - mv elogviewer.py elogviewer - dobin elogviewer - doman elogviewer.1 + python_newscript elogviewer.py elogviewer + make_desktop_entry ${PN} ${PN} ${PN} System - readme.gentoo_src_install + + doman elogviewer.1 + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog }