gentoo resync : 01.12.2017

2 files changed, 1 insertions, 124 deletions

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index e0e0beb8532a..37a7a3c47da2 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,8 +1,6 @@
 AUX elektra-0.8.15-conditional-glob-tests.patch 415 BLAKE2B 5f0d1b8cbdd88e032bad09064a17caae9ade647f747718cd1ff936c95a107c9323ff66b9c24fd4edb42655c9a180d967d3a8e70ca8e3ea40e85f431877f5c7f3 SHA512 e57b317716979a5cb94e11094db8eeaac2941640262eec011329d1f6b1cda27c19999099e0b9a5bc9a7131de730a7065ac9256d965bf8d553afbadb94172a27c
 AUX elektra-0.8.15-gcc-5.4.0.patch 639 BLAKE2B 35664032dbbea5926c8886313d87893a00b46304d8b3d69f4d88fc503a3105b32e94696126a0786a761414debfad5bc6cf3fc8734331a8b8c00fc50a8cd25a3b SHA512 8b6eeec8f46fc92db86e19f1401a49fa129c5658a7c63e1307e990be69b873d2c1099fce0bca8224ea20ae4ff30b71c4dd6b69dc5bc9fd12ec45add6d2e76960
-DIST elektra-0.8.15.tar.gz 2338297 SHA256 6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d WHIRLPOOL c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e
-DIST elektra-0.8.16.tar.gz 2405443 SHA256 3cf0624eb027e533192ca9d612618df3d38ec3674c9cd20474f04ff269fad77e SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326 WHIRLPOOL 3230dbe2f613b5eee71c01ce7afeac3cca02ffbf45cba7a9300f8f3347d5d4c3baf0f8339ecaaaeb3ca747523229292738f1e94660187c1a9c23b4aaa02f0b6f
-EBUILD elektra-0.8.15.ebuild 3649 BLAKE2B ac9ea0c08dfaba04d47beda5177e82e98685b7c2c21f1f5a1b38e2d12b95a8852bd57fc6cb1551ff3d2f62493e8820868c32873b326f543ef9ea689111084bdd SHA512 417dbe1eb1e1fb76dd88a8e916974b58a60308ee39ce16077344e0da43dca9589c94bb3eb6ed53550fc07c00c9b304b926de42ea219128f95d469244b60332d9
+DIST elektra-0.8.16.tar.gz 2405443 BLAKE2B 221f254b240f4f38fb0975749003f8b4c9fbfbd28df2b42b99c8e1fa7795cb4a1565b77cc424b6180abd481326ccab4c8f554749150e36f0ab01146aa72575f8 SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326
 EBUILD elektra-0.8.16.ebuild 3622 BLAKE2B 2965fca55d877a08a22b1e9ddbbd766b28e23c8a7c44080f4230ddc5f9e68ee08dd82f16e125a94c710e9ba81bf634867a5e1daea9365b476dc734ff49787ad1 SHA512 f27a11d7298d202200356989cb22c8168ef54f67eee0a166e80453da6415392c290880f5001b159212c4d685ce9f59b3edcc095ef0fb265f0cd331276c9736bf
 EBUILD elektra-9999.ebuild 3578 BLAKE2B db029fccfa83081f3407592ac7396df52877835d6b42c746babca071ed9e5facc7fc878a2f6a14ff4ee92397d59c583f9abf4d1c47f8b9644b74be26dd13d63e SHA512 6cb27ec847a1f9047a8846fb769e8303f2f69ff283bfc2c80f489951a01423e940227d23962eb92d3275209c9a1a98ecb9141e7845e13e4b9c8b89d7e29d91f0
 MISC metadata.xml 604 BLAKE2B 21568cf18684b7339416099a2d406729e65519a4dbcc1ba72696c04328274246929d90bf8133d1e683d23c58c7fabf8ed03735dcfd9ef1478d91e5487db703a3 SHA512 5bc058ef5858f1a2916c9fffa87fbd11b4e7017498db402dd0e782d098ef7f71f098184d9aa936023cfde538ce4c2fe93402b2d5f7ba12c7ea52700d3301ffe3
diff --git a/app-admin/elektra/elektra-0.8.15.ebuild b/app-admin/elektra/elektra-0.8.15.ebuild
deleted file mode 100644
index 8319b317bc5e..000000000000
--- a/app-admin/elektra/elektra-0.8.15.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib eutils java-pkg-opt-2
-
-DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
-HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra"
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
-IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
-
-RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	augeas? ( app-admin/augeas )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.8.0 )
-	qt5? (
-		>=dev-qt/qtdeclarative-5.3:5
-		>=dev-qt/qtgui-5.3:5
-		>=dev-qt/qttest-5.3:5
-		>=dev-qt/qtwidgets-5.3:5
-	)
-	uname? ( sys-apps/coreutils )
-	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
-	yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7.0 )"
-
-DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
-# tries to write to user's home directory (and doesn't respect HOME)
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
-
-PATCHES=(
-	"${FILESDIR}/${P}"-conditional-glob-tests.patch
-	"${FILESDIR}/${P}"-gcc-5.4.0.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	einfo remove bundled libs
-	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
-	# https://code.google.com/p/inih/
-	rm -rf src/external || die
-
-	# move doc files to correct location
-	sed -e "s/elektra-api/${PF}/" \
-		-i cmake/ElektraCache.cmake || die
-
-	# avoid useless build time, nothing ends up installed
-	comment_add_subdirectory benchmarks
-	comment_add_subdirectory examples
-}
-
-multilib_src_configure() {
-	local my_plugins="ALL"
-
-	if multilib_is_native_abi ; then
-		use augeas || my_plugins+=";-augeas"
-		use java || my_plugins+=";-jni"
-	else
-		my_plugins+=";-augeas;-jni"
-	fi
-
-	use dbus      || my_plugins+=";-dbus"
-	use iconv     || my_plugins+=";-iconv"
-	use ini       || my_plugins+=";-ini"		# bundles inih
-	use simpleini || my_plugins+=";-simpleini"
-	use syslog    || my_plugins+=";-syslog"
-	use systemd   || my_plugins+=";-journald"
-	use tcl       || my_plugins+=";-tcl"
-	use uname     || my_plugins+=";-uname"
-	use xml       || my_plugins+=";-xmltool"
-	use yajl      || my_plugins+=";-yajl"
-
-	# Disabling for good (?):
-	# counter - Only useful for debugging the plugin framework
-	# doc - Explaining basic makeup of a function //bug #514402
-	# noresolver - Does not resolve, but can act as one
-	# template - Template for new plugin written in C
-	# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
-	my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
-
-	local my_tools
-
-	if multilib_is_native_abi ; then
-		my_tools="kdb"
-		use qt5 && my_tools+=";qt-gui"
-	fi
-
-	mycmakeargs=(
-		"-DBUILD_PDF=OFF"
-		"-DBUILD_SHARED=ON"
-		"-DPLUGINS=${my_plugins}"
-		"-DTOOLS=${my_tools}"
-		"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
-		-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
-		$(cmake-utils_use static-libs BUILD_STATIC)
-		$(cmake-utils_use test BUILD_TESTING)
-		$(cmake-utils_use test ENABLE_TESTING)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einfo remove test_data
-	rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
-	einfo remove tool_exec
-	rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
-}