Revbump to address bug 463868, thanks Andreas Sturmlechner

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

4 files changed, 111 insertions, 5 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index bfb26dea8d08..00eeb4cc9350 100644
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/elektra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.11 2013/03/23 13:29:53 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.12 2013/04/13 00:24:42 xmw Exp $
+
+*elektra-0.7.1-r3 (13 Apr 2013)
+
+  13 Apr 2013; Michael Weber <xmw@gentoo.org> +elektra-0.7.1-r3.ebuild,
+  +files/elektra-0.7.1-remove-ddefault-link.patch:
+  Revbump to address bug 463868, thanks Andreas Sturmlechner
 
 *elektra-0.8.3-r1 (23 Mar 2013)
 
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 0a71426bff6b..9c7b96bd98f7 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -3,20 +3,22 @@ Hash: SHA256
 
 AUX elektra-0.7.1-automake-1.12.patch 600 SHA256 42ae7ff20a5e2f9b99a8c6db8c3aab3de081eae847cc627c8480333a57e31495 SHA512 86942a6c22b831d76884af3174d3ee4be2c399eb2eab3f1acc0aff02ba5596a9ed7ec95e465aae4eca8c64e993e5c3959d02490e4c1dfd142dfce8f0260bcbc4 WHIRLPOOL 6826652512fce2d7c2808b225fb733891d3a36da8579487881a6a4d3c28e6231a1228fed03eed50010cbd5012afc7d587ea5d22a18c8bb130767f20a4d57bd5b
 AUX elektra-0.7.1-ltdl.patch 630 SHA256 707a809f9927f5ef376b7f4f7c116590524f2da8a5cbcfb76ab2664b14de136c SHA512 f32fc4b0c3fd943ba2ced6908417eeb24216878e6a8523991e81f59343c35d4cc2e393153f4c961bdbf8574e7caf941c0c85d695003aa124f55e9e9e862d13d8 WHIRLPOOL 4a787ed571e8cc82a1bfcefd6f3ff8dca4f251286b6ffd7e8c898ce11526ca86c19f72d33f16397dd131c5f6977195077442199c54e8f786d7748812fd259cc4
+AUX elektra-0.7.1-remove-ddefault-link.patch 576 SHA256 ad834ef43a15925e5570faae853fa6d32607bd75dd991d9223373c1aa66df15e SHA512 75b0d776fdd150f369021f98868da5a1d3e4dc7891a5de149c9b16ca984300a0688fec11e9441732ac7d11c899371bbfa3879562131333597a5d57f89748a92d WHIRLPOOL dc0dd9e760ce86b5b8e28cae0c43c86de4194c1008d82a4b8dfe934eda35c88f7e3ff26931a46f192f0a45e0f71d642c8d10d00ac66431e6c5e037ffbb34ef1c
 AUX elektra-0.7.1-test.patch 6259 SHA256 a84091cbe3b0ca9c01278c17d8eee0f95a06758969d52599b855da1be3949f49 SHA512 258e49c90cea8b1a830a8acb5a2307e49d3dea6b2189373f1b0b614cb070d7a9dbb4954fb486bbacd46fa612d96d6824ef1ee4f40925ad2a347eabb4a45bdfe7 WHIRLPOOL 382a95d5b7fb4d5564eac06a04a909e69af3770913d06b56c3e3d78f3c4f56ef9a4fe51e490e274de0cdd9b254808da6c5638d4b35f991fe1b4c5cf9d7cda011
 AUX elektra-0.8.3-fix-yajl-if-user-config.patch 814 SHA256 b49d742526c40fb017e09b68bf5d9be928c21374778142efb1aa7530b72e59c9 SHA512 2531f730991e9810ff84372dfe79e6a973eecca3b3154709c5e839a8a9e45606567619549e4e9156a1751e3e45a723f0728ca9d4175606252dca6fdef19ff879 WHIRLPOOL c8159580e9ab9988994406a8936225a54c949971b28bfba7a64a47f77966cdea5f0f814213f8e2992041adb7ec66e7ca53f6d43f791a1e5036b460d0da2fda5f
 AUX elektra-0.8.3-introduce-attributes.patch 806 SHA256 09ea008048e620e05b6e64a877275073574e34457354f578ba9d0ab1737e15f2 SHA512 1ea9dd7b5460dfae6a57ceb972e527b7c7dd80452fba19b1296a31175b3285144b0458271981f6b26e5e239301bb698c1ce87ca113ad58ecf3fa433f4240b666 WHIRLPOOL 90eb0167a85c1ea9e58f12c30fb69a13edea034762a6c04d3ccd8b8f9e656e3398ccca3f3ee27592401930c6088043416515850055c149709cc7d2884bce9b66
 DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
 DIST elektra-0.8.3.tar.gz 1092409 SHA256 48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886 WHIRLPOOL 64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9
 EBUILD elektra-0.7.1-r2.ebuild 2194 SHA256 68b0ef512884c5e551d2a7ba2076e90e6da4b15d347fb5de3100ed55bd98fb0b SHA512 65d92a286d5b9f5a55c09206b97af9f25504fa1ce7da3bd8ff6ad0f8a55da66bf679164fbfac00471496dc4085a531ed67f6d7d95df52d6dcfe0427cce06e8ab WHIRLPOOL 8b6d24bcb805f3f92d5214bf5e9c985a79d31c9528c579215c63ef24c8609174801c087e5437ba2550ec58913c4c19b14dd0939b50736f18a1f9c276692f7c1f
