Fix includes of renamed headers, drop old

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

4 files changed, 15 insertions, 73 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/Manifest b/app-admin/elektra/Manifest
index 114d9cc294c7..0f8d592b9a9b 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -8,15 +8,14 @@ AUX elektra-0.8.3-fix-yajl-if-user-config.patch 814 SHA256 b49d742526c40fb017e09
 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-r1.ebuild 2090 SHA256 15eccf12f36a52ade2a7bf8055fa8e8342a68f774760f1982eb4d9159a18705c SHA512 a1ea81b7651c4ccda3776ece8cc2dae2f8ee43bcea3aaf6e3f85285208b2227d180cb44333d7f2421112f940ac2b4613ae775d7cf1439c1f356089e64265192b WHIRLPOOL eb8c09a8c17f756af67867e955511f167cb34728019e23186a1b35503b23e786163bf4f46e3e9d9903372bfc692859676164cb3944dd4939fa748ee987cd961d
-EBUILD elektra-0.7.1.ebuild 1536 SHA256 084a77cddd1b4919dcfb158e8026f4456d51cf0c9e6f6bb6c425e608e46a1277 SHA512 940d58598af0d63b02934bb7ddd5cdca4db9a15271c579f6781fa0f1055d831e11377987ce358234400fbe4dcec25fc7cedd8b0f1398cea2ae470a34ecf30738 WHIRLPOOL afedac91016bf6c6a52288cc788f7367ce7b795a74696e2090cc0d5d4e14ed57ab51e390c9f5cda2a9a8dca2d305707c219e81012913737e3bd6bbd58e8e9739
+EBUILD elektra-0.7.1-r2.ebuild 2185 SHA256 18ae429a77c1bfe939d9e789b629495695c87bb43f1bbae6a6a455a2a820e48b SHA512 f2fbcd353880e80e4337daaa100c36ef8a984717e91db0745c5ce75a2977e1449bded37e2a5b9ae877b9ab055c92974ee0b3214064962917622e2f6825fb4e27 WHIRLPOOL 932b7d0fd856fec3ec9eca9f8c54975b6246c68c98ac5e34ef504de9c74a35a58a7e5f035ce22c3fd689c145a446e4b6f80c1a9b657661f298739d7dc776906c
 EBUILD elektra-0.8.3.ebuild 2177 SHA256 c16d3ea1e9c217b840e6035371f19a979d0d5684c8befbfb3105887d3f1f23aa SHA512 95661654fd3fec3089ef757958a1f976f87c22c352dcd39401333a3764697c3e56f55f4e400735ffde36b4e52cfb98f21aa0886a02b56dbbb7d2ced0ed727c98 WHIRLPOOL 81d8844ad51aeb51fe4183b445cb435969181c848a3d94e13c9377c79bc72e06adc43b170d439fa63dc1db35902d3c08113b159e67e60545c8604911d88ac1f8
-MISC ChangeLog 1684 SHA256 1c3fbc9befdf1aef0c12a06b038265619901b0b1baf32d8563b23048c318db09 SHA512 263faf8f08c2b52cb97905f96fc6a6efb31ec0362e54b18c942a55919ba737b1223acca312e44ea100234aebf3cfce2b181577adad6960ace24cefea50d143aa WHIRLPOOL fa5ae07392a9be134d24c9adb3dc357aaff123cd01ffaa891d19702e7b99375558e4a3ec0af20fe1b81dd6369cdb0256038e9c00c99810ed16155cf58ac81402
+MISC ChangeLog 1885 SHA256 b908dbed0039f85d61752f7da884c44d75fb1b7e988b7b290ae8b45004731031 SHA512 9e8aaf10068df86d63fe9a4d405c556304bbf9fe1c107b5cefdcac519f4a7ac1cacc4d2ed31baaee04fe6a929c67c60d1fe5de0982e1b0a7db0b8bd14972c562 WHIRLPOOL 7b1499df4b65c6dbd90dc889d94a8fcf5366f1d19770f0e7d857ab46e4d3b7a90127e5c991f23e884aceb65689f7537376d3f6af4afcbee8162d6b903bae672c
 MISC metadata.xml 389 SHA256 734b96e3a1277ec120fa70a2476e91dd54ea5a6d661a6945665f9e74085d650d SHA512 cfdd3e6f1974390d1b6bea8c7acb682ea9659cd240e274d4a06423fa4dc98660d1d5cb0cbe4eb94178ea73af04c8c453a9d29ce350b7590225324ec7f4824d4a WHIRLPOOL 0365d182deaf06c7680788cbb9f15fef5afbb66d8a90a1bbe8bac62c046f44a5dea9e26594501a362fa3b2d36136000f8f47adb1df928951243c3b1932fd2ce4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCWRo8ACgkQknrdDGLu8JC2sQEAis3utmHMPhJxrIN/zbvQgguB
-ttigbcBmcSvyCclLOQ8BAI1P9yvLXcM1agIjPaI3J73FvaMCty6ZWd7v8K3rQSj1
-=+Bea
+iF4EAREIAAYFAlCWUGwACgkQknrdDGLu8JA2HAD/YDs7NxwpB6Op+OVpaBgCY+EG
+2N7sA+is2dRE99IAIZMBAJIrJPa47ErNoRY1KxRERTxYmKm+cK0jXodSQv5YYSKM
+=yqEv
 -----END PGP SIGNATURE-----
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
-}