| 1 |
commit: 5908225a0bcd555552b1cbf13e217be74e3fe97a |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 28 23:33:35 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 13:17:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5908225a |
| 7 |
|
| 8 |
x11-themes/fvwm-themes: bump EAPI and drop eutils |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../files/fvwm-themes-0.7.0-gentoo.patch | 4 ++-- |
| 13 |
.../files/fvwm-themes-0.7.0-posix-sort.patch | 4 ++-- |
| 14 |
x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild | 21 +++++++++------------ |
| 15 |
3 files changed, 13 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index 5fdf7e5f3bb..bb377f86f29 100644 |
| 19 |
--- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch |
| 20 |
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
---- Makefile.am~ 2002-12-06 03:01:37.000000000 +0100 |
| 23 |
-+++ Makefile.am 2003-04-15 20:14:34.000000000 +0200 |
| 24 |
+--- a/Makefile.am 2002-12-06 03:01:37.000000000 +0100 |
| 25 |
++++ b/Makefile.am 2003-04-15 20:14:34.000000000 +0200 |
| 26 |
@@ -32,24 +32,7 @@ |
| 27 |
$(DESTDIR)$(SETTINGS_FILE) > $(DESTDIR)$(SETTINGS_FILE).tmp && \ |
| 28 |
mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE) |
| 29 |
|
| 30 |
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 |
| 31 |
index 3974f95c5c5..a68ea6303c8 100644 |
| 32 |
--- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch |
| 33 |
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch |
| 34 |
@@ -1,5 +1,5 @@ |
| 35 |
---- fvwm-themes-0.7.0/configure.in |
| 36 |
-+++ fvwm-themes-0.7.0/configure.in |
| 37 |
+--- a/configure.in |
| 38 |
++++ b/configure.in |
| 39 |
@@ -195,7 +195,7 @@ |
| 40 |
|
| 41 |
# Hopefully this "sort" is portable (after many tries using awk and expr) |
| 42 |
|
| 43 |
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 |
| 44 |
index 8ed5ccc37dc..b7767ef8add 100644 |
| 45 |
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild |
| 46 |
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild |
| 47 |
@@ -1,8 +1,8 @@ |
| 48 |
-# Copyright 1999-2017 Gentoo Foundation |
| 49 |
+# Copyright 1999-2018 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
-EAPI=2 |
| 53 |
-inherit autotools eutils |
| 54 |
+EAPI=6 |
| 55 |
+inherit autotools |
| 56 |
|
| 57 |
DESCRIPTION="A configuration framework for the fvwm window manager" |
| 58 |
HOMEPAGE="http://fvwm-themes.sourceforge.net/" |
| 59 |
@@ -17,11 +17,13 @@ RDEPEND=">=x11-wm/fvwm-2.6.2" |
| 60 |
DEPEND="${RDEPEND} |
| 61 |
gnome? ( virtual/imagemagick-tools )" |
| 62 |
|
| 63 |
-src_prepare() { |
| 64 |
- epatch \ |
| 65 |
- "${FILESDIR}"/${P}-gentoo.patch \ |
| 66 |
- "${FILESDIR}"/${P}-posix-sort.patch |
| 67 |
+PATCHES=( |
| 68 |
+ "${FILESDIR}/${P}-gentoo.patch" |
| 69 |
+ "${FILESDIR}/${P}-posix-sort.patch" |
| 70 |
+) |
| 71 |
|
| 72 |
+src_prepare() { |
| 73 |
+ default |
| 74 |
eautoreconf |
| 75 |
} |
| 76 |
|
| 77 |
@@ -29,11 +31,6 @@ src_configure() { |
| 78 |
econf $(use_enable gnome gnome-icons) |
| 79 |
} |
| 80 |
|
| 81 |
-src_install() { |
| 82 |
- emake DESTDIR="${D}" install || die |
| 83 |
- dodoc AUTHORS ChangeLog NEWS README TODO |
| 84 |
-} |
| 85 |
- |
| 86 |
pkg_postinst() { |
| 87 |
fvwm-themes-config --site --reset |
| 88 |
fvwm-themes-menuapp --site --build-menus --remove-popup |
Archives