From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 793CE138263 for ; Sun, 22 May 2016 10:37:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E52F614186; Sun, 22 May 2016 10:37:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5516514186 for ; Sun, 22 May 2016 10:37:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B422340B4D for ; Sun, 22 May 2016 10:37:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99022971 for ; Sun, 22 May 2016 10:37:47 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1463913451.0522ca6afbd48561311d8797b52f73358efcb9a2.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/elogviewer/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/elogviewer/elogviewer-2.6-r2.ebuild X-VCS-Directories: app-portage/elogviewer/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 0522ca6afbd48561311d8797b52f73358efcb9a2 X-VCS-Branch: master Date: Sun, 22 May 2016 10:37:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: df80339c-05a1-4217-81fc-62ea4123c222 X-Archives-Hash: 1f1ac5a4509b85fd181793a908390e5f commit: 0522ca6afbd48561311d8797b52f73358efcb9a2 Author: Jan Chren gmail com> AuthorDate: Tue Apr 26 21:49:10 2016 +0000 Commit: Ian Delaney gentoo 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 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 }