Drop old

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

4 files changed, 9 insertions, 172 deletions

diff --git a/app-admin/elektra/ChangeLog b/app-admin/elektra/ChangeLog
index 33f3b6bae648..874aec2209b5 100644
--- a/app-admin/elektra/ChangeLog
+++ b/app-admin/elektra/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2013/04/13 02:08:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.15 2013/04/22 10:50:07 xmw Exp $
+
+  22 Apr 2013; Michael Weber <xmw@gentoo.org> -elektra-0.7.1-r2.ebuild,
+  -elektra-0.8.3.ebuild:
+  Drop old
 
   13 Apr 2013; Michael Weber <xmw@gentoo.org> elektra-0.7.1-r3.ebuild:
   Move elektra include file in subdir (bug 447246, Andreas Sturmlechner)
@@ -67,4 +71,3 @@
   +metadata.xml:
   Initial import, thanks to all contributors (Piotr Szymaniak from sunrise,
   everybody on bug 63417)
-
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 03f07dedd04a..bbb3cd3df2e8 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -9,16 +9,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-r2.ebuild 2241 SHA256 44dc2be2148e3aa57474f17bfdfe82d8f5509c5ad20bb7766701b05671cc1c26 SHA512 8d1c3eba19f513e50c5adafe9d272e7c4a0864439d280c5d16b9439dd22e7c147399873fbbd026d3d7eb8b02fe4f75ff7048eb8aace80af6d6332e43a3ad6ab1 WHIRLPOOL 1672bc8e3ff3f592016cb616e7923e89be771018d0476e5b7c0d435b2eb74b8e0fa12524252508730aa4fdd4182ad51f406a600bbb41aed6d5a4a4c3e4196789
 EBUILD elektra-0.7.1-r3.ebuild 2449 SHA256 9479a2b3737c229ea1b771031ce17dcc437f20f95f0674cf7e8e5cd12d430e23 SHA512 bf93a343aebd440faab354164225f9a7cbcd5774a09d38dcf47784606491705b351c0c9cd900de2e426b99aea7c4501c15aae3be8ad551ae3b4d6425dce760fe WHIRLPOOL 63c15b66df81b9bfea905915dee1dc98427bb000a283b36d2a32a07a59881c18474d24c4019c498cf4a6c68329cf9354e6a3bffc7e21a48f797e8d3b8ddf8e95
 EBUILD elektra-0.8.3-r1.ebuild 2307 SHA256 1d7d8da839d72d418a64bf60e0e916fd7f45933ad06d05ff4a876aad34f15ad6 SHA512 da27d7c614af193219b733d2dfa1c7f69ef72a21363ca91142ef838e7ef6aee66400b56d51588058a3aef1fb6e5d7c021191e3ab64006f91db4f4c638a66fcdb WHIRLPOOL 70d63c34bd2a497b90b14bdac7e314613ed7c745310d0e8ef7411229233c8f4158de9345a219007cbbdaaed82818bcd588c0696f0ecec46e153cc28e48b3e9e2
-EBUILD elektra-0.8.3.ebuild 2252 SHA256 d4033d97715bc80b20effc7feae2eae562cb2caf98398261573101c2f1f35537 SHA512 efaa22f20fc2d6b4460e2cdb464d347f87fb7dde18844d84f2c541dae7097ecc41ca6a15c932cded32ca0321f367c84159792f630816fc91f598f9458183f2ff WHIRLPOOL b58770a16e37017594805e0fd2c0f1ae203eccb9200eb244376d4ffd7ab39e5ad054766f9ef4ee57b39bb3aec903ec7f8da0b4e24a40e9ff39a8b5a68dc5e1fd
-MISC ChangeLog 2735 SHA256 ca9a4db88596eceea8096f0c3c10d882c59b4796fe6fcbe90f89b01d19c0e20d SHA512 50553a072aa14aec3dd73687d953cff60d52d60afc928f21623e3268e3192a2e91868f7767c176a0755b9d091db5d007e981e345dcdbbbcf7e6e56733b6540b4 WHIRLPOOL d09f07ecdeb63449b84cba3904d2422de932d87f3e3e95930699bb326dc2c978c2bbde1c8cdf442abbfa243cba39e636a0e9266fcc02ae1bca198c8c8aa8ea8e
+MISC ChangeLog 2843 SHA256 1c81f527aa6521108fc9f7dedbcf5c73b90282f4751a0ae03f49baa2019c6517 SHA512 c54f60d099271c2db65bdee61d6bc890056c52a91e34b4e46a7c68a2a5b16efb29d08a2c35bb31bd8f9420b79e49219eb425b1713820b953b7a876195c0b85c1 WHIRLPOOL f9626169f71dba7f72cc7ffc73c8ca047db3315bf1bc5eb9d69c40b3e83f57be045857cc330abbc27a3bd54f27f944b0912409cfa559ff52f6bff8fbb721024d
 MISC metadata.xml 389 SHA256 734b96e3a1277ec120fa70a2476e91dd54ea5a6d661a6945665f9e74085d650d SHA512 cfdd3e6f1974390d1b6bea8c7acb682ea9659cd240e274d4a06423fa4dc98660d1d5cb0cbe4eb94178ea73af04c8c453a9d29ce350b7590225324ec7f4824d4a WHIRLPOOL 0365d182deaf06c7680788cbb9f15fef5afbb66d8a90a1bbe8bac62c046f44a5dea9e26594501a362fa3b2d36136000f8f47adb1df928951243c3b1932fd2ce4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFovjIACgkQknrdDGLu8JCsEwEAlaWMuapYGe3H+wrvBzms+APm
