[gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/

[Justin Bronder]

commit:     11e0521e65fb220bdbe1574fa8348433377022fc
Author:     Michał Kępień <github <AT> kempniu <DOT> pl>
AuthorDate: Fri Nov 18 13:25:23 2016 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> 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 <user> sabnzbd"
@@ -127,7 +129,3 @@ pkg_postinst() {
                fi
        done
 }
-
-pkg_postrm() {
-       python_mod_cleanup /usr/share/${PN}
-}