+EBUILD elektra-0.7.1-r3.ebuild 2238 SHA256 3500f96b193bd5f19cf57cb1277ab106c454eca70437797430fc7f13d7b1fd26 SHA512 bf884dd11a8df5213a49d51ce7305e70d5c6bed37c00b7882b4ef3b2667b71eefdf822b506defa35fbd8c9d8732d99521f28f1ec58fe0b57d1cb1a322df2f88e WHIRLPOOL e2613244bd3b01c2eddd4858d296a951bbd563387f5ab5303116df9f47fc0380893a1d23144f21159525d8f8f28cfd8de4579eee09cfbf1cd4c7ab8965df1d8d
 EBUILD elektra-0.8.3-r1.ebuild 2233 SHA256 565c1d9168db7b3254207ddcd8dd5f70c22d01198b6f1621c053552b0ee69c53 SHA512 aefd6f4014e47aefd9a2b77ff9a92afc9704c899dab9a01b0d10ac6b37a0e0b427070e6d2a70b300caf26f7464d4110a3266f263695404acc76dc100f48921cc WHIRLPOOL a7ac82b374154b086d82d833c2dfa8b80b011dea254f317e09a2c70b71caf8ffd30ed4798c204c74b8754d3d27933fb33356859ef1c1cdc9a559fe436f31822b
 EBUILD elektra-0.8.3.ebuild 2181 SHA256 908229d81dcf4b2d8b2d82cd0c79d4f8217aba76fb9c7af4da6440f0fe537bc1 SHA512 b17f7884c9aacbf8fc70137f581908834c02507867a042540dbb2925564282ae4ab497fb9022121f37de2f0e130d2505def997d2f72ded0434e0307e3449d263 WHIRLPOOL 85e4d805c6eb05579b3e10b1ef15e2e9a64c643bbaf4ef3df2474272a3c90e5b7e618711cc1cadbed6c50c1c28bdb9e92c2eb849523f28f138654d4a5baa1c73
-MISC ChangeLog 2180 SHA256 4ae85b0e3c3f1446381c811791a92a05cf82439d24a591e96712b9efaeee2719 SHA512 bcf404270d879dedb6041525b2b7839bf6613bb349b20a21e6d42b18aba2f548a69c6138b29619a912c42c78af7f71dc63b0a24e302597be8e3f88d8813f506d WHIRLPOOL a5faec30bc277c3c3ff65988bb65d5d95ac68cfaadf5c1eb91e1560f5af5ec1dbd48b6fed8e0774bbe00d07365ef4617814ad7da1df59ce19e72140c8d212142
+MISC ChangeLog 2398 SHA256 758d04fb524a2a634eebb7517ea8429abd8f7ead28a3b8623b643fbe6d48aca0 SHA512 43f63bc34217769b3bd4865b6a0ff00a272c826ea42ae3dab3ef11ded3c9eeb4ba1ed9a478148ccbb94b64750aed87977b9911b9e4bed3ef7c7285ff86672da1 WHIRLPOOL 9e9bb6f64280466133e964c23160188f7372d5445367d4a5a1db7f5281d27295393ee0e2836cef4abd98847f606590f4c0619ede21e0c326e97198529c7a6b80
 MISC metadata.xml 389 SHA256 734b96e3a1277ec120fa70a2476e91dd54ea5a6d661a6945665f9e74085d650d SHA512 cfdd3e6f1974390d1b6bea8c7acb682ea9659cd240e274d4a06423fa4dc98660d1d5cb0cbe4eb94178ea73af04c8c453a9d29ce350b7590225324ec7f4824d4a WHIRLPOOL 0365d182deaf06c7680788cbb9f15fef5afbb66d8a90a1bbe8bac62c046f44a5dea9e26594501a362fa3b2d36136000f8f47adb1df928951243c3b1932fd2ce4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFNrpcACgkQknrdDGLu8JAh8gD/R0JDUHfcz/vyAxjCIw72H8zw
