app-misc/gnote: fix aclocal error (bug #581308)

Thanks to Ed Catmur for reporting and the fix.

Package-Manager: portage-2.3.0_rc1

diff --git a/app-misc/gnote/gnote-3.18.1.ebuild b/app-misc/gnote/gnote-3.18.1.ebuild
index 7aa6fe38129fd34b8f90f515fbcb43f5e7e58a5e..e0afcb218f0597c552e2c1ef5b26eca2e52b332b 100644 (file)
--- a/app-misc/gnote/gnote-3.18.1.ebuild
+++ b/app-misc/gnote/gnote-3.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -49,6 +49,10 @@ src_prepare() {
        # Do not alter CFLAGS
        sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
 
+       # Prevent m4_copy error when running aclocal, bug #581308
+       # m4_copy: won't overwrite defined macro: glib_DEFUN
+       rm m4/glib-gettext.m4 || die
+
        eautoreconf
        gnome2_src_prepare