[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/, media-libs/oyranos/files/, profiles/, ...

2021-05-15 Thread Andreas Sturmlechner 
commit: ddfc9955724025a1544e942bc146d70c7a0c971d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 15 20:45:01 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 15 21:49:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfc9955

profiles: Cleanup last-rited packages

kde-misc/kolor-manager
app-admin/elektra
media-gfx/icc-examin
media-gfx/synnefo
media-libs/libXcm
media-libs/openicc
media-libs/oyranos

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/Manifest |   1 -
 app-admin/elektra/elektra-0.8.20-r1.ebuild | 114 ---
 app-admin/elektra/metadata.xml |  12 --
 kde-misc/kolor-manager/Manifest|   1 -
 .../files/kolor-manager-1.1.0-deps.patch   |  32 ---
 kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild  |  30 ---
 kde-misc/kolor-manager/metadata.xml|   8 -
 media-gfx/icc-examin/Manifest  |   1 -
 .../icc-examin/files/icc-examin-0.56-fltk.patch|  27 ---
 .../icc-examin/icc-examin-0.56_p20171007.ebuild|  53 -
 media-gfx/icc-examin/icc-examin-.ebuild|  52 -
 media-gfx/icc-examin/metadata.xml  |   9 -
 media-gfx/synnefo/Manifest |   1 -
 media-gfx/synnefo/files/synnefo-1.1.0-cxx11.patch  |  99 -
 media-gfx/synnefo/metadata.xml |  11 -
 media-gfx/synnefo/synnefo-1.1.0.ebuild |  35 
 media-libs/libXcm/Manifest |   1 -
 media-libs/libXcm/libXcm-0.5.4.ebuild  |  49 -
 media-libs/libXcm/libXcm-.ebuild   |  48 -
 media-libs/libXcm/metadata.xml |   9 -
 media-libs/openicc/Manifest|   1 -
 .../openicc/files/openicc-0.1.0-buildsystem.patch  | 228 -
 media-libs/openicc/metadata.xml|  11 -
 media-libs/openicc/openicc-0.1.0.ebuild|  48 -
 media-libs/oyranos/Manifest|   2 -
 .../oyranos/files/oyranos-0.9.6-mesa-18.3.1.patch  |  24 ---
 .../oyranos/files/oyranos-0.9.6-underlinking.patch |  16 --
 media-libs/oyranos/metadata.xml|   8 -
 media-libs/oyranos/oyranos-0.9.6-r1.ebuild | 101 -
 media-libs/oyranos/oyranos-.ebuild | 102 -
 profiles/package.mask  |  16 --
 31 files changed, 1150 deletions(-)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
deleted file mode 100644
index 98112946bd8..000
--- a/app-admin/elektra/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST elektra-0.8.20.tar.gz 4740032 BLAKE2B 
e76ad93eadbbec9bb273da4f7bab5622d47deebdab6736c430543159c0754f3b96696954891962b60716d5b969e64bf5ef6886a6239abee8b9aae09fcdd9
 SHA512 
11cc88329f84ad4d6337132d76479d26f2d9c12f7a939558a79ea96540129096ea0a26ffda3705c01a2c7c749453588bb1654a4c07cca3374e4076ce768c5848

diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild 
b/app-admin/elektra/elektra-0.8.20-r1.ebuild
deleted file mode 100644
index ccb2065bb7c..000
--- a/app-admin/elektra/elektra-0.8.20-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/files/, app-admin/elektra/

2018-11-29 Thread Andreas Sturmlechner 
commit: a4e6c38c21bc3aa5530167ac9b9f9d1e0fe27809
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 29 09:06:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 29 09:06:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e6c38c

app-admin/elektra: Drop 0.8.16-r1

It wasn't stable anyway.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/Manifest |   1 -
 app-admin/elektra/elektra-0.8.16.ebuild| 121 -
 .../elektra-0.8.15-conditional-glob-tests.patch|  15 ---
 .../elektra/files/elektra-0.8.15-gcc-5.4.0.patch   |  20 
 4 files changed, 157 deletions(-)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 33752845bd6..98112946bd8 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,2 +1 @@
-DIST elektra-0.8.16.tar.gz 2405443 BLAKE2B 
221f254b240f4f38fb0975749003f8b4c9fbfbd28df2b42b99c8e1fa7795cb4a1565b77cc424b6180abd481326ccab4c8f554749150e36f0ab01146aa72575f8
 SHA512 
b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326
 DIST elektra-0.8.20.tar.gz 4740032 BLAKE2B 
e76ad93eadbbec9bb273da4f7bab5622d47deebdab6736c430543159c0754f3b96696954891962b60716d5b969e64bf5ef6886a6239abee8b9aae09fcdd9
 SHA512 
11cc88329f84ad4d6337132d76479d26f2d9c12f7a939558a79ea96540129096ea0a26ffda3705c01a2c7c749453588bb1654a4c07cca3374e4076ce768c5848

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 a87cd518643..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2018-11-25 Thread Andreas Sturmlechner 
commit: 8deb944293a6dc8967e30dccc258656e28800081
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 25 23:14:21 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 25 23:40:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8deb9442

app-admin/elektra: Disable broken USE qt5

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/elektra-0.8.20-r1.ebuild | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild 
b/app-admin/elektra/elektra-0.8.20-r1.ebuild
index 5c678f17bb9..ccb2065bb7c 100644
--- a/app-admin/elektra/elektra-0.8.20-r1.ebuild
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 PLUGIN_IUSE="augeas iconv ini simpleini syslog systemd tcl +uname xml yajl";
-IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
+IUSE="dbus doc static-libs test ${PLUGIN_IUSE}"
 
 RDEPEND="
dev-libs/libltdl:0
@@ -21,16 +21,17 @@ RDEPEND="
augeas? ( app-admin/augeas )
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
iconv? ( >=virtual/libiconv-0-r1 )
-   qt5? (
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qttest:5
-   dev-qt/qtwidgets:5
-   )
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 )
@@ -87,7 +88,7 @@ src_configure() {
# my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
 
local my_tools="kdb"
-   use qt5 && my_tools+=";qt-gui"
+#  use qt5 && my_tools+=";qt-gui"
 
local mycmakeargs=(
-DBUILD_PDF=OFF

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2018-11-25 Thread Andreas Sturmlechner 
commit: cb4224bbbeb0a2bc7222b70775f953db4a61efe6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 25 21:08:55 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 25 23:40:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4224bb

app-admin/elektra: Invert plugins logic to avoid unhandled deps

Restrict plugins to 0.8.16 choice.
Quick fix for unhandled dependencies in botched 0.8.20 ebuild.

Bug: https://bugs.gentoo.org/648424
Bug: https://bugs.gentoo.org/639014
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/elektra-0.8.20-r1.ebuild | 36 +-
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild 
b/app-admin/elektra/elektra-0.8.20-r1.ebuild
index c5a8299dc90..8dfa50c25aa 100644
--- a/app-admin/elektra/elektra-0.8.20-r1.ebuild
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -58,20 +58,26 @@ src_prepare() {
 }
 
 src_configure() {
-   local my_plugins="ALL"
-
-   use augeas|| my_plugins+=";-augeas"
-   use dbus  || my_plugins+=";-dbus"
-   use iconv || my_plugins+=";-iconv"
-   use ini   || my_plugins+=";-ini"# bundles inih
-   use java  || my_plugins+=";-jni"
-   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"
+   # 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 java  && my_plugins+="jni;"
+   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
@@ -79,7 +85,7 @@ src_configure() {
# 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"
+   # my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
 
local my_tools="kdb"
use qt5 && my_tools+=";qt-gui"

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2018-11-25 Thread Andreas Sturmlechner 
commit: 85708e66952492af605ecf516d877025ada33dfe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 25 20:50:56 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 25 23:40:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85708e66

app-admin/elektra: Drop cmake-multilib

Nothing ever asked for that.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/elektra-0.8.20-r1.ebuild | 108 +
 1 file changed, 108 insertions(+)

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 000..fbe49fa0866
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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
+   >=dev-libs/libxml2-2.9.1-r4
+   augeas? ( app-admin/augeas )
+   dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+   iconv? ( >=virtual/libiconv-0-r1 )
+   java? ( >=virtual/jdk-1.8.0 )
+   qt5? (
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qttest:5
+   dev-qt/qtwidgets:5
+   )
+   systemd? ( sys-apps/systemd )
+   uname? ( sys-apps/coreutils )
+   yajl? ( >=dev-libs/yajl-1.0.11-r1 )
+"
+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
+
+   # avoid useless build time, nothing ends up installed
+   cmake_comment_add_subdirectory benchmarks
+   cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+   local my_plugins="ALL"
+
+   use augeas|| my_plugins+=";-augeas"
+   use dbus  || my_plugins+=";-dbus"
+   use iconv || my_plugins+=";-iconv"
+   use ini   || my_plugins+=";-ini"# bundles inih
+   use java  || my_plugins+=";-jni"
+   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"
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2018-11-25 Thread Andreas Sturmlechner 
commit: f811c8ed8f8bd92fe75dea183c4dd67d3fa32c72
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 25 21:29:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 25 23:40:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f811c8ed

app-admin/elektra: Drop USE java

Unless requested in the future.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/elektra-0.8.20-r1.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild 
b/app-admin/elektra/elektra-0.8.20-r1.ebuild
index 8dfa50c25aa..7cfdcc132f7 100644
--- a/app-admin/elektra/elektra-0.8.20-r1.ebuild
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils eutils java-pkg-opt-2
+inherit cmake-utils
 
 DESCRIPTION="Framework to store config parameters in hierarchical key-value 
pairs"
 HOMEPAGE="https://www.libelektra.org;
@@ -12,7 +12,7 @@ 
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";
+PLUGIN_IUSE="augeas iconv ini simpleini syslog systemd tcl +uname xml yajl";
 IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
 
 RDEPEND="
@@ -21,7 +21,6 @@ RDEPEND="
augeas? ( app-admin/augeas )
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
iconv? ( >=virtual/libiconv-0-r1 )
-   java? ( >=virtual/jdk-1.8:* )
qt5? (
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
@@ -70,7 +69,6 @@ src_configure() {
use dbus  && my_plugins+="dbus;"
use iconv && my_plugins+="iconv;"
use ini   && my_plugins+="ini;" # bundles inih
-   use java  && my_plugins+="jni;"
use simpleini && my_plugins+="simpleini;"
use syslog&& my_plugins+="syslog;"
use systemd   && my_plugins+="journald;"

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2018-11-25 Thread Andreas Sturmlechner 
commit: 8d805c8a7984f11c3345c75ca461e73880627877
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 25 20:56:35 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 25 23:40:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d805c8a

app-admin/elektra: Silence repoman

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/elektra-0.8.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild 
b/app-admin/elektra/elektra-0.8.20-r1.ebuild
index fbe49fa0866..c5a8299dc90 100644
--- a/app-admin/elektra/elektra-0.8.20-r1.ebuild
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
augeas? ( app-admin/augeas )
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
iconv? ( >=virtual/libiconv-0-r1 )
-   java? ( >=virtual/jdk-1.8.0 )
+   java? ( >=virtual/jdk-1.8:* )
qt5? (
dev-qt/qtdeclarative:5
dev-qt/qtgui:5

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2018-11-25 Thread Andreas Sturmlechner 
commit: abf5223ed247ff23270b53bc3edd04710ab84694
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 25 22:11:12 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 25 23:40:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf5223e

app-admin/elektra: Drop 0.8.20 (r0)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/elektra-0.8.20.ebuild | 116 
 1 file changed, 116 deletions(-)

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 43f955bb844..000
--- 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"
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2018-11-25 Thread Andreas Sturmlechner 
commit: 1f06ea489ad9b80ace2c243453deea2c9cfb4814
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 25 21:40:40 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 25 23:40:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f06ea48

app-admin/elektra: Don't install LICENSE.md

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-admin/elektra/elektra-0.8.20-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild 
b/app-admin/elektra/elektra-0.8.20-r1.ebuild
index 7cfdcc132f7..5c678f17bb9 100644
--- a/app-admin/elektra/elektra-0.8.20-r1.ebuild
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -50,6 +50,7 @@ src_prepare() {
 
# 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

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2017-12-08 Thread Michael Weber 
commit: a6a8f084a593c4a5650115decb74a0720c8ebc1e
Author: Michael Weber  gentoo  org>
AuthorDate: Sat Dec  9 00:18:46 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat Dec  9 00:18:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a8f084

app-admin/elektra: Remove live ebuild.

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-admin/elektra/elektra-.ebuild | 118 --
 1 file changed, 118 deletions(-)

diff --git a/app-admin/elektra/elektra-.ebuild 
b/app-admin/elektra/elektra-.ebuild
deleted file mode 100644
index 79ef408969f..000
--- a/app-admin/elektra/elektra-.ebuild
+++ /dev/null
@@ -1,118 +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 git-r3
-
-DESCRIPTION="Framework to store config parameters in hierarchical key-value 
pairs"
-HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra;
-EGIT_REPO_URI="https://github.com/ElektraInitiative/libelektra.git;
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS=""
-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 )
-
-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"
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2017-12-08 Thread Michael Weber 
commit: 76304796933053e87317764fcf08c84652d3cc4e
Author: Michael Weber  gentoo  org>
AuthorDate: Sat Dec  9 00:17:53 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sat Dec  9 00:18:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76304796

app-admin/elektra: Version bump (thanks Nils, bug 639014).

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-admin/elektra/Manifest  |   1 +
 app-admin/elektra/elektra-0.8.20.ebuild | 116 
 2 files changed, 117 insertions(+)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 1d0b438526b..33752845bd6 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1 +1,2 @@
 DIST elektra-0.8.16.tar.gz 2405443 BLAKE2B 
221f254b240f4f38fb0975749003f8b4c9fbfbd28df2b42b99c8e1fa7795cb4a1565b77cc424b6180abd481326ccab4c8f554749150e36f0ab01146aa72575f8
 SHA512 
b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326
+DIST elektra-0.8.20.tar.gz 4740032 BLAKE2B 
e76ad93eadbbec9bb273da4f7bab5622d47deebdab6736c430543159c0754f3b96696954891962b60716d5b969e64bf5ef6886a6239abee8b9aae09fcdd9
 SHA512 
11cc88329f84ad4d6337132d76479d26f2d9c12f7a939558a79ea96540129096ea0a26ffda3705c01a2c7c749453588bb1654a4c07cca3374e4076ce768c5848

diff --git a/app-admin/elektra/elektra-0.8.20.ebuild 
b/app-admin/elektra/elektra-0.8.20.ebuild
new file mode 100644
index 000..43f955bb844
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.20.ebuild
@@ -0,0 +1,116 @@
+# 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"
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2017-11-27 Thread Andreas Sturmlechner 
commit: cc7bc734a14602f03718088bd334adb0932f4c9b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 27 23:56:58 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 27 23:57:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7bc734

app-admin/elektra: Drop old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-admin/elektra/Manifest  |   3 +-
 app-admin/elektra/elektra-0.8.15.ebuild | 121 
 2 files changed, 1 insertion(+), 123 deletions(-)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index e9f5198c255..1d0b438526b 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,2 +1 @@
-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
+DIST elektra-0.8.16.tar.gz 2405443 BLAKE2B 
221f254b240f4f38fb0975749003f8b4c9fbfbd28df2b42b99c8e1fa7795cb4a1565b77cc424b6180abd481326ccab4c8f554749150e36f0ab01146aa72575f8
 SHA512 
b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326

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 8319b317bc5..000
--- 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"
-

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2017-07-30 Thread Michał Górny 
commit: fe534992179254fffc03cbc7586fdc643c61cac5
Author: David Hicks  hicks  id  au>
AuthorDate: Fri Jul 28 23:25:26 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Jul 30 08:35:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe534992

app-admin/elektra: use HTTPS for GitHub

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-admin/elektra/elektra-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/elektra/elektra-.ebuild 
b/app-admin/elektra/elektra-.ebuild
index 25d2c118ce6..79ef408969f 100644
--- a/app-admin/elektra/elektra-.ebuild
+++ b/app-admin/elektra/elektra-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit cmake-multilib eutils java-pkg-opt-2 git-r3
 
 DESCRIPTION="Framework to store config parameters in hierarchical key-value 
pairs"
 HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra;
-EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"
+EGIT_REPO_URI="https://github.com/ElektraInitiative/libelektra.git;
 
 LICENSE="BSD"
 SLOT="0/${PV}"

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/files/, app-admin/elektra/

2016-12-09 Thread Lars Wendler 
commit: a1859f2e1780848cd96a8b1a8229244e7e7511e8
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec  9 14:36:50 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec  9 14:39:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1859f2e

app-admin/elektra: Removed old.

Package-Manager: portage-2.3.3

 app-admin/elektra/Manifest |   2 -
 app-admin/elektra/elektra-0.7.1-r5.ebuild  |  81 --
 app-admin/elektra/elektra-0.8.12.ebuild| 120 
 .../files/elektra-0.7.1-automake-1.12.patch|  24 
 app-admin/elektra/files/elektra-0.7.1-ltdl.patch   |  21 
 .../files/elektra-0.7.1-remove-ddefault-link.patch |  16 ---
 app-admin/elektra/files/elektra-0.7.1-test.patch   | 123 -
 .../elektra-0.8.11-conditional-glob-tests.patch|  22 
 app-admin/elektra/metadata.xml |   1 -
 9 files changed, 410 deletions(-)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 02d6e91..e9f5198 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,4 +1,2 @@
-DIST elektra-0.7.1.tar.gz 1347524 SHA256 
ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 
25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684
 WHIRLPOOL 
e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
-DIST elektra-0.8.12.tar.gz 2102450 SHA256 
562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 
be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea
 WHIRLPOOL 
6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
 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

diff --git a/app-admin/elektra/elektra-0.7.1-r5.ebuild 
b/app-admin/elektra/elektra-0.7.1-r5.ebuild
deleted file mode 100644
index 1de051d..
--- a/app-admin/elektra/elektra-0.7.1-r5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools autotools-multilib eutils multilib
-
-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}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gcov iconv static-libs test"
-
-RDEPEND="dev-libs/libxml2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-   sys-devel/libtool[${MULTILIB_USEDEP}]
-   iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )"
-
-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 \
-   "${FILESDIR}"/${P}-remove-ddefault-link.patch
-
-   touch config.rpath
-   eautoreconf
-}
-
-src_configure() {
-   # berkeleydb, daemon, fstab, gconf, python do not work
-   # avoid collision with kerberos (bug 403025, 447246)
-   local myeconfargs=(
-   --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}a
-   --includedir=/usr/include/${PN}
-   )
-   autotools-multilib_src_configure
-   dodir /usr/share/man/man3
-}
-
-src_compile() {
-   autotools-multilib_src_compile LIBLTDL=-lltdl
-}
-
-src_install() {
-   autotools-multilib_src_install
-
-   #avoid collision with

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/, app-admin/elektra/files/

2016-11-06 Thread David Seifert 
commit: f0f47a3da9401b69bb7d812bf9e5439a0c40cb49
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Nov  6 10:26:27 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov  6 10:29:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f47a3d

app-admin/elektra: Fix build w/ GCC 5.4.0

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1656

Signed-off-by: David Seifert  gentoo.org>

 app-admin/elektra/elektra-0.8.15.ebuild  | 14 --
 .../elektra/files/elektra-0.8.15-gcc-5.4.0.patch | 20 
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app-admin/elektra/elektra-0.8.15.ebuild 
b/app-admin/elektra/elektra-0.8.15.ebuild
index ea2c898..bdcbd7f 100644
--- a/app-admin/elektra/elektra-0.8.15.ebuild
+++ b/app-admin/elektra/elektra-0.8.15.ebuild
@@ -41,7 +41,10 @@ RESTRICT="test"
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
 
-PATCHES=( "${FILESDIR}/${P}"-conditional-glob-tests.patch )
+PATCHES=(
+   "${FILESDIR}/${P}"-conditional-glob-tests.patch
+   "${FILESDIR}/${P}"-gcc-5.4.0.patch
+)
 
 src_prepare() {
cmake-utils_src_prepare
@@ -97,13 +100,12 @@ multilib_src_configure() {
fi
 
mycmakeargs=(
+   "-DBUILD_PDF=OFF"
"-DBUILD_SHARED=ON"
"-DPLUGINS=${my_plugins}"
"-DTOOLS=${my_tools}"
-   "-DLATEX_COMPILER=OFF"
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
-   $(multilib_is_native_abi && cmake-utils_use doc 
BUILD_DOCUMENTATION \
-   || echo -DBUILD_DOCUMENTATION=OFF)
+   -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)
@@ -114,7 +116,7 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
einfo remove test_data
-   rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data"
+   rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
einfo remove tool_exec
-   rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to 
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-gcc-5.4.0.patch 
b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
new file mode 100644
index ..9bab2a6
--- /dev/null
+++ b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
@@ -0,0 +1,20 @@
+commit 05c925972224afd3fa28f34b9a762364a38f6850
+Author: Markus Raab 
+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 
+ #include 
+ #include 
++#include 
+ 
+ #ifdef __GNUC__
+ #define TIMER_NOINLINE __attribute__ ((noinline))

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2016-11-06 Thread David Seifert 
commit: b9c488b57bb2c47ea6cdb4352c8f7910d419a30a
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Nov  6 10:26:27 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov  6 10:29:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c488b5

app-admin/elektra: Version bump to 0.8.16, EAPI 6

Indent metadata.xml, sort use desc

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1656

Signed-off-by: David Seifert  gentoo.org>

 app-admin/elektra/Manifest |  1 +
 .../{elektra-.ebuild => elektra-0.8.16.ebuild} | 50 +++---
 app-admin/elektra/elektra-.ebuild  | 39 -
 app-admin/elektra/metadata.xml | 24 +--
 4 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 99ae60f..02d6e91 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,3 +1,4 @@
 DIST elektra-0.7.1.tar.gz 1347524 SHA256 
ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 
25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684
 WHIRLPOOL 
e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
 DIST elektra-0.8.12.tar.gz 2102450 SHA256 
562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 
be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea
 WHIRLPOOL 
6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
 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

diff --git a/app-admin/elektra/elektra-.ebuild 
b/app-admin/elektra/elektra-0.8.16.ebuild
similarity index 74%
copy from app-admin/elektra/elektra-.ebuild
copy to app-admin/elektra/elektra-0.8.16.ebuild
index d19d1c4..2a67535 100644
--- a/app-admin/elektra/elektra-.ebuild
+++ b/app-admin/elektra/elektra-0.8.16.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit cmake-multilib eutils java-pkg-opt-2 git-r3
+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;
-EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"
+SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS=""
+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}"
 
@@ -23,10 +23,10 @@ RDEPEND="dev-libs/libltdl:0[${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
+   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}] )
@@ -41,7 +41,10 @@ RESTRICT="test"
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
 
-PATCHES=( "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch )
+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
@@ -56,8 +59,8 @@ src_prepare() {
-i cmake/ElektraCache.cmake || die
 
# avoid useless build time, nothing ends up installed
-   comment_add_subdirectory benchmarks
-   comment_add_subdirectory examples
+   cmake_comment_add_subdirectory benchmarks
+   cmake_comment_add_subdirectory examples
 }
 
 multilib_src_configure() {
@@ -96,17 +99,16 @@ multilib_src_configure() {
use qt5 &&

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/, app-admin/elektra/files/

2016-03-01 Thread Michael Weber 
commit: 0cc2490adecc540fd1c69ae6f9205ec550efdd9e
Author: Michael Weber  gentoo  org>
AuthorDate: Tue Mar  1 15:33:42 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue Mar  1 15:51:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc2490a

app-admin/elektra: Drop old.

Package-Manager: portage-2.2.27

 app-admin/elektra/Manifest |  3 -
 app-admin/elektra/elektra-0.8.3-r3.ebuild  | 92 --
 app-admin/elektra/elektra-0.8.6.ebuild | 69 
 app-admin/elektra/elektra-0.8.7.ebuild | 86 
 .../elektra-0.8.3-fix-yajl-if-user-config.patch| 31 
 .../files/elektra-0.8.3-introduce-attributes.patch | 27 ---
 .../elektra-0.8.7-conditional-glob-tests.patch | 21 -
 7 files changed, 329 deletions(-)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index d7821bf..99ae60f 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,6 +1,3 @@
 DIST elektra-0.7.1.tar.gz 1347524 SHA256 
ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 
25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684
 WHIRLPOOL 
e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
 DIST elektra-0.8.12.tar.gz 2102450 SHA256 
562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 
be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea
 WHIRLPOOL 
6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
 DIST elektra-0.8.15.tar.gz 2338297 SHA256 
6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 
86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d
 WHIRLPOOL 
c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e
-DIST elektra-0.8.3.tar.gz 1092409 SHA256 
48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 
e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886
 WHIRLPOOL 
64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9
-DIST elektra-0.8.6.tar.gz 1188337 SHA256 
e815cf69b070c339784472841aa0ee0b169fab7c78f41cbbd7044f53fa9ed216 SHA512 
4df585e07ab461b924a506a8c58bcfbe55e6c1df72710bfdc13760559054ffef6b92f8da94c08f2d8f6a7a7692983d0e92d4ffa98506fcbfc166a71bf989e488
 WHIRLPOOL 
b0dfa2841dcef35e03dfa04e5613576d5d8d74586e959c538399adbebf2d4d4842b15e912845c07f5c309614e33217b112124ec0971accf9fa4e521e1283732a
-DIST elektra-0.8.7.tar.gz 1566800 SHA256 
698ebd41d540eb0c6427c17c13a6a0f03eef94655fbd40655c9b42d612ea1c9b SHA512 
37b34abeb392e170f89a97f825153f925d7b11ea980832cb8f1bf8dbd8b098f8bd553b3998728ef84ce4f4c53ea1f420824984fe670f6752c1b50e98821eb07e
 WHIRLPOOL 
7f3f290f9064488fd1c9927a76d3f9e235e144b1ebe91a02b392ee468b2bcc4881906a71b88822a75ac1506200c3c8d5857c31f35bdc8f9832eae67c2647a768

diff --git a/app-admin/elektra/elektra-0.8.3-r3.ebuild 
b/app-admin/elektra/elektra-0.8.3-r3.ebuild
deleted file mode 100644
index 9d53dc6..000
--- a/app-admin/elektra/elektra-0.8.3-r3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib 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-2.9.1-r4[${MULTILIB_USEDEP}]
-   dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-   iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-   yajl? (
-   =dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}]
-   )"
-DEPEND="${RDEPEND}
-   sys-devel/libtool
-   doc? ( app-doc/doxygen )"
-
-# tries to write to user's home directory (and doesn't respect HOME)
-RESTRICT="test"
-
-src_prepare() {
-   #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
-
-   cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-   local

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/, app-admin/elektra/files/

2016-03-01 Thread Michael Weber 
commit: c958a565bc94069f30ac4654ed66ee2782ee6558
Author: Michael Weber  gentoo  org>
AuthorDate: Tue Mar  1 15:30:23 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue Mar  1 15:50:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c958a565

app-admin/elektra: Version bump.

Package-Manager: portage-2.2.27

 app-admin/elektra/Manifest |   1 +
 app-admin/elektra/elektra-0.8.15.ebuild| 120 +
 .../elektra-0.8.15-conditional-glob-tests.patch|  15 +++
 3 files changed, 136 insertions(+)

diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index 9e6e2a0..d7821bf 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,5 +1,6 @@
 DIST elektra-0.7.1.tar.gz 1347524 SHA256 
ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 
25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684
 WHIRLPOOL 
e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
 DIST elektra-0.8.12.tar.gz 2102450 SHA256 
562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 
be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea
 WHIRLPOOL 
6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
+DIST elektra-0.8.15.tar.gz 2338297 SHA256 
6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 
86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d
 WHIRLPOOL 
c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e
 DIST elektra-0.8.3.tar.gz 1092409 SHA256 
48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 
e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886
 WHIRLPOOL 
64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9
 DIST elektra-0.8.6.tar.gz 1188337 SHA256 
e815cf69b070c339784472841aa0ee0b169fab7c78f41cbbd7044f53fa9ed216 SHA512 
4df585e07ab461b924a506a8c58bcfbe55e6c1df72710bfdc13760559054ffef6b92f8da94c08f2d8f6a7a7692983d0e92d4ffa98506fcbfc166a71bf989e488
 WHIRLPOOL 
b0dfa2841dcef35e03dfa04e5613576d5d8d74586e959c538399adbebf2d4d4842b15e912845c07f5c309614e33217b112124ec0971accf9fa4e521e1283732a
 DIST elektra-0.8.7.tar.gz 1566800 SHA256 
698ebd41d540eb0c6427c17c13a6a0f03eef94655fbd40655c9b42d612ea1c9b SHA512 
37b34abeb392e170f89a97f825153f925d7b11ea980832cb8f1bf8dbd8b098f8bd553b3998728ef84ce4f4c53ea1f420824984fe670f6752c1b50e98821eb07e
 WHIRLPOOL 
7f3f290f9064488fd1c9927a76d3f9e235e144b1ebe91a02b392ee468b2bcc4881906a71b88822a75ac1506200c3c8d5857c31f35bdc8f9832eae67c2647a768

diff --git a/app-admin/elektra/elektra-0.8.15.ebuild 
b/app-admin/elektra/elektra-0.8.15.ebuild
new file mode 100644
index 000..cbab60a
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.15.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib eutils java-pkg-opt-2
+
+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/${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 )
+
+src_prepare() {
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2016-03-01 Thread Michael Weber 
commit: 40e14a420f80b1f175e8e83dbe3eb54e6af5cb34
Author: Michael Weber  gentoo  org>
AuthorDate: Tue Mar  1 15:47:14 2016 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue Mar  1 15:51:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e14a42

app-admin/elektra: fix DESCRIPTION, live ebuild, metadata.xml

Package-Manager: portage-2.2.27

 app-admin/elektra/elektra-0.7.1-r5.ebuild | 4 ++--
 app-admin/elektra/elektra-0.8.12.ebuild   | 4 ++--
 app-admin/elektra/elektra-0.8.15.ebuild   | 4 ++--
 app-admin/elektra/elektra-.ebuild | 8 
 app-admin/elektra/metadata.xml| 1 -
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app-admin/elektra/elektra-0.7.1-r5.ebuild 
b/app-admin/elektra/elektra-0.7.1-r5.ebuild
index a15dac6..e9b0154 100644
--- a/app-admin/elektra/elektra-0.7.1-r5.ebuild
+++ b/app-admin/elektra/elektra-0.7.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit autotools autotools-multilib eutils multilib
 
-DESCRIPTION="universal and secure framework to store config parameters in a 
hierarchical key-value pair mechanism"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value 
pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra;
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz;
 

diff --git a/app-admin/elektra/elektra-0.8.12.ebuild 
b/app-admin/elektra/elektra-0.8.12.ebuild
index b1fb7b2..9ff40ab 100644
--- a/app-admin/elektra/elektra-0.8.12.ebuild
+++ b/app-admin/elektra/elektra-0.8.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit cmake-multilib eutils java-pkg-opt-2
 
-DESCRIPTION="Universal and secure framework to store config parameters in a 
hierarchical key-value pair mechanism"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value 
pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra;
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz;
 

diff --git a/app-admin/elektra/elektra-0.8.15.ebuild 
b/app-admin/elektra/elektra-0.8.15.ebuild
index cbab60a..487f83b 100644
--- a/app-admin/elektra/elektra-0.8.15.ebuild
+++ b/app-admin/elektra/elektra-0.8.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit cmake-multilib eutils java-pkg-opt-2
 
-DESCRIPTION="Universal and secure framework to store config parameters in a 
hierarchical key-value pair mechanism"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value 
pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra;
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz;
 

diff --git a/app-admin/elektra/elektra-.ebuild 
b/app-admin/elektra/elektra-.ebuild
index fa4aed6..d719bc8 100644
--- a/app-admin/elektra/elektra-.ebuild
+++ b/app-admin/elektra/elektra-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,12 +6,12 @@ EAPI=5
 
 inherit cmake-multilib eutils java-pkg-opt-2 git-r3
 
-DESCRIPTION="Universal and secure framework to store config parameters in a 
hierarchical key-value pair mechanism"
+DESCRIPTION="Framework to store config parameters in hierarchical key-value 
pairs"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra;
 EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS=""
 PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml 
yajl";
 IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
@@ -41,7 +41,7 @@ RESTRICT="test"
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
 
-PATCHES=( "${FILESDIR}/${PN}"-0.8.11-conditional-glob-tests.patch )
+PATCHES=( "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch )
 
 src_prepare() {
cmake-utils_src_prepare

diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index 1c07cb8..59b713e 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -9,7 +9,6 @@
Enable plugin for reading and writing configuration 
files with help from Augeas
Enable new, advanced ini support
Enable coverage support
-   Enable keytometa support
Enable simpleini support
Enable uname information for the key database
Enable yajl support

[gentoo-commits] repo/gentoo:master commit in: app-admin/elektra/

2015-08-22 Thread Michael Palimaka 
commit: 70b910250a35150dc39dc209a0a70b7624d63818
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Aug 22 06:51:21 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Aug 22 06:51:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b91025

app-admin/elektra: specify Qt SLOTs.

Package-Manager: portage-2.2.20.1

 app-admin/elektra/elektra-0.8.12.ebuild | 8 
 app-admin/elektra/elektra-.ebuild   | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-admin/elektra/elektra-0.8.12.ebuild 
b/app-admin/elektra/elektra-0.8.12.ebuild
index d4eaaa0..b1fb7b2 100644
--- a/app-admin/elektra/elektra-0.8.12.ebuild
+++ b/app-admin/elektra/elektra-0.8.12.ebuild
@@ -23,10 +23,10 @@ RDEPEND=dev-libs/libltdl:0[${MULTILIB_USEDEP}]
iconv? ( =virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
java? ( =virtual/jdk-1.8.0 )
qt5? (
-   =dev-qt/qtdeclarative-5.3
-   =dev-qt/qtgui-5.3
-   =dev-qt/qttest-5.3
-   =dev-qt/qtwidgets-5.3
+   =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}] )

diff --git a/app-admin/elektra/elektra-.ebuild 
b/app-admin/elektra/elektra-.ebuild
index 0c88c62..fa4aed6 100644
--- a/app-admin/elektra/elektra-.ebuild
+++ b/app-admin/elektra/elektra-.ebuild
@@ -23,10 +23,10 @@ RDEPEND=dev-libs/libltdl:0[${MULTILIB_USEDEP}]
iconv? ( =virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
java? ( =virtual/jdk-1.8.0 )
qt5? (
-   =dev-qt/qtdeclarative-5.3
-   =dev-qt/qtgui-5.3
-   =dev-qt/qttest-5.3
-   =dev-qt/qtwidgets-5.3
+   =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}] )