-tAYfT1Ylqpq0eErIFmcA/1ULWNxIbU8knGGExIsux3hNscCWqZ9gBQxbqrAm0tpx
-=I1F7
+iF4EAREIAAYFAlFopikACgkQknrdDGLu8JDfHAEAk1uV3iIxhK7p4P3IV7OEdwnA
+wz+chduHA7pexDZrWqAA/jm6N3zQdA/MkgwiqeCDUu5cKRUV2wa45cDzUTO9QEHx
+=zo2Z
 -----END PGP SIGNATURE-----
diff --git a/app-admin/elektra/elektra-0.7.1-r3.ebuild b/app-admin/elektra/elektra-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..2bcd30df38a7
--- /dev/null
+++ b/app-admin/elektra/elektra-0.7.1-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/04/13 00:24:42 xmw Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
+HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gcov iconv static-libs test"
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/libxml2[static-libs] )"
+
+src_prepare() {
+	einfo 'Removing bundled libltdl'
+	rm -rf libltdl || die
+
+	epatch \
+		"${FILESDIR}"/${P}-test.patch \
+		"${FILESDIR}"/${P}-ltdl.patch \
+		"${FILESDIR}"/${P}-automake-1.12.patch \
+		"${FILESDIR}"/${P}-remove-ddefault-link.patch
+
+	touch config.rpath
+	eautoreconf
+}
+
+src_configure() {
+	# berkeleydb, daemon, fstab, gconf, python do not work
+	econf \
+		--enable-filesys \
+		--enable-hosts \
+		--enable-ini \
+		--enable-passwd \
+		--disable-berkeleydb \
+		--disable-fstab \
+		--disable-gconf \
+		--disable-daemon \
+		--enable-cpp \
+		--disable-python \
+		$(use_enable gcov) \
+		$(use_enable iconv) \
+		$(use_enable static-libs static) \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-develdocdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	local my_f=""
+	#avoid collision with kerberos (bug 403025)
+	for my_f in kdb kdbbackend.h kdbos.h kdbtools.h keyset kdb.h \
+		kdbloader.h kdbprivate.h key ; do
+		mv "${D}"/usr/include/{,elektra-}"${my_f}" || die
+		elog "/usr/include/${my_f} installed as elektra-${my_f}"
+	done
+	sed -e '/^#include/s:kdbos.h:elektra-kdbos.h:' \
+		-i "${D}"/usr/include/elektra-kdb.h || die
+
+	#avoid collision with allegro (bug 409305)
+	for my_f in $(find "${D}"/usr/share/man/man3 -name "key.3*") ; do
+		mv "${my_f}" "${my_f/key/elektra-key}" || die
+		elog "/usr/share/man/man3/$(basename "${my_f}") installed as $(basename "${my_f/key/elektra-key}")"
+	done
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-admin/elektra/files/elektra-0.7.1-remove-ddefault-link.patch b/app-admin/elektra/files/elektra-0.7.1-remove-ddefault-link.patch
new file mode 100644
index 000000000000..4dd162dcaa62
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.7.1-remove-ddefault-link.patch
@@ -0,0 +1,16 @@
+--- a/src/backends/Makefile.am	2010-04-27 09:17:25.000000000 +0200
++++ b/src/backends/Makefile.am	2013-03-30 15:34:36.406336274 +0100
+@@ -7,13 +7,7 @@
+ 	cd $(DESTDIR)$(backenddir) && \
+ 	test -L libelektra-default.so || \
+ 	$(LN_S) libelektra-@default_backend@.so libelektra-default.so
+-	cd $(DESTDIR)$(backenddir) && \
+-	test -L libelektra-ddefault.so || \
+-	$(LN_S) libelektra-@default_dbackend@.so libelektra-ddefault.so
+ 
+ uninstall-hook:
+ 	-cd $(DESTDIR)$(backenddir) && \
+ 	rm -f libelektra-default.so
+-	-cd $(DESTDIR)$(backenddir) && \
+-	rm -f libelektra-ddefault.so
+-