Fix includes of renamed headers, drop old

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

3 files changed, 10 insertions, 67 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index 759d05732d2f..6456547bc030 100644
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2012/11/04 10:40:57 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.9 2012/11/04 11:23:30 xmw Exp $
+
+*elektra-0.7.1-r2 (04 Nov 2012)
+
+  04 Nov 2012; Michael Weber <xmw@gentoo.org> -elektra-0.7.1.ebuild,
+  -elektra-0.7.1-r1.ebuild, +elektra-0.7.1-r2.ebuild:
+  Fix includes of renamed headers, drop old
 
 *elektra-0.8.3 (04 Nov 2012)
 
diff --git a/app-admin/elektra/elektra-0.7.1-r1.ebuild b/app-admin/elektra/elektra-0.7.1-r2.ebuild
index 4dc542292194..a2bbd4b11c53 100644
--- a/app-admin/elektra/elektra-0.7.1-r1.ebuild
+++ b/app-admin/elektra/elektra-0.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/11/04 09:39:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.7.1-r2.ebuild,v 1.1 2012/11/04 11:23:30 xmw Exp $
 
 EAPI=4
 
@@ -64,6 +64,8 @@ src_install() {
 		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
diff --git a/app-admin/elektra/elektra-0.7.1.ebuild b/app-admin/elektra/elektra-0.7.1.ebuild
deleted file mode 100644
index f012ac0ccabe..000000000000
--- a/app-admin/elektra/elektra-0.7.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.6 2012/06/23 07:47:24 ssuominen 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="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 \
-		--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
-}