gentoo resync : 24.12.2018

7 files changed, 117 insertions, 282 deletions

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index b71f58559d39..a5b5d14810fe 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,7 +1,3 @@
-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.16.tar.gz 2405443 BLAKE2B 221f254b240f4f38fb0975749003f8b4c9fbfbd28df2b42b99c8e1fa7795cb4a1565b77cc424b6180abd481326ccab4c8f554749150e36f0ab01146aa72575f8 SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326
 DIST elektra-0.8.20.tar.gz 4740032 BLAKE2B e76ad93eadbbec9bb273da4f7bab5622d47deebdab6736c430543159c0754f3b96696954891962b60716d5b969e64bf5ef6886a6239abee8b98888aae09fcdd9 SHA512 11cc88329f84ad4d6337132d76479d26f2d9c12f7a939558a79ea96540129096ea0a26ffda3705c01a2c7c749453588bb1654a4c07cca3374e4076ce768c5848
-EBUILD elektra-0.8.16.ebuild 3622 BLAKE2B 2965fca55d877a08a22b1e9ddbbd766b28e23c8a7c44080f4230ddc5f9e68ee08dd82f16e125a94c710e9ba81bf634867a5e1daea9365b476dc734ff49787ad1 SHA512 f27a11d7298d202200356989cb22c8168ef54f67eee0a166e80453da6415392c290880f5001b159212c4d685ce9f59b3edcc095ef0fb265f0cd331276c9736bf
-EBUILD elektra-0.8.20.ebuild 3484 BLAKE2B dc46c7ae8750b51d5723dd6532291cb9cf8e35bdb2febc6370b87c96a1bcbadfcbeccd11e60629a472a643155fa37f09b21a92892ad94342d92a84b5165643a9 SHA512 eb3bb23a08f2cfa6b7cf3072df6384a2b6551c663651a5a9ba84414c7d8c09deff271f3ac7420cebc9882f2a151b997abdc05c1814cc8881f8754db6cdb7743b
-MISC metadata.xml 604 BLAKE2B 21568cf18684b7339416099a2d406729e65519a4dbcc1ba72696c04328274246929d90bf8133d1e683d23c58c7fabf8ed03735dcfd9ef1478d91e5487db703a3 SHA512 5bc058ef5858f1a2916c9fffa87fbd11b4e7017498db402dd0e782d098ef7f71f098184d9aa936023cfde538ce4c2fe93402b2d5f7ba12c7ea52700d3301ffe3
+EBUILD elektra-0.8.20-r1.ebuild 3575 BLAKE2B e5bb278044733e4106cbf98ac2e41fd2a545461e7c2431a0fcbaff85c5be84cfcc1d115b2c7bc849612b92bcaab4197b2e1b1974fa9aee99bcd0088bd72d941a SHA512 2e0bace57e18ac5f027e82f468613120d182f075fb73e0a1231e9bde7ea90ab1165594e76d7c5183205b0aa9fa849fcc828de8c632e6abd29bdcbc4ebb00c4de
+MISC metadata.xml 528 BLAKE2B 157f4ace6565691b24887dd8df8500edfa4e52be29674a7e64b0a1cd68d3cb6d2a064f92c6684afc65500d8c9c42dab4228f1c9fcb4389f2e13917e407a3fb9a SHA512 38f65b68fb892f63f998267c293385fa0e66f79cfeeb9186ed6ce49b131e17344260df575821669df0b893b6f7d4fde7dac24e3d62cf7b387ef0a806a8a005ce
diff --git a/app-admin/elektra/elektra-0.8.16.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild
deleted file mode 100644
index a87cd518643c..000000000000
--- a/app-admin/elektra/elektra-0.8.16.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-		dev-qt/qtgui:5
-		dev-qt/qttest:5
-		dev-qt/qtwidgets: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}/${PN}"-0.8.15-conditional-glob-tests.patch
-	"${FILESDIR}/${PN}"-0.8.15-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
-	cmake_comment_add_subdirectory benchmarks
-	cmake_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
-
-	local mycmakeargs=(
-		-DBUILD_PDF=OFF
-		-DBUILD_SHARED=ON
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-		-DENABLE_TESTING=$(usex test)
-		-DPLUGINS=${my_plugins}
-		-DTOOLS=${my_tools}
-		-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
-		-DTARGET_CMAKE_FOLDER=share/cmake/Modules
-	)
-
-	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"
-}
diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild b/app-admin/elektra/elektra-0.8.20-r1.ebuild
new file mode 100644
index 000000000000..ccb2065bb7c2
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
+HOMEPAGE="https://www.libelektra.org"
+SRC_URI="https://www.libelektra.org/ftp/elektra/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+PLUGIN_IUSE="augeas iconv ini simpleini syslog systemd tcl +uname xml yajl";
+IUSE="dbus doc static-libs test ${PLUGIN_IUSE}"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	>=dev-libs/libxml2-2.9.1-r4
+	augeas? ( app-admin/augeas )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	iconv? ( >=virtual/libiconv-0-r1 )
+	systemd? ( sys-apps/systemd )
+	uname? ( sys-apps/coreutils )
+	yajl? ( >=dev-libs/yajl-1.0.11-r1 )
+"
+# 	qt5? (
+# 		app-text/discount
+# 		dev-qt/qtdeclarative:5
+# 		dev-qt/qtgui:5
+# 		dev-qt/qttest:5
+# 		dev-qt/qtwidgets:5
+# 	)
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+DOCS=( README.md doc/AUTHORS doc/CODING.md doc/todo/TODO )
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+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
+	sed -e "/^install.*LICENSE/s/^/#DONT /" -i CMakeLists.txt || die
+
+	# avoid useless build time, nothing ends up installed
+	cmake_comment_add_subdirectory benchmarks
+	cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+	# default storage and resolver requirements
+	local my_plugins="NONE;dump;resolver;resolver_fm_hpu_b;sync;"
+	# defaults chosen by availability in 0.8.16
+	my_plugins+="ccode;conditionals;constants;enum;error;filecheck;fstab;glob;"
+	my_plugins+="hexcode;hidden;hosts;iterate;keytometa;line;lineendings;list;"
+	my_plugins+="logchange;mathcheck;network;ni;null;path;profile;regexstore;"
+	my_plugins+="rename;semlock;shell;spec;struct;timeofday;tracer;type;validation;"
+
+	use augeas    && my_plugins+="augeas;"
+	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="kdb"
+# 	use qt5 && my_tools+=";qt-gui"
+
+	local mycmakeargs=(
+		-DBUILD_PDF=OFF
+		-DBUILD_SHARED=ON
+		-DBUILD_STATIC=$(usex static-libs)
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_TESTING=$(usex test)
+		-DPLUGINS=${my_plugins}
+		-DTOOLS=${my_tools}
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DTARGET_CMAKE_FOLDER=share/cmake/Modules
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	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"
+}
diff --git a/app-admin/elektra/elektra-0.8.20.ebuild b/app-admin/elektra/elektra-0.8.20.ebuild
deleted file mode 100644
index 43f955bb844b..000000000000
--- a/app-admin/elektra/elektra-0.8.20.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eutils java-pkg-opt-2
-
-DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
-HOMEPAGE="https://www.libelektra.org"
-SRC_URI="https://www.libelektra.org/ftp/elektra/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
-		dev-qt/qtgui:5
-		dev-qt/qttest:5
-		dev-qt/qtwidgets: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/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 )
-
-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
-	cmake_comment_add_subdirectory benchmarks
-	cmake_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
-
-	local mycmakeargs=(
-		-DBUILD_PDF=OFF
-		-DBUILD_SHARED=ON
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-		-DENABLE_TESTING=$(usex test)
-		-DPLUGINS=${my_plugins}
-		-DTOOLS=${my_tools}
-		-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
-		-DTARGET_CMAKE_FOLDER=share/cmake/Modules
-	)
-
-	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"
-}
diff --git a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
deleted file mode 100644
index 413515e05605..000000000000
--- a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
-+++ elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
-@@ -4,6 +4,7 @@
- add_cppheaders (HDR_FILES)
- add_toolheaders (HDR_FILES)
- 
-+if (ENABLE_TESTING)
- include (LibAddTest)
- 
- file (GLOB TESTS testtool_*.cpp)
-@@ -11,3 +12,4 @@
- 	get_filename_component (name ${file} NAME_WE)
- 	add_gtest (${name} LINK_TOOLS)
- endforeach (file ${TESTS})
-+endif (ENABLE_TESTING)
diff --git a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
deleted file mode 100644
index 9bab2a61c9f5..000000000000
--- a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 05c925972224afd3fa28f34b9a762364a38f6850
-Author: Markus Raab <elektra@markus-raab.org>
-Date:   Tue May 3 14:25:54 2016 +0200
-
-    add vector kdbtimer
-    
-    fix http://build.libelektra.org:8080/job/elektra-gcc-configure-debian/lastFailedBuild/console
-
-diff --git a/src/bindings/cpp/include/kdbtimer.hpp b/src/bindings/cpp/include/kdbtimer.hpp
-index ae4c242..b7f731e 100644
---- a/src/bindings/cpp/include/kdbtimer.hpp
-+++ b/src/bindings/cpp/include/kdbtimer.hpp
-@@ -13,6 +13,7 @@
- #include <sstream>
- #include <string>
- #include <sys/time.h>
-+#include <vector>
- 
- #ifdef __GNUC__
- #define TIMER_NOINLINE __attribute__ ((noinline))
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index 0cc6943fa1fb..6f5f3e3ebc04 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
 		<flag name="ini">Enable new, advanced ini support</flag>