[gentoo-commits] repo/gentoo:master commit in: x11-themes/fvwm-themes/, x11-themes/fvwm-themes/files/

[gentoo-commits] repo/gentoo:master commit in: x11-themes/fvwm-themes/, x11-themes/fvwm-themes/files/

[Aaron Bauman]

commit:     5908225a0bcd555552b1cbf13e217be74e3fe97a
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 23:33:35 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue May 29 13:17:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5908225a

x11-themes/fvwm-themes: bump EAPI and drop eutils

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/fvwm-themes-0.7.0-gentoo.patch            |  4 ++--
 .../files/fvwm-themes-0.7.0-posix-sort.patch        |  4 ++--
 x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild  | 21 +++++++++------------
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch
index 5fdf7e5f3bb..bb377f86f29 100644
--- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.am~	2002-12-06 03:01:37.000000000 +0100
-+++ Makefile.am	2003-04-15 20:14:34.000000000 +0200
+--- a/Makefile.am	2002-12-06 03:01:37.000000000 +0100
++++ b/Makefile.am	2003-04-15 20:14:34.000000000 +0200
 @@ -32,24 +32,7 @@
  		$(DESTDIR)$(SETTINGS_FILE) > $(DESTDIR)$(SETTINGS_FILE).tmp && \
  	mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)

diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch
index 3974f95c5c5..a68ea6303c8 100644
--- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch
@@ -1,5 +1,5 @@
---- fvwm-themes-0.7.0/configure.in
-+++ fvwm-themes-0.7.0/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -195,7 +195,7 @@
  
  # Hopefully this "sort" is portable (after many tries using awk and expr)

diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
index 8ed5ccc37dc..b7767ef8add 100644
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=6
+inherit autotools
 
 DESCRIPTION="A configuration framework for the fvwm window manager"
 HOMEPAGE="http://fvwm-themes.sourceforge.net/"
@@ -17,11 +17,13 @@ RDEPEND=">=x11-wm/fvwm-2.6.2"
 DEPEND="${RDEPEND}
 	gnome? ( virtual/imagemagick-tools )"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-posix-sort.patch
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.patch"
+	"${FILESDIR}/${P}-posix-sort.patch"
+)
 
+src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -29,11 +31,6 @@ src_configure() {
 	econf $(use_enable gnome gnome-icons)
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
 pkg_postinst() {
 	fvwm-themes-config --site --reset
 	fvwm-themes-menuapp --site --build-menus --remove-popup