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 05E0A1395E2 for ; Sat, 19 Nov 2016 16:34:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69A74E0A5F; Sat, 19 Nov 2016 16:34:13 +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 0FB9DE0A5F 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 C667E341301 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 106BB49C 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.3d6fbd8fac86bf903c86c56093c7c85129a3b725.jsbronder@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/patches/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: net-nntp/sabnzbd/files/1.1.x/0001-use-system-configobj-and-feedparser.patch net-nntp/sabnzbd/files/1.1.x/0002-assume-gntp-1.0.patch net-nntp/sabnzbd/files/1.1.x/0003-cfg-disable-growl-by-default.patch net-nntp/sabnzbd/files/1.1.x/0004-use-system-rarfile.patch net-nntp/sabnzbd/files/patches/0001-use-system-configobj-and-feedparser.patch net-nntp/sabnzbd/files/patches/0002-assume-gntp-1.0.patch net-nntp/sabnzbd/files/patches/0003-cfg-disable-growl-by-default.patch net-nntp/sabnzbd/files/patches/0004-use-system-rarfile.patch net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild X-VCS-Directories: net-nntp/sabnzbd/files/patches/ net-nntp/sabnzbd/ net-nntp/sabnzbd/files/1.1.x/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: 3d6fbd8fac86bf903c86c56093c7c85129a3b725 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: 2acac30b-ffb7-41ef-a268-f2fc5b6b3234 X-Archives-Hash: b2df3df16c591ccb3195fed0b24b671c commit: 3d6fbd8fac86bf903c86c56093c7c85129a3b725 Author: Michał Kępień kempniu pl> AuthorDate: Fri Nov 18 13:32:31 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=3d6fbd8f Migrate to EAPI 6 .../0001-use-system-configobj-and-feedparser.patch | 0 .../files/{1.1.x => patches}/0002-assume-gntp-1.0.patch | 0 .../0003-cfg-disable-growl-by-default.patch | 0 .../files/{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(-) 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 e5f0860..726733f 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() {