Fix tests, disable test_backendhelpers test (bug 402619).

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 160 insertions, 12 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index 8d3bf6889b91..d90bad6d3d6f 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.1 2012/02/05 17:23:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.2 2012/02/08 04:43:23 xmw Exp $
+
+  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:
+  Fix tests, disable test_backendhelpers test (bug 402619).
 
 *elektra-0.7.1 (05 Feb 2012)
 
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index a3b40d097c57..d34e3312d06d 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,14 +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-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 1480 RMD160 2ebf9c7a1cc8a81704a347cd338de214d601fee5 SHA1 4153137582eae1a4ae25b522d71d9e9dfb9bf1da SHA256 c7af16dbbf577627540cc67416e6987674dd94273ecff77f8968880a9a58f747
-MISC ChangeLog 423 RMD160 5ae34edf4feec9202a73ea85c3dfdfc09cdb564e SHA1 86838a019139a4482011c70357b4108736d8dcc2 SHA256 ed0c96a394b836f7b1bc87de4688d214ac41e5e5264bf0198234626bcf13764d
+EBUILD elektra-0.7.1.ebuild 1456 RMD160 6d5decfadfd33dfcb2c95a30614791b8e54c9820 SHA1 e2d6d597bf7b3e1bf9b4ca9b116bfb8c732e1177 SHA256 fde3ab243c68485a7b3c881caba313a3781ce52f892f121e43e1e614c9d699f4
+MISC ChangeLog 620 RMD160 33f016e23142bd8cfa3913bf0ddd869ce8efff21 SHA1 b5ed15693eec66265878d5d648b6721db7d0707c SHA256 bacef888023ae526184fa4d44f7270ba0b8d587058869ae26083180a5427fff2
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8uu14ACgkQknrdDGLu8JAflgD/eWI3cjMriaa0+vdrjMhSKgHY
-C5/NkI1ywn59TFDcjfAA/idGYaLWE94dX334XUokysescUfIhJdo6DnevhnnXyfr
-=vUUI
+iF4EAREIAAYFAk8x/XcACgkQknrdDGLu8JCTmAD+K5ibzIeWnNjKznx8bEEEtmvk
+Q7Zkj7HaLXILBE9coHcA/R0AZITU+ZqmCC3CalKve75gI11uEDMQRTsgYT6hO8lx
+=gXhD
 -----END PGP SIGNATURE-----
diff --git a/app-admin/elektra/elektra-0.7.1.ebuild b/app-admin/elektra/elektra-0.7.1.ebuild
index d147d82146f8..b5fdbdc3be29 100644
--- a/app-admin/elektra/elektra-0.7.1.ebuild
+++ b/app-admin/elektra/elektra-0.7.1.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2012/02/05 17:23:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1.ebuild,v 1.2 2012/02/08 04:43:23 xmw Exp $
 
 EAPI=4
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
 HOMEPAGE="http://sourceforge.net/projects/elektra/"
@@ -13,18 +13,19 @@ SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="iconv static-libs"
+IUSE="iconv static-libs test"
 
 RDEPEND="dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	sys-devel/libtool
