Revbump to address bug 463868, thanks Andreas Sturmlechner

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 105 insertions, 1 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/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
+-