diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-06-23 07:47:24 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-23 07:47:24 +0000 |
| commit | 90c1f5bac0ddf2fcb1d1801ec017ade4c592bb85 (patch) | |
| tree | 42635de06a897c124e29945b38e3dff293ab11e9 /app-admin | |
| parent | Add remote-id info for cpan (diff) | |
| download | gentoo-2-90c1f5bac0ddf2fcb1d1801ec017ade4c592bb85.tar.gz gentoo-2-90c1f5bac0ddf2fcb1d1801ec017ade4c592bb85.tar.bz2 gentoo-2-90c1f5bac0ddf2fcb1d1801ec017ade4c592bb85.zip | |
Convert last sed to patch and call AC_PROG_MKDIR_P too
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/elektra/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/elektra/elektra-0.7.1.ebuild | 10 | ||||
| -rw-r--r-- | app-admin/elektra/files/elektra-0.7.1-automake-1.12.patch | 24 |
3 files changed, 32 insertions, 7 deletions
diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog index 4abd429e69c5..77fb07802e74 100644 --- a/app-admin/elektra/ChangeLog +++ b/app-admin/elektra/ChangeLog @@ -1,8 +1,9 @@ # ChangeLog for app-admin/elektra # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.5 2012/06/23 04:36:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.6 2012/06/23 07:47:24 ssuominen Exp $ - 23 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> elektra-0.7.1.ebuild: + 23 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> elektra-0.7.1.ebuild, + +files/elektra-0.7.1-automake-1.12.patch: Fix building with sys-devel/automake >= 1.12 wrt #421589 09 Feb 2012; Michael Weber <xmw@gentoo.org> elektra-0.7.1.ebuild: diff --git a/app-admin/elektra/elektra-0.7.1.ebuild b/app-admin/elektra/elektra-0.7.1.ebuild index fbbdb13ef373..f012ac0ccabe 100644 --- a/app-admin/elektra/elektra-0.7.1.ebuild +++ b/app-admin/elektra/elektra-0.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1.ebuild,v 1.5 2012/06/23 04:36:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1.ebuild,v 1.6 2012/06/23 07:47:24 ssuominen Exp $ EAPI=4 @@ -25,10 +25,10 @@ src_prepare() { einfo 'Removing bundled libltdl' rm -rf libltdl || die - epatch "${FILESDIR}"/${P}-test.patch \ - "${FILESDIR}"/${P}-ltdl.patch - - sed -i -e 's:mkdir_p:MKDIR_P:' doc/Makefile.am || die #421589 + epatch \ + "${FILESDIR}"/${P}-test.patch \ + "${FILESDIR}"/${P}-ltdl.patch \ + "${FILESDIR}"/${P}-automake-1.12.patch touch config.rpath eautoreconf diff --git a/app-admin/elektra/files/elektra-0.7.1-automake-1.12.patch b/app-admin/elektra/files/elektra-0.7.1-automake-1.12.patch new file mode 100644 index 000000000000..e4539dbc1c20 --- /dev/null +++ b/app-admin/elektra/files/elektra-0.7.1-automake-1.12.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/421589 + +--- configure.ac ++++ configure.ac +@@ -46,6 +46,8 @@ + AM_INIT_AUTOMAKE + AC_CONFIG_HEADER([src/include/config.h]) + ++AC_PROG_MKDIR_P ++ + dnl select POSIX extensions, useful on solaris, for example + gl_USE_SYSTEM_EXTENSIONS + +--- doc/Makefile.am ++++ doc/Makefile.am +@@ -223,7 +223,7 @@ + + install-man3: $(man3_MANS) + @$(NORMAL_INSTALL) +- test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)" ++ test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)" + @if test -d elektra-api/man/; then man_d=elektra-api/man/; \ + else man_d=$(srcdir)/elektra-api/man/; \ + fi; \ |