xmw         15/08/05 12:03:06

  Modified:             metadata.xml elektra-0.8.7.ebuild ChangeLog
  Added:                elektra-0.8.12.ebuild elektra-9999.ebuild
  Log:
  Version bump, add live ebuild, 
https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/165 (thanks a17r).
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
62EEF090)

Revision  Changes    Path
1.6                  app-admin/elektra/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/metadata.xml?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/metadata.xml?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/elektra/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml        9 Jun 2015 16:45:41 -0000       1.5
+++ metadata.xml        5 Aug 2015 12:03:06 -0000       1.6
@@ -6,12 +6,13 @@
 <name>Michael Weber</name>
 </maintainer>
 <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>
        <flag name="gcov">Enable coverage support</flag>
+       <flag name="keytometa">Enable keytometa support</flag>
        <flag name="simpleini">Enable simpleini support</flag>
        <flag name="uname">Enable uname information for the key database</flag>
        <flag name="yajl">Enable yajl support</flag>
-       <flag name="ini">Enable ini support</flag>
-       <flag name="keytometa">Enable keytometa support</flag>
 </use>
 </pkgmetadata>
 



1.2                  app-admin/elektra/elektra-0.8.7.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild?r1=1.1&r2=1.2

Index: elektra-0.8.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elektra-0.8.7.ebuild        9 Jun 2015 16:45:41 -0000       1.1
+++ elektra-0.8.7.ebuild        5 Aug 2015 12:03:06 -0000       1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild,v 
1.1 2015/06/09 16:45:41 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.7.ebuild,v 
1.2 2015/08/05 12:03:06 xmw Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@
 SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz";
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="dbus doc examples iconv ini keytometa simpleini static-libs syslog tcl 
test +uname xml yajl"
 



1.22                 app-admin/elektra/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/ChangeLog?rev=1.22&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/ChangeLog?rev=1.22&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/ChangeLog?r1=1.21&r2=1.22

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog   9 Jun 2015 16:45:41 -0000       1.21
+++ ChangeLog   5 Aug 2015 12:03:06 -0000       1.22
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/elektra
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.21 
2015/06/09 16:45:41 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/ChangeLog,v 1.22 
2015/08/05 12:03:06 xmw Exp $
+
+*elektra-0.8.12 (05 Aug 2015)
+*elektra-9999 (05 Aug 2015)
+
+  05 Aug 2015; Michael Weber <[email protected]> +elektra-0.8.12.ebuild,
+  +elektra-9999.ebuild, +files/elektra-0.8.11-conditional-glob-tests.patch,
+  elektra-0.8.7.ebuild, metadata.xml:
+  Version bump, add live ebuild, 
https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/165 (thanks a17r).
 
 *elektra-0.8.7 (09 Jun 2015)
 



1.1                  app-admin/elektra/elektra-0.8.12.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/elektra-0.8.12.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/elektra-0.8.12.ebuild?rev=1.1&content-type=text/plain

Index: elektra-0.8.12.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-0.8.12.ebuild,v 
1.1 2015/08/05 12:03:06 xmw Exp $

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
                >=dev-qt/qtgui-5.3
                >=dev-qt/qttest-5.3
                >=dev-qt/qtwidgets-5.3
        )
        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.11-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
        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_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)
                $(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 "${D}/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"
}



1.1                  app-admin/elektra/elektra-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/elektra-9999.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/elektra/elektra-9999.ebuild?rev=1.1&content-type=text/plain

Index: elektra-9999.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/elektra/elektra-9999.ebuild,v 1.1 
2015/08/05 12:03:06 xmw Exp $

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"
HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra";
EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"

LICENSE="BSD"
SLOT="0"
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.3
                >=dev-qt/qtgui-5.3
                >=dev-qt/qttest-5.3
                >=dev-qt/qtwidgets-5.3
        )
        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.11-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
        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_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)
                $(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 "${D}/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"
}




Reply via email to