From 89a6d372bafaec4146c6ea48472e406a9995d2d5 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Thu, 9 Feb 2012 23:55:32 +0000 Subject: Fix patch file, got scrambled during upload (bug 402785) Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- app-admin/elektra/ChangeLog | 6 +++++- app-admin/elektra/Manifest | 12 ++++++------ app-admin/elektra/elektra-0.7.1.ebuild | 7 +++++-- app-admin/elektra/files/elektra-0.7.1-ltdl.patch | 13 ++++++++----- 4 files changed, 24 insertions(+), 14 deletions(-) (limited to 'app-admin/elektra') 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 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 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/Manifest b/app-admin/elektra/Manifest index d34e3312d06d..892ad61e3562 100644 --- a/app-admin/elektra/Manifest +++ b/app-admin/elektra/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX elektra-0.7.1-ltdl.patch 822 RMD160 511f955f2158f799d7b484ea4a96bd5dfca690a2 SHA1 3eca937884d0f64d2e2793aaa45fba8e4671f0fa SHA256 fb77f3c6ace4a5caffa1b1984bac62c9d02392a28e2990df6146ea37466bb850 +AUX elektra-0.7.1-ltdl.patch 630 RMD160 7d507ba44bb6975cebfc06986f1fc77f16577564 SHA1 61002c62f3596b7e7290775d5f86c908e442644b SHA256 707a809f9927f5ef376b7f4f7c116590524f2da8a5cbcfb76ab2664b14de136c AUX elektra-0.7.1-test.patch 6259 RMD160 af7822ae215f81af92b6be51341e0dbeb6c9d4c1 SHA1 ce8f0c10a9f8244a5b2973086af327d1ad52fd1a SHA256 a84091cbe3b0ca9c01278c17d8eee0f95a06758969d52599b855da1be3949f49 DIST elektra-0.7.1.tar.gz 1347524 RMD160 2b9153b508a535c80fef2795955eb98a8dfeb968 SHA1 bcc733cab0b391e5790c05635ab7161d9bdcaffa SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c -EBUILD elektra-0.7.1.ebuild 1456 RMD160 6d5decfadfd33dfcb2c95a30614791b8e54c9820 SHA1 e2d6d597bf7b3e1bf9b4ca9b116bfb8c732e1177 SHA256 fde3ab243c68485a7b3c881caba313a3781ce52f892f121e43e1e614c9d699f4 -MISC ChangeLog 620 RMD160 33f016e23142bd8cfa3913bf0ddd869ce8efff21 SHA1 b5ed15693eec66265878d5d648b6721db7d0707c SHA256 bacef888023ae526184fa4d44f7270ba0b8d587058869ae26083180a5427fff2 +EBUILD elektra-0.7.1.ebuild 1493 RMD160 c10cbd66dffa29566d2ab827722af29c4442c227 SHA1 411843d3fde5e43cf71410a2f3155d3323a805ee SHA256 cf6ba4aa2a301411691012987fe2449fb49c4cf1991d3fc720b987c4f490986f +MISC ChangeLog 782 RMD160 4acc19b6cfde326f7d2be096335657aa57b1e403 SHA1 517b147c1f685187a5a7cf9df0d112213bb89002 SHA256 c4bef5088f3e0574d5090c759527655230ee76c2f007d32b38b1cd1b7698a772 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk8x/XcACgkQknrdDGLu8JCTmAD+K5ibzIeWnNjKznx8bEEEtmvk -Q7Zkj7HaLXILBE9coHcA/R0AZITU+ZqmCC3CalKve75gI11uEDMQRTsgYT6hO8lx -=gXhD +iF4EAREIAAYFAk80XPgACgkQknrdDGLu8JBYowD+NB3a+mr/YR6C1/88JYnnLdTg +h2bVOjs1ZMstAlehog4A/1B/UA+e3RWzvLW9TydTOrm4v6gKNJ+g3L5NYzywGR6s +=ghY1 -----END PGP SIGNATURE----- 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 -- cgit v1.2.3-65-gdbad