Revbump to make gcov optional (bug 436812 by Alexander E. Patrakov), avoid collision with allegro (bug 409305, Chris Reffett), avoid collision with mit-krb5 (bug 403025, Marios Andreopoulos)

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

3 files changed, 91 insertions, 1 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index 77fb07802e74..b1bec206cd43 100644
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2012/06/23 07:47:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.7 2012/11/04 09:35:03 xmw Exp $
+
+*elektra-0.7.1-r1 (04 Nov 2012)
+
+  04 Nov 2012; Michael Weber <xmw@gentoo.org> +elektra-0.7.1-r1.ebuild,
+  metadata.xml:
+  Revbump to make gcov optional (bug 436812 by Alexander E. Patrakov), avoid
+  collision with allegro (bug 409305, Chris Reffett), avoid collision with
+  mit-krb5 (bug 403025, Marios Andreopoulos)
 
   23 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> elektra-0.7.1.ebuild,
   +files/elektra-0.7.1-automake-1.12.patch:
diff --git a/app-admin/elektra/elektra-0.7.1-r1.ebuild b/app-admin/elektra/elektra-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..dce7f5f01a16
--- /dev/null
+++ b/app-admin/elektra/elektra-0.7.1-r1.ebuild
@@ -0,0 +1,79 @@
+# 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-r1.ebuild,v 1.1 2012/11/04 09:35:03 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://sourceforge.net/projects/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
+
+	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
+
+	#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/metadata.xml b/app-admin/elektra/metadata.xml
index 59acc2cc580e..3267ead0e197 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -5,5 +5,8 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+	<flag name="gcov">Enable coverage support</flag>
+</use>
 </pkgmetadata>