EAPI bump, minor fixes, clean up patches.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 18 insertions, 17 deletions

diff --git a/dev-util/regexxer/ChangeLog b/dev-util/regexxer/ChangeLog
index 7c048b1e73b3..b7a78c19b74f 100644
--- a/dev-util/regexxer/ChangeLog
+++ b/dev-util/regexxer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/regexxer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/ChangeLog,v 1.25 2012/06/04 17:44:03 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/ChangeLog,v 1.26 2014/07/04 14:03:47 jer Exp $
+
+  04 Jul 2014; Jeroen Roovers <jer@gentoo.org> regexxer-0.10.ebuild,
+  files/regexxer-0.10-glib-2.32.patch, files/regexxer-0.10-sandbox.patch:
+  EAPI bump, minor fixes, clean up patches.
 
   04 Jun 2012; Michael Weber <xmw@gentoo.org> regexxer-0.9.ebuild:
   Fix patch filename (thanks Steffen Schaumburg, bug 419625)
diff --git a/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
index 053664a77505..fbbb1cbf20f0 100644
--- a/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
+++ b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
@@ -1,8 +1,8 @@
 Downloaded from https://projects.archlinux.org/svntogit/community.git/plain/trunk/regexxer-glib2.32.patch?h=packages/regexxer
 for bug 417049
 
---- regexxer-0.10/src/fileshared.h
-+++ regexxer-0.10/src/fileshared.h
+--- a/src/fileshared.h
++++ b/src/fileshared.h
 @@ -23,6 +23,7 @@
 
  #include "sharedptr.h"
@@ -11,8 +11,8 @@ for bug 417049
  #include <gtkmm/textbuffer.h>
  #include <functional>
  #include <utility>
---- regexxer-0.10/src/globalstrings.h
-+++ regexxer-0.10/src/globalstrings.h
+--- a/src/globalstrings.h
++++ b/src/globalstrings.h
 @@ -21,7 +21,7 @@
  #ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED
  #define REGEXXER_GLOBALSTRINGS_H_INCLUDED
@@ -22,8 +22,8 @@ for bug 417049
 
  namespace Regexxer
  {
---- regexxer-0.10/src/translation.h
-+++ regexxer-0.10/src/translation.h
+--- a/src/translation.h
++++ b/src/translation.h
 @@ -21,7 +21,7 @@
  #ifndef REGEXXER_TRANSLATION_H_INCLUDED
  #define REGEXXER_TRANSLATION_H_INCLUDED
diff --git a/dev-util/regexxer/files/regexxer-0.10-sandbox.patch b/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
index de6c2bf0b4ff..f460344b8ad7 100644
--- a/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
+++ b/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
@@ -1,5 +1,5 @@
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -107,12 +107,6 @@
  @INTLTOOL_DESKTOP_RULE@
  @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/dev-util/regexxer/regexxer-0.10.ebuild b/dev-util/regexxer/regexxer-0.10.ebuild
index 4fb9328d183f..7b6796aa2502 100644
--- a/dev-util/regexxer/regexxer-0.10.ebuild
+++ b/dev-util/regexxer/regexxer-0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.10.ebuild,v 1.4 2012/05/22 10:13:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.10.ebuild,v 1.5 2014/07/04 14:03:47 jer Exp $
 
-EAPI=4
+EAPI=5
 GCONF_DEBUG=no
 inherit autotools eutils gnome2
 
@@ -13,7 +13,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND=">=dev-cpp/glibmm-2.28
 	dev-cpp/gtkmm:3.0
@@ -23,9 +22,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
+DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-glib-2.32.patch