-dA0mqEzZGVDjkpKUJvoA+wXUqzAdsqzXtD8KC9r9NjmzjTQjMa8gA8SIG+qlKQSr
-=r32C
+iF4EAREIAAYFAlF1FeIACgkQknrdDGLu8JAL8wD/bzgdHl4o9W6sJTNkEhvMSvO3
+qZf3Mgm6bh95ARpuEYsA/3iqRPluFLHtdqm0nqrhArcwQcb5e57602gZkUvIq/wu
+=CJ1B
 -----END PGP SIGNATURE-----
diff --git a/app-admin/elektra/elektra-0.7.1-r2.ebuild b/app-admin/elektra/elektra-0.7.1-r2.ebuild
deleted file mode 100644
index f8e4141edc84..000000000000
--- a/app-admin/elektra/elektra-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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-r2.ebuild,v 1.4 2013/04/13 01:48:20 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
-
-	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_compile() {
-	dodir /usr/share/man/man3
-	emake
-}
-
-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/elektra-0.8.3.ebuild b/app-admin/elektra/elektra-0.8.3.ebuild
deleted file mode 100644
index 8cd0bbd584c5..000000000000
--- a/app-admin/elektra/elektra-0.8.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.8.3.ebuild,v 1.3 2013/04/13 01:48:20 xmw Exp $
-
-EAPI=4
-
-inherit cmake-utils 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}/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus doc examples iconv inifile simpleini static-libs syslog tcl test xml yajl"
-
-RDEPEND="dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	doc? ( app-doc/doxygen )
-	iconv? ( virtual/libiconv )
-	test? ( dev-libs/libxml2[static-libs] )
-	yajl? ( <dev-libs/yajl-2 )"
-
-src_configure() {
-	local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
-
-	#fix QA issues with upstream patches
-	epatch "${FILESDIR}/${P}-introduce-attributes.patch"
-	epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch"
-
-	#move doc files to correct location
-	sed -e "s/elektra-api/${PF}/" \
-		-i cmake/ElektraCache.cmake || die
-
-	use dbus    && my_plugins+=";dbus"
-	use doc     && my_plugins+=";doc"
-	use iconv   && my_plugins+=";iconv"
-	use inifile && my_plugins+=";simpleini"
-	use syslog  && my_plugins+=";syslog"
-	use tcl     && my_plugins+=";tcl"
-	use xml     && my_plugins+=";xmltool"
-	use yajl    && my_plugins+=";yajl"
-
-	local mycmakeargs=(
-		"-DPLUGINS=${my_plugins}"
-		"-DLATEX_COMPILER=OFF"
-		$(cmake-utils_use doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use examples BUILD_EXAMPLES)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTING)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	dodir /usr/share/man/man3
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc doc/{AUTHORS,CHANGES,NEWS,README,todo/TODO}
-
-	if use doc ; then
-		rm -rf "${D}/usr/share/doc/${PF}/man" || die
-		pushd ${CMAKE_BUILD_DIR}/doc/man/man3
-		local my_f
-		for my_f in *.3 ; do
-			newman ${my_f} ${PN}-${my_f}
-			elog "installed /usr/share/man/man3/${my_f} as ${PN}-${my_f}"
-		done
-		popd
-	fi
-}