From fd3736d8c4845ee3eeac7ea1212f17cf81ac783f Mon Sep 17 00:00:00 2001 From: Harri Nieminen Date: Thu, 2 Mar 2017 16:22:52 +0200 Subject: [PATCH] x11-misc/superswitcher: EAPI bump 4 -> 6 Package-Manager: Portage-2.3.4, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4098 --- ...0.6.ebuild => superswitcher-0.6-r1.ebuild} | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) rename x11-misc/superswitcher/{superswitcher-0.6.ebuild => superswitcher-0.6-r1.ebuild} (67%) diff --git a/x11-misc/superswitcher/superswitcher-0.6.ebuild b/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild similarity index 67% rename from x11-misc/superswitcher/superswitcher-0.6.ebuild rename to x11-misc/superswitcher/superswitcher-0.6-r1.ebuild index 4165cec4ffaf..63e4756b5b18 100644 --- a/x11-misc/superswitcher/superswitcher-0.6.ebuild +++ b/x11-misc/superswitcher/superswitcher-0.6-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit autotools eutils +EAPI=6 + +inherit autotools DESCRIPTION="A more feature-full replacement of the Alt-Tab window switching behavior" HOMEPAGE="https://code.google.com/p/superswitcher/" @@ -13,7 +14,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="dev-libs/dbus-glib +RDEPEND=" + dev-libs/dbus-glib dev-libs/glib:2 >=gnome-base/gconf-2:2 x11-libs/gtk+:2 @@ -22,19 +24,21 @@ RDEPEND="dev-libs/dbus-glib x11-libs/libXinerama x11-libs/libXrender" DEPEND="${RDEPEND} - virtual/pkgconfig - gnome-base/gnome-common" + gnome-base/gnome-common + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-wnck-workspace.patch + "${FILESDIR}"/${PN}-0.6-glib-single-include.patch +) src_prepare() { + default sed -i \ -e '/-DG.*_DISABLE_DEPRECATED/d' \ src/Makefile.am || die #338906 - epatch "${FILESDIR}"/${P}-wnck-workspace.patch - epatch "${FILESDIR}"/${PN}-0.6-glib-single-include.patch - eautoreconf -} + mv configure.{in,ac} || die #426262 -src_install() { - MAKEOPTS=-j1 default + eautoreconf } -- 2.26.2