summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2016-06-19 16:45:31 -0400
committerAlexandre Rostovtsev <tetromino@gentoo.org>2016-06-19 16:45:31 -0400
commit5f8551642b77435b0b2580e90ade514d328c2120 (patch)
treeda21de972470f6ecce9357ef9b455dd2681714d8
parentapp-emacs/ebuild-mode: Remove intermediate version. (diff)
downloadgentoo-5f8551642b77435b0b2580e90ade514d328c2120.tar.gz
gentoo-5f8551642b77435b0b2580e90ade514d328c2120.tar.bz2
gentoo-5f8551642b77435b0b2580e90ade514d328c2120.zip
app-misc/gnote: fix aclocal error (bug #581308)
Thanks to Ed Catmur for reporting and the fix. Package-Manager: portage-2.3.0_rc1
-rw-r--r--app-misc/gnote/gnote-3.18.1.ebuild6
1 files changed, 5 insertions, 1 deletions
diff --git a/app-misc/gnote/gnote-3.18.1.ebuild b/app-misc/gnote/gnote-3.18.1.ebuild
index 7aa6fe38129..e0afcb218f0 100644
--- 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