From 3d6fbd8fac86bf903c86c56093c7c85129a3b725 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 18 Nov 2016 14:32:31 +0100 Subject: [PATCH] Migrate to EAPI 6 --- .../0001-use-system-configobj-and-feedparser.patch | 0 .../{1.1.x => patches}/0002-assume-gntp-1.0.patch | 0 .../0003-cfg-disable-growl-by-default.patch | 0 .../{1.1.x => patches}/0004-use-system-rarfile.patch | 0 net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild | 11 +++++------ 5 files changed, 5 insertions(+), 6 deletions(-) rename net-nntp/sabnzbd/files/{1.1.x => patches}/0001-use-system-configobj-and-feedparser.patch (100%) rename net-nntp/sabnzbd/files/{1.1.x => patches}/0002-assume-gntp-1.0.patch (100%) rename net-nntp/sabnzbd/files/{1.1.x => patches}/0003-cfg-disable-growl-by-default.patch (100%) rename net-nntp/sabnzbd/files/{1.1.x => patches}/0004-use-system-rarfile.patch (100%) diff --git a/net-nntp/sabnzbd/files/1.1.x/0001-use-system-configobj-and-feedparser.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj-and-feedparser.patch similarity index 100% rename from net-nntp/sabnzbd/files/1.1.x/0001-use-system-configobj-and-feedparser.patch rename to net-nntp/sabnzbd/files/patches/0001-use-system-configobj-and-feedparser.patch diff --git a/net-nntp/sabnzbd/files/1.1.x/0002-assume-gntp-1.0.patch b/net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch similarity index 100% rename from net-nntp/sabnzbd/files/1.1.x/0002-assume-gntp-1.0.patch rename to net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch diff --git a/net-nntp/sabnzbd/files/1.1.x/0003-cfg-disable-growl-by-default.patch b/net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch similarity index 100% rename from net-nntp/sabnzbd/files/1.1.x/0003-cfg-disable-growl-by-default.patch rename to net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch diff --git a/net-nntp/sabnzbd/files/1.1.x/0004-use-system-rarfile.patch b/net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch similarity index 100% rename from net-nntp/sabnzbd/files/1.1.x/0004-use-system-rarfile.patch rename to net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch diff --git a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild index e5f0860d7e02..726733fe1f36 100644 --- a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild +++ b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild @@ -2,13 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" # Require python-2 with sqlite USE flag PYTHON_DEPEND="2:2.7" PYTHON_USE_WITH="sqlite" -inherit eutils python user systemd versionator +inherit python user systemd versionator MY_P="${P/sab/SAB}" @@ -64,15 +64,14 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/1.1.x/0001-use-system-configobj-and-feedparser.patch - epatch "${FILESDIR}"/1.1.x/0002-assume-gntp-1.0.patch - epatch "${FILESDIR}"/1.1.x/0003-cfg-disable-growl-by-default.patch - epatch "${FILESDIR}"/1.1.x/0004-use-system-rarfile.patch + eapply "${FILESDIR}"/patches # remove bundled modules rm -r sabnzbd/utils/{feedparser,configobj,rarfile}.py || die rm -r gntp || die rm licenses/License-{feedparser,configobj,gntp,rarfile}.txt || die + + eapply_user } src_install() { -- 2.26.2