diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2013-04-28 16:09:28 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2013-04-28 16:09:28 +0000 |
| commit | 9c02517ea051b92edb30c872fb0339bc659fcd47 (patch) | |
| tree | 3959efb3f0663ce12931c53622e71c0bcd44667f /sci-electronics/oregano | |
| parent | Removing old version and making smartcard support optional, fixing bug #462548 (diff) | |
| download | gentoo-2-9c02517ea051b92edb30c872fb0339bc659fcd47.tar.gz gentoo-2-9c02517ea051b92edb30c872fb0339bc659fcd47.tar.bz2 gentoo-2-9c02517ea051b92edb30c872fb0339bc659fcd47.zip | |
Fix deprecated AM_CONFIG_HEADER (bug #467708), correct AC_MSG_ERROR and add missing dependency
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)
Diffstat (limited to 'sci-electronics/oregano')
| -rw-r--r-- | sci-electronics/oregano/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-electronics/oregano/files/oregano-0.82-automake.patch | 25 | ||||
| -rw-r--r-- | sci-electronics/oregano/oregano-0.82.ebuild | 9 |
3 files changed, 38 insertions, 5 deletions
diff --git a/sci-electronics/oregano/ChangeLog b/sci-electronics/oregano/ChangeLog index e955ba9a3449..3a69371fc972 100644 --- a/sci-electronics/oregano/ChangeLog +++ b/sci-electronics/oregano/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-electronics/oregano -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.54 2012/12/06 18:40:58 tomjbe Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/ChangeLog,v 1.55 2013/04/28 16:09:28 tomjbe Exp $ + + 28 Apr 2013; Thomas Beierlein <tomjbe@gentoo.org> oregano-0.82.ebuild, + +files/oregano-0.82-automake.patch: + Fix deprecated AM_CONFIG_HEADER (bug #467708), correct AC_MSG_ERROR and add + missing dependency 06 Dec 2012; Thomas Beierlein <tomjbe@gentoo.org> oregano-0.82.ebuild, +files/oregano-0.82-asneeded.patch: diff --git a/sci-electronics/oregano/files/oregano-0.82-automake.patch b/sci-electronics/oregano/files/oregano-0.82-automake.patch new file mode 100644 index 000000000000..84f1bfd0ab10 --- /dev/null +++ b/sci-electronics/oregano/files/oregano-0.82-automake.patch @@ -0,0 +1,25 @@ +# adapt to new automake 0.13.1 (bug #467708) +# switch to AC_CONFIG_HEADERS, correct AM_INIT_AUTOMAKE, quote text in +# AC_MSG_ERROR +--- configure.ac.old 2013-04-28 15:49:22.000000000 +0000 ++++ configure.ac 2013-04-28 15:50:25.000000000 +0000 +@@ -1,7 +1,7 @@ +-AC_INIT(AUTHORS) +-AM_INIT_AUTOMAKE(oregano, 0.81) ++AC_INIT(oregano,0.81,AUTHORS) ++AM_INIT_AUTOMAKE + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_MAINTAINER_MODE + + AC_CONFIG_MACRO_DIR([m4]) +@@ -38,7 +38,7 @@ + AC_SUBST(SCROLLKEEPER_REQUIRED) + AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) + if test x$SCROLLKEEPER_CONFIG = xno; then +- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) ++ AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package]) + fi + + diff --git a/sci-electronics/oregano/oregano-0.82.ebuild b/sci-electronics/oregano/oregano-0.82.ebuild index 95e4c5db05d6..1e589080c1d8 100644 --- a/sci-electronics/oregano/oregano-0.82.ebuild +++ b/sci-electronics/oregano/oregano-0.82.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/oregano-0.82.ebuild,v 1.2 2012/12/06 18:40:58 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/oregano/oregano-0.82.ebuild,v 1.3 2013/04/28 16:09:28 tomjbe Exp $ EAPI="4" @@ -18,7 +18,8 @@ IUSE="" CDEPEND="dev-libs/libxml2:2 x11-libs/goocanvas:2.0 x11-libs/gtk+:3 - x11-libs/gtksourceview:3.0" + x11-libs/gtksourceview:3.0 + app-text/rarian" DEPEND="${CDEPEND} virtual/pkgconfig" RDEPEND="${CDEPEND} @@ -28,6 +29,8 @@ src_prepare() { epatch "${FILESDIR}"/${P}-format-security.patch epatch "${FILESDIR}"/${P}-remove.unneeded.docs.patch epatch "${FILESDIR}"/${P}-asneeded.patch + # Aclocal 1.13 deprecated error #467708 + epatch "${FILESDIR}"/${P}-automake.patch eautoreconf } |