From 526c9b73691d69091b8e874e43312f81a389113b Mon Sep 17 00:00:00 2001 From: Amy Liffey Date: Sat, 26 Aug 2017 20:24:33 +0200 Subject: [PATCH] x11-misc/ipager: EAPI 6 bump Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- x11-misc/ipager/files/ipager-1.1.0-gcc43.patch | 8 ++++---- ...ipager-1.1.0.ebuild => ipager-1.1.0-r1.ebuild} | 15 ++++++--------- 2 files changed, 10 insertions(+), 13 deletions(-) rename x11-misc/ipager/{ipager-1.1.0.ebuild => ipager-1.1.0-r1.ebuild} (78%) diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch index e4fe301a7b89..ca7752ac99d0 100644 --- a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch +++ b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch @@ -5,8 +5,8 @@ Patch taken from Gentoo bug #173562. X-Gentoo-Bug: 173562 Signed-off-by: Robin H. Johnson ---- iconfig.old 2008-08-22 21:35:16.000000000 +0600 -+++ iconfig.cpp 2008-08-22 21:35:20.000000000 +0600 +--- a/iconfig.cpp 2008-08-22 21:35:16.000000000 +0600 ++++ b/iconfig.cpp 2008-08-22 21:35:20.000000000 +0600 @@ -30,7 +30,7 @@ #include #include @@ -16,8 +16,8 @@ Signed-off-by: Robin H. Johnson #include #include ---- wm.old 2008-08-22 21:52:36.000000000 +0600 -+++ wm.cpp 2008-08-22 21:52:40.000000000 +0600 +--- a/wm.cpp 2008-08-22 21:52:36.000000000 +0600 ++++ b/wm.cpp 2008-08-22 21:52:40.000000000 +0600 @@ -27,7 +27,7 @@ #include diff --git a/x11-misc/ipager/ipager-1.1.0.ebuild b/x11-misc/ipager/ipager-1.1.0-r1.ebuild similarity index 78% rename from x11-misc/ipager/ipager-1.1.0.ebuild rename to x11-misc/ipager/ipager-1.1.0-r1.ebuild index b21b4520b324..6727bc321a0c 100644 --- a/x11-misc/ipager/ipager-1.1.0.ebuild +++ b/x11-misc/ipager/ipager-1.1.0-r1.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit eutils +EAPI=6 DESCRIPTION="A themable desktop pager for fluxbox and other window managers" HOMEPAGE="http://www.useperl.ru/ipager/index.en.html" @@ -19,12 +18,10 @@ RDEPEND="media-libs/imlib2[X] DEPEND="${RDEPEND} dev-util/scons" -src_prepare() { - epatch "${FILESDIR}"/${P}-scons_imlib2.patch - epatch "${FILESDIR}"/${P}-scons_flags.patch - epatch "${FILESDIR}"/${P}-gcc43.patch - epatch "${FILESDIR}"/${P}-gcc47.patch -} +PATCHES=( "${FILESDIR}/${P}-scons_imlib2.patch" + "${FILESDIR}/${P}-scons_flags.patch" + "${FILESDIR}/${P}-gcc43.patch" + "${FILESDIR}/${P}-gcc47.patch" ) src_compile() { CONFIG_OPTS="xinerama=false" -- 2.26.2