app-admin/elektra: EAPI bump, version bump, changed depends logic. Based heavly on ebuild from xmv overlay.

svn path=/sunrise/; revision=12211

5 files changed, 71 insertions, 70 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index e12164e17..9b202a888 100644
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-admin/elektra
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jul 2011; Piotr Szymaniak <szarpaj@grubelek.pl> -elektra-0.7.0.ebuild,
+  +elektra-0.7.1.ebuild, metadata.xml:
+  EAPI bump, version bump, changed depends logic. Based heavly on ebuild from
+  xmv overlay.
+
   15 Apr 2010; Michael Weber (xmw) <gentoo@xmw.de> elektra-0.7.0.ebuild:
   pimped DESCRIPTION, use base.eclass, shortened single line if statements
 
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 580f6636e..b5cb8d184 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,4 +1,4 @@
-DIST elektra-0.7.0.tar.gz 1737447 RMD160 1e61efd5bc36cd90a3a4b0ecfb78e1a75c005cad SHA1 1d0aac0a654660cba0965e7b2998b3f312a9ba96 SHA256 2384de7e2339a6778e529a087efca53422620192767795ef98e516cb61a58245
-EBUILD elektra-0.7.0.ebuild 1675 RMD160 a8c48fb3852eff89b7bc673c1588ba9fb519a4ad SHA1 51fa403255ce725977172ca9bc53816c330a417b SHA256 4c8c570a2fa8e797ecc107cd12614e5b0c1425fe1ac5842b50fe9ee14373b7e8
-MISC ChangeLog 386 RMD160 af54a35ed5f77a9f478e501d0d555835c6970443 SHA1 8fe6bad538fd18f021c9743c2cbefc383e290ab3 SHA256 fbba9a90b31ce15558170eb0d0bcdfc8d7ad009f7a3ee63fae3be82ff350cb36
-MISC metadata.xml 314 RMD160 8ae2473d34ebc567b909e3e44fab02c52436117e SHA1 af8ae116dff70a9eaabf4f940db23f7a7eb3fc0c SHA256 93898ea4d8dd013a9a52859e22e8c6364039e8f1d4b41163a780a58673b4e725
+DIST elektra-0.7.1.tar.gz 1347524 RMD160 2b9153b508a535c80fef2795955eb98a8dfeb968 SHA1 bcc733cab0b391e5790c05635ab7161d9bdcaffa SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c
+EBUILD elektra-0.7.1.ebuild 1381 RMD160 bae7c329e5c2445f74fe1ae0dacb486b267ded58 SHA1 1595ea1a743dea2b34fe0d9c138233b0553cf781 SHA256 1db7140e72e4341e005e7ebc4023ed042c06e5a42bc631654c7181f5ef255ef6
+MISC ChangeLog 595 RMD160 e6c6398c72bef85d045ddd15c062035beb958480 SHA1 1072f2988374b0f234abf8540989f715cf0bb895 SHA256 f43a2ad7283c5f0602957c38ca3e48c7745069070f138dc8a96efcd32ac1f89a
+MISC metadata.xml 231 RMD160 6aebfea93d789d2b96ea6d8259dc842dd1fdacd3 SHA1 e10a04c4c18a66af326abc1f40c61b28cc610fae SHA256 48054ea190d00518c1e035fc6663b2368854cdea5ff69a94830e4f9a38260987
diff --git a/app-admin/elektra/elektra-0.7.0.ebuild b/app-admin/elektra/elektra-0.7.0.ebuild
deleted file mode 100644
index 571ff5dea..000000000
--- a/app-admin/elektra/elektra-0.7.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit base
-
-DESCRIPTION="Hierarchical configuration backend, providing consistent API and possibility to share configuration"
-HOMEPAGE="http://elektra.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="coverage debug doc examples iconv test"
-
-RDEPEND="dev-libs/libxml2
-	sys-devel/libtool
-	coverage? ( dev-util/lcov )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_configure() {
-	# berkeleydb, daemon, fstab, gconf, python do not work
-	econf \
-		--disable-berkeleydb \
-		$(use_enable coverage gcov) \
-		--enable-cpp \
-		--disable-daemon \
-		$(use_enable debug) \
-		--disable-fstab \
-		--disable-gconf \
-		$(use_with iconv) \
-		--enable-ini \
-		--enable-passwd \
-		--disable-python \
-		--disable-static \
-		$(use_enable test xmltest) \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-develdocdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	base_src_install
-	use doc || { rm -r "${D}"/usr/share/doc/${PF}/api-html || die ; }
-	use examples || { rm -r "${D}"/usr/share/doc/${PF}/scripts || die ; }
-
-	# collision with media-libs/allegro
-	mv -v "${D}"/usr/share/man/man3/key.3 "${D}"/usr/share/man/man3/elektra-key.3 || die
-}
-
-pkg_postinst() {
-	DTVERSION=`find /usr/share/sgml -name elektra.xsd | tail -n 1`
-	kdb set system/sw/kdb/current/schemapath "${DTVERSION}"
-	einfo "See manpages elektra and kdb for more information."
-	einfo "man 3 key has been moved to man 3 elektra-key."
-}
diff --git a/app-admin/elektra/elektra-0.7.1.ebuild b/app-admin/elektra/elektra-0.7.1.ebuild
new file mode 100644
index 000000000..45ff91dbe
--- /dev/null
+++ b/app-admin/elektra/elektra-0.7.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit autotools
+
+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="iconv static-libs"
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	iconv? ( virtual/libiconv )"
+
+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
+
+	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 \
+		--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
+
+	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 deb05babf..c6be58046 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -3,7 +3,4 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
-	<use>
-		<flag name='coverage'>Turn on code coverage analysis tools</flag>
-	</use>
 </pkgmetadata>