-	iconv? ( virtual/libiconv )"
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/libxml2[static-libs] )"
 
 src_prepare() {
 	einfo 'Removing bundled libltdl'
 	rm -rf libltdl || die
-	sed -i -e '/^SUBDIRS/s:libltdl::' Makefile.am || die
-	sed -i -e '1adeveldocDATA_INSTALL = install' doc/Makefile.am || die
+
+	epatch "${FILESDIR}"/${P}-{ltdl,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
new file mode 100644
index 000000000000..cd11a2bd0cde
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.7.1-ltdl.patch
@@ -0,0 +1,18 @@
+--- elektra-0.7.1/Makefile.am
++++ elektra-0.7.1/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = libltdl 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 $
++develdocDATA_INSTALL = install
+ 
+ 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
diff --git a/app-admin/elektra/files/elektra-0.7.1-test.patch b/app-admin/elektra/files/elektra-0.7.1-test.patch
new file mode 100644
index 000000000000..357f25848f8f
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.7.1-test.patch
@@ -0,0 +1,123 @@
+--- elektra-0.7.1/src/bindings/cpp/tests/test_kdb.cpp
++++ elektra-0.7.1/src/bindings/cpp/tests/test_kdb.cpp
+@@ -1,4 +1,5 @@
+ #include <tests.h>
++#include <stdio.h>
+ 
+ void test_kdbGetSet()
+ {
+--- elektra-0.7.1/src/bindings/cpp/tests/test_ks.cpp
++++ elektra-0.7.1/src/bindings/cpp/tests/test_ks.cpp
+@@ -1,4 +1,5 @@
+ #include <tests.h>
++#include <stdio.h>
+ 
+ void test_ksnew()
+ {
+--- elektra-0.7.1/src/bindings/cpp/tests/test_key.cpp
++++ elektra-0.7.1/src/bindings/cpp/tests/test_key.cpp
+@@ -1,4 +1,5 @@
+ #include <tests.h>
++#include <stdio.h>
+ 
+ void test_keynew()
+ {
+--- elektra-0.7.1/src/bindings/cpp/tests/Makefile.am
++++ elektra-0.7.1/src/bindings/cpp/tests/Makefile.am
+@@ -10,13 +10,13 @@
+ endif
+ 
+ test_key_SOURCES = test_key.cpp tests.h tests.cpp
+-test_key_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a
++test_key_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a
+ 
+ test_ks_SOURCES = test_ks.cpp tests.h tests.cpp
+-test_ks_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a
++test_ks_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a
+ 
+ test_kdb_SOURCES = test_kdb.cpp tests.h tests.cpp
+-test_kdb_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a
++test_kdb_LDADD = $(privatelibs) ../libelektra-cpp.a ../../../libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a
+ 
+ ../libelektra-cpp.a:
+ 	cd .. && $(MAKE) libelektra-cpp.a
+--- elektra-0.7.1/tests/Makefile.am
++++ elektra-0.7.1/tests/Makefile.am
+@@ -1,10 +1,10 @@
+ AM_CFLAGS = $(COPTFLAGS) $(CDBGFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LTDLINCL)
+ 
+-TESTS = test_key test_ks test_kdb test_xml test_validate.sh test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_backendhelpers test_script.sh test_type
++TESTS = test_key test_ks test_kdb test_xml test_validate.sh test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_script.sh test_type
+ #TESTS = test_backendhelpers
+ 
+-check_PROGRAMS    = test_key test_ks test_kdb test_xml test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_backendhelpers test_type print_info
++check_PROGRAMS    = test_key test_ks test_kdb test_xml test_getset test_trie test_mount test_cap test_stream test_serialize test_split test_internals test_type print_info
+ #check_PROGRAMS    = test_backendhelpers
+ 
+ if VALGRINDTESTS
+@@ -19,49 +19,49 @@
+ 	rm -f *.gcno *.gcda *.gcno
+ 
+ test_key_SOURCES = test_key.c tests.h tests.c
+-test_key_LDADD = $(privatelibs) ../src/libelektra/libelektra.a 
++test_key_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_ks_SOURCES = test_ks.c tests.h tests.c
+-test_ks_LDADD = $(privatelibs) ../src/libelektra/libelektra.a 
++test_ks_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_kdb_SOURCES = test_kdb.c tests.h tests.c
+-test_kdb_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_kdb_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_xml_SOURCES = test_xml.c tests.h tests.c
+-test_xml_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_xml_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_getset_SOURCES = test_getset.c tests.h tests.c
+-test_getset_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_getset_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_trie_SOURCES = test_trie.c tests.h tests.c
+-test_trie_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_trie_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_mount_SOURCES = test_mount.c tests.h tests.c
+-test_mount_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_mount_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_cap_SOURCES = test_cap.c tests.h tests.c
+-test_cap_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_cap_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_stream_SOURCES = test_stream.c tests.h tests.c
+-test_stream_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_stream_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_serialize_SOURCES = test_serialize.c tests.h tests.c
+-test_serialize_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_serialize_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_split_SOURCES = test_split.c tests.h tests.c
+-test_split_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_split_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_internals_SOURCES = test_internals.c tests.h tests.c
+-test_internals_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_internals_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_backendhelpers_SOURCES = test_backendhelpers.c tests.h tests.c
+-test_backendhelpers_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_backendhelpers_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ test_type_SOURCES = test_type.c tests.h tests.c
+-test_type_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++test_type_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ print_info_SOURCES = print_info.c tests.h tests.c
+-print_info_LDADD = $(privatelibs) ../src/libelektra/libelektra.a
++print_info_LDADD = $(privatelibs) ../src/libelektra/libelektra.a /usr/lib/libxml2.a /usr/lib/libz.a /usr/lib/libm.a
+ 
+ ../src/libelektra/libelektra.a:
+ 	cd ../src/libelektra && $(MAKE) libelektra.a