4 files changed, 23 insertions, 76 deletions
diff --git a/x11-apps/xmodmap/ChangeLog b/x11-apps/xmodmap/ChangeLog
index 4be5620b33d8..aa55cf948d7c 100644
--- a/x11-apps/xmodmap/ChangeLog
+++ b/x11-apps/xmodmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xmodmap
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.86 2013/10/08 05:04:20 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.87 2015/07/07 17:57:33 mrueg Exp $
+
+*xmodmap-1.0.9 (07 Jul 2015)
+
+  07 Jul 2015; Manuel Rüger <mrueg@gentoo.org> +xmodmap-1.0.9.ebuild,
+  -files/xmodmap-1.0.7-_GNU_SOURCE.patch, -xmodmap-1.0.7.ebuild:
+  Version bump. Remove old.
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xmodmap-1.0.8.ebuild:
   Stable for x86, wrt bug #475480
diff --git a/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch b/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch
deleted file mode 100644
index 79f13fba1406..000000000000
--- a/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Mon, 23 Apr 2012 14:28:39 +0000
-Subject: include config.h before stdio.h & other system headers
-
-Ensures definitions like _GNU_SOURCE are visible when needed.
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/exec.c b/exec.c
-index dbcb669..419b10e 100644
---- a/exec.c
-+++ b/exec.c
-@@ -54,6 +54,10 @@ from The Open Group.
-  * original xmodmap, written by David Rosenthal, of Sun Microsystems.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <stdio.h>
-diff --git a/pf.c b/pf.c
-index 0eb0f55..3f0c3f4 100644
---- a/pf.c
-+++ b/pf.c
-@@ -26,6 +26,10 @@ from The Open Group.
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <stdio.h>
-diff --git a/xmodmap.c b/xmodmap.c
-index 58a8e70..0f89629 100644
---- a/xmodmap.c
-+++ b/xmodmap.c
-@@ -26,6 +26,10 @@ from The Open Group.
- 
- */
- 
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
- #include <stdio.h>
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild b/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
deleted file mode 100644
index da457e4f1fef..000000000000
--- a/x11-apps/xmodmap/xmodmap-1.0.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.7.ebuild,v 1.10 2012/08/26 17:03:55 armin76 Exp $
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-_GNU_SOURCE.patch )
diff --git a/x11-apps/xmodmap/xmodmap-1.0.9.ebuild b/x11-apps/xmodmap/xmodmap-1.0.9.ebuild
new file mode 100644
index 000000000000..83744c7acdde
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-1.0.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.9.ebuild,v 1.1 2015/07/07 17:57:33 mrueg Exp $
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"