diff options
| author |   Michael Weber <xmw@gentoo.org> | 2012-02-09 23:55:32 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2012-02-09 23:55:32 +0000 |
| commit | 7fd54b69b8360f96471f5bbe0fddbd2f5981e39b (patch) | |
| tree | ff6e48ca313d2b768c6b564ff8a6d391aede5331 /app-admin/elektra | |
| parent | Added ~mips, bug 393181. (diff) | |
| download | gentoo-2-7fd54b69b8360f96471f5bbe0fddbd2f5981e39b.tar.gz gentoo-2-7fd54b69b8360f96471f5bbe0fddbd2f5981e39b.tar.bz2 gentoo-2-7fd54b69b8360f96471f5bbe0fddbd2f5981e39b.zip | |
Fix patch file, got scrambled during upload (bug 402785)
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'app-admin/elektra')
| -rw-r--r-- | app-admin/elektra/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/elektra/elektra-0.7.1.ebuild | 7 | ||||
| -rw-r--r-- | app-admin/elektra/files/elektra-0.7.1-ltdl.patch | 13 |
3 files changed, 18 insertions, 8 deletions
diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog index d90bad6d3d6f..de3fb398cf2f 100644 --- a/app-admin/elektra/ChangeLog +++ b/app-admin/elektra/ChangeLog @@ -1,6 +1,10 @@ # 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.2 2012/02/08 04:43:23 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.3 2012/02/09 23:55:32 xmw Exp $ + + 09 Feb 2012; Michael Weber <xmw@gentoo.org> elektra-0.7.1.ebuild, + files/elektra-0.7.1-ltdl.patch: + Fix patch file, got scrambled during upload (bug 402785) 08 Feb 2012; Michael Weber <xmw@gentoo.org> elektra-0.7.1.ebuild, +files/elektra-0.7.1-ltdl.patch, +files/elektra-0.7.1-test.patch: diff --git a/app-admin/elektra/elektra-0.7.1.ebuild b/app-admin/elektra/elektra-0.7.1.ebuild index b5fdbdc3be29..05997c09e7b4 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.2 2012/02/08 04:43:23 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1.ebuild,v 1.3 2012/02/09 23:55:32 xmw Exp $ EAPI=4 @@ -25,7 +25,10 @@ src_prepare() { einfo 'Removing bundled libltdl' rm -rf libltdl || die - epatch "${FILESDIR}"/${P}-{ltdl,test}.patch + epatch "${FILESDIR}"/${P}-test.patch + return + + # "${FILESDIR}"/${P}-test.patch touch config.rpath eautoreconf diff --git a/app-admin/elektra/files/elektra-0.7.1-ltdl.patch b/app-admin/elektra/files/elektra-0.7.1-ltdl.patch index cd11a2bd0cde..65bccdf763e6 100644 --- a/app-admin/elektra/files/elektra-0.7.1-ltdl.patch +++ b/app-admin/elektra/files/elektra-0.7.1-ltdl.patch @@ -4,15 +4,18 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = libltdl src doc benchmarks examples scripts xmlschema tests -+SUBDIRS = src doc benchmarks examples scripts xmlschema tests ++SUBDIRS = src doc benchmarks examples scripts xmlschema tests EXTRA_DIST=elektra.pc elektratools.pc elektracpp.pc elektra.spec elektra.mandriva.spec elektra.xml pkgconfigdir = $(ulibdir)/pkgconfig --- elektra-0.7.1/doc/Makefile.am +++ elektra-0.7.1/doc/Makefile.am -@@ -1,4 +1,5 @@ - # $Id: elektra-0.7.1-ltdl.patch,v 1.1 2012/02/08 04:43:23 xmw Exp $ +@@ -7,6 +7,8 @@ + EXTRA_DIST+=$(all_mans) + EXTRA_DIST+= $(HTML_TITLE_LAYOUT_XSL) + +develdocDATA_INSTALL = install ++ + SUBDIRS=images standards - EXTRA_DIST=kdb.1.xml elektra.7.xml elektra.5.xml - EXTRA_DIST+=author.xml bestpract.xml rgexample.xml rgcmd.xml storage.xml overview.xml apiexample.xml api.xml compared.xml garbage.xml html-params.xsl html-titlepage-layout.tpl society.xml storage.xml UPLOAD + # Dependencies for Doxygen documentation |