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 5E8F81382CE for ; Sat, 25 Jun 2016 08:26:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0FB9141A5; Sat, 25 Jun 2016 08:26:45 +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 3C1AB141A5 for ; Sat, 25 Jun 2016 08:26:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6573E340AF3 for ; Sat, 25 Jun 2016 08:26:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBA43241E for ; Sat, 25 Jun 2016 08:26:38 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1466843190.893d8d8bc73a3dea9c8dfa06fc768597298f6580.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/pysmssend/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/pysmssend/pysmssend-9999.ebuild X-VCS-Directories: app-misc/pysmssend/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 893d8d8bc73a3dea9c8dfa06fc768597298f6580 X-VCS-Branch: master Date: Sat, 25 Jun 2016 08:26:38 +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: 9bfbaf46-1fae-4173-a118-62ed8d81038d X-Archives-Hash: 07eb125d83e05e51d419ec56549e8b40 commit: 893d8d8bc73a3dea9c8dfa06fc768597298f6580 Author: Michał Górny gentoo org> AuthorDate: Sat Jun 25 07:46:19 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jun 25 08:26:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893d8d8b app-misc/pysmssend: Update the live ebuild app-misc/pysmssend/pysmssend-9999.ebuild | 46 +++++++++++++++----------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/app-misc/pysmssend/pysmssend-9999.ebuild b/app-misc/pysmssend/pysmssend-9999.ebuild index eecb9e3..350d4ae 100644 --- a/app-misc/pysmssend/pysmssend-9999.ebuild +++ b/app-misc/pysmssend/pysmssend-9999.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="3" -PYTHON_DEPEND="2:2.5" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 3.*" +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) EGIT_REPO_URI="git://github.com/hwoarang/${PN}.git https://github.com/hwoarang/${PN}.git" -inherit distutils eutils git-2 +inherit distutils-r1 eutils git-r3 DESCRIPTION="Python Application for sending sms over multiple ISPs" HOMEPAGE="http://pysmssend.silverarrow.org/" @@ -19,36 +18,35 @@ SLOT="0" KEYWORDS="" IUSE="qt4" -DEPEND=">=dev-python/mechanize-0.1.9 - qt4? ( >=dev-python/PyQt4-4.3[X] )" +DEPEND=">=dev-python/mechanize-0.1.9[${PYTHON_USEDEP}] + qt4? ( >=dev-python/PyQt4-4.3[X,${PYTHON_USEDEP}] )" RDEPEND="${DEPEND}" -S="${WORKDIR}/pysmssend" - -PYTHON_MODNAME="pysmssendmod" +python_install() { + distutils-r1_python_install -src_prepare() { - python_convert_shebangs -r 2 . + python_doscript pysmssendcmd + if use qt4; then + python_doscript pysmssend + else + ln -s pysmssendcmd "${D}$(python_get_scriptdir)"/pysmssend || die + fi } src_install() { - distutils_src_install + distutils-r1_src_install if use qt4; then - insinto /usr/share/${PN}/Icons || die "insinto failed" - doins Icons/* || die "doins failed" - doicon Icons/pysmssend.png || die "doicon failed" - dobin pysmssend pysmssendcmd || die "failed to create executables" - domenu ${PN}.desktop || die "make_desktop_entry failed" + insinto /usr/share/${PN}/Icons + doins Icons/* + doicon Icons/pysmssend.png + domenu ${PN}.desktop else - dobin pysmssendcmd || die "failed to create executable" - dosym pysmssendcmd /usr/bin/pysmssend || die "dosym failed" + dosym pysmssendcmd /usr/bin/pysmssend fi - dodoc README AUTHORS TODO || die "dodoc failed" + dodoc README AUTHORS TODO } pkg_postinst() { - distutils_pkg_postinst - elog elog "${PN} can use dev-python/python-gnupg" elog "for keeping your account data encrypted" elog "and secured. If you want to use it,"