[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gconf-editor/

[Pacho Ramos]

commit:     d7e41de115740abe563c23b259d9efea536cb17e
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  4 09:08:33 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Nov  4 09:15:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e41de1

gnome-extra/gconf-editor: scrollkeeper is not really needed

Package-Manager: portage-2.3.2

 gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
index 8d96380..cb1da31 100644
--- a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
+++ b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
+EAPI=6
+inherit gnome2
 
 DESCRIPTION="An editor to the GNOME config system"
 HOMEPAGE="https://git.gnome.org/browse/gconf-editor"
@@ -20,7 +18,6 @@ RDEPEND="
 	>=gnome-base/gconf-2.12:2
 "
 DEPEND="${RDEPEND}
-	app-text/scrollkeeper
 	sys-devel/gettext
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.35
@@ -29,12 +26,10 @@ DEPEND="${RDEPEND}
 "
 # gnome-common for eautoreconf
 
-src_prepare() {
+PATCHES=(
 	# Fix assertion failed crash (from 'master')
-	epatch "${FILESDIR}/${PN}-3.0.1-assertion-crash.patch"
+	"${FILESDIR}/${PN}-3.0.1-assertion-crash.patch"
 
 	# Drop use GTK accel maps (from 'master')
-	epatch "${FILESDIR}/${PN}-3.0.1-drop-accel.patch"
-
-	gnome2_src_prepare
-}
+	"${FILESDIR}/${PN}-3.0.1-drop-accel.patch"
+)