commit: b9c488b57bb2c47ea6cdb4352c8f7910d419a30a Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Nov 6 10:26:27 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Nov 6 10:29:11 2016 +0000 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 <soap <AT> gentoo.org> app-admin/elektra/Manifest | 1 + .../{elektra-9999.ebuild => elektra-0.8.16.ebuild} | 50 +++++++++++----------- app-admin/elektra/elektra-9999.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-9999.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild similarity index 74% copy from app-admin/elektra/elektra-9999.ebuild copy to app-admin/elektra/elektra-0.8.16.ebuild index d19d1c4..2a67535 100644 --- a/app-admin/elektra/elektra-9999.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 && 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) + 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 @@ -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/elektra-9999.ebuild b/app-admin/elektra/elektra-9999.ebuild index d19d1c4..6ce1c40 100644 --- a/app-admin/elektra/elektra-9999.ebuild +++ b/app-admin/elektra/elektra-9999.ebuild @@ -2,7 +2,7 @@ # 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 @@ -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}] ) @@ -56,8 +56,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 +96,16 @@ multilib_src_configure() { 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) + 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 @@ -114,7 +113,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/metadata.xml b/app-admin/elektra/metadata.xml index 59b713e..05fc888 100644 --- a/app-admin/elektra/metadata.xml +++ b/app-admin/elektra/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="person"> -<email>[email protected]</email> -<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="simpleini">Enable simpleini support</flag> - <flag name="uname">Enable uname information for the key database</flag> - <flag name="yajl">Enable yajl support</flag> -</use> + <maintainer type="person"> + <email>[email protected]</email> + <name>Michael Weber</name> + </maintainer> + <use> + <flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag> + <flag name="gcov">Enable coverage support</flag> + <flag name="ini">Enable new, advanced ini 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> + </use> </pkgmetadata>
