[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-libnotify/, x11-plugins/pidgin-libnotify/files/

[Aaron Bauman]

commit:     b60ea7735b532e5cf4575e6c0779e7e14906ec68
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 23:37:16 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu May 31 12:57:04 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60ea773

x11-plugins/pidgin-libnotify: bump EAPI and drop eutils

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8649

 .../files/pidgin-libnotify-0.14-libnotify-0.7.patch  |  4 ++--
 .../pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch
index 40e6c02b815..7279c3ad7ea 100644
--- a/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch
+++ b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch
@@ -1,5 +1,5 @@
---- src/pidgin-libnotify.c
-+++ src/pidgin-libnotify.c
+--- a/src/pidgin-libnotify.c
++++ b/src/pidgin-libnotify.c
 @@ -286,7 +286,15 @@
  		g_free (tr_body);
  		return;

diff --git a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
index 325a0607571..17b95492ef4 100644
--- a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
+++ b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="pidgin-libnotify provides popups for pidgin via a libnotify interface"
 HOMEPAGE="http://gaim-libnotify.sourceforge.net/"
@@ -20,10 +19,14 @@ RDEPEND=">=x11-libs/libnotify-0.3.2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${WORKDIR}/debian/patches"
+	"${FILESDIR}/${P}-libnotify-0.7.patch"
+)
+
 src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	sed -i -e '/CFLAGS/s:-g3::' configure || die
+	default
+	sed -i -e '/CFLAGS/s:-g3::' configure || die "sed failed"
 }
 
 src_configure() {
@@ -34,7 +37,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${D}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README TODO VERSION || die
+	default
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
 }