From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 370CA1395E4 for ; Sat, 19 Nov 2016 16:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D167E0B27; Sat, 19 Nov 2016 16:34:14 +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 EA104E0B27 for ; Sat, 19 Nov 2016 16:34:13 +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 E63AA341592 for ; Sat, 19 Nov 2016 16:34:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21BF64A0 for ; Sat, 19 Nov 2016 16:34:10 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <1479573192.11e0521e65fb220bdbe1574fa8348433377022fc.jsbronder@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild X-VCS-Directories: net-nntp/sabnzbd/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: 11e0521e65fb220bdbe1574fa8348433377022fc X-VCS-Branch: master Date: Sat, 19 Nov 2016 16:34:10 +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: 0789eb7b-dfe2-401f-8d74-2504a7faf8b8 X-Archives-Hash: d4b53e665ffeb5670867d8f199f42273 commit: 11e0521e65fb220bdbe1574fa8348433377022fc Author: Michał Kępień kempniu pl> AuthorDate: Fri Nov 18 13:25:23 2016 +0000 Commit: Justin Bronder gentoo org> CommitDate: Sat Nov 19 16:33:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e0521e Migrate to python-single-r1 net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild index 726733f..120ac64 100644 --- a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild +++ b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild @@ -5,10 +5,10 @@ EAPI="6" # Require python-2 with sqlite USE flag -PYTHON_DEPEND="2:2.7" -PYTHON_USE_WITH="sqlite" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" -inherit python user systemd versionator +inherit python-single-r1 user systemd versionator MY_P="${P/sab/SAB}" @@ -36,6 +36,7 @@ IUSE="+rar +ssl unzip +yenc" # https://github.com/sabnzbd/sabnzbd/issues/47 RDEPEND=" + ${PYTHON_DEPS} >=app-arch/par2cmdline-0.4 >=dev-python/cheetah-2.0.1 dev-python/configobj @@ -49,13 +50,14 @@ RDEPEND=" unzip? ( >=app-arch/unzip-5.5.2 ) yenc? ( dev-python/yenc ) " +DEPEND="${PYTHON_DEPS}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" S="${WORKDIR}/${MY_P}" pkg_setup() { HOMEDIR="/var/lib/${PN}" - python_set_active_version 2 - python_pkg_setup + python-single-r1_pkg_setup # Create sabnzbd group enewgroup ${PN} @@ -88,6 +90,8 @@ src_install() { doins -r ${d}/* done + python_optimize "${D}usr/share/${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" newconfd "${FILESDIR}/${PN}.confd" "${PN}" @@ -105,8 +109,6 @@ src_install() { } pkg_postinst() { - python_mod_optimize /usr/share/${PN} - einfo "Default directory: ${HOMEDIR}" einfo "" einfo "Run: gpasswd -a sabnzbd" @@ -127,7 +129,3 @@ pkg_postinst() { fi done } - -pkg_postrm() { - python_mod_cleanup /usr/share/${PN} -}