diff options
| -rw-r--r-- | eclass/kde5-functions.eclass | 37 | ||||
| -rw-r--r-- | eclass/kde5.eclass | 76 | ||||
| -rw-r--r-- | x11-misc/kronometer/Manifest | 1 | ||||
| -rw-r--r-- | x11-misc/kronometer/kronometer-2.1.2.ebuild | 32 |
4 files changed, 102 insertions, 44 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index a6bf976663b3..1724a6910b24 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -23,6 +23,35 @@ case ${EAPI} in *) die "EAPI=${EAPI:-0} is not supported" ;; esac +# determine the build type +if [[ ${PV} = *9999* ]]; then + KDE_BUILD_TYPE="live" +else + KDE_BUILD_TYPE="release" +fi +export KDE_BUILD_TYPE + +case ${CATEGORY} in + kde-frameworks) + [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} + ;; + kde-plasma) + if [[ $(get_version_component_range 2) -eq 8 && $(get_version_component_range 3) -lt 50 ]]; then + : ${FRAMEWORKS_MINIMAL:=5.26.0} # special 5.8 LTS rule to not get overwritten below + elif ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then + : ${FRAMEWORKS_MINIMAL:=5.28.0} + fi + [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} + ;; + kde-apps) + local vcr2=$((10#$(get_version_component_range 2))) + if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then + : ${FRAMEWORKS_MINIMAL:=5.28.0} + fi + unset vcr2 + ;; +esac + # @ECLASS-VARIABLE: QT_MINIMAL # @DESCRIPTION: # Minimal Qt version to require for the package. @@ -70,14 +99,6 @@ case ${KDE_SCM} in *) die "KDE_SCM: ${KDE_SCM} is not supported" ;; esac -# determine the build type -if [[ ${PV} = *9999* ]]; then - KDE_BUILD_TYPE="live" -else - KDE_BUILD_TYPE="release" -fi -export KDE_BUILD_TYPE - # @FUNCTION: _check_gcc_version # @INTERNAL # @DESCRIPTION: diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 9ef7c1514878..53b5eb4d832f 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -113,6 +113,14 @@ fi # add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND. : ${KDE_SELINUX_MODULE:=none} +# @ECLASS-VARIABLE: KDE_SUBSLOT +# @DESCRIPTION: +# If set to "false", do nothing. +# If set to "true", add a subslot to the package, where subslot is either +# defined as major.minor version for kde-*/ categories or ${PV} if other. +# For any other value, that value will be used as subslot. +: ${KDE_SUBSLOT:=false} + # @ECLASS-VARIABLE: KDE_UNRELEASED # @INTERNAL # @DESCRIPTION @@ -133,42 +141,34 @@ fi LICENSE="GPL-2" +SLOT=5 + if [[ ${CATEGORY} = kde-frameworks ]]; then - SLOT=5/$(get_version_component_range 1-2) -else - SLOT=5 + KDE_SUBSLOT=true fi -case ${KDE_AUTODEPS} in - false) ;; - *) - if [[ ${KDE_BUILD_TYPE} = live ]]; then - case ${CATEGORY} in - kde-frameworks) - : ${FRAMEWORKS_MINIMAL:=9999} +case ${KDE_SUBSLOT} in + false) ;; + true) + case ${CATEGORY} in + kde-frameworks | \ + kde-plasma | \ + kde-apps) + SLOT+="/$(get_version_component_range 1-2)" ;; - kde-plasma) - - : ${FRAMEWORKS_MINIMAL:=9999} + *) + SLOT+="/${PV}" ;; - *) ;; - esac - fi - - if [[ ${CATEGORY} = kde-plasma && ${FRAMEWORKS_MINIMAL} != 9999 ]]; then - if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then - : ${FRAMEWORKS_MINIMAL:=5.27.0} - fi - fi - - if [[ ${CATEGORY} = kde-apps ]]; then - local vcr2=$((10#$(get_version_component_range 2))) - if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then - : ${FRAMEWORKS_MINIMAL:=5.28.0} - fi - unset vcr2 - fi + esac + ;; + *) + SLOT+="/${KDE_SUBSLOT}" + ;; +esac +case ${KDE_AUTODEPS} in + false) ;; + *) DEPEND+=" $(add_frameworks_dep extra-cmake-modules)" RDEPEND+=" >=kde-frameworks/kf-env-3" COMMONDEPEND+=" $(add_qt_dep qtcore)" @@ -500,13 +500,17 @@ kde5_src_prepare() { rm -r kde-l10n-sr-${PV} || die "Failed to remove sr parent lingua" fi - # add all l10n directories to cmake cat <<-EOF > CMakeLists.txt || die -project(${PN}) -cmake_minimum_required(VERSION 2.8.12) -$(printf "add_subdirectory( %s )\n" \ - `find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`) -EOF + project(${PN}) + cmake_minimum_required(VERSION 2.8.12) + EOF + # add all l10n directories to cmake + if [[ -n ${A} ]]; then + cat <<-EOF >> CMakeLists.txt || die + $(printf "add_subdirectory( %s )\n" \ + `find . -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"`) + EOF + fi # for KF5: drop KDE4-based part; for KDE4: drop KF5-based part case ${l10npart} in diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest index 217f62eddfb4..f8e156af225e 100644 --- a/x11-misc/kronometer/Manifest +++ b/x11-misc/kronometer/Manifest @@ -1 +1,2 @@ DIST kronometer-2.1.1.tar.xz 116932 SHA256 ecb182e6ef6cf33a7c3a068edb6ac243caa43ff386f1c331bb3a2d197eae4b00 SHA512 49c40cf0c94719e1964d5c4c1415a34ee760f4aa9e8a77d93d4978649a0c1a78af889d75e2c56f910bba95867fd44253e2cbe76b4b82ed6e2f1f42ea56599c67 WHIRLPOOL 4c89ccf98084e0e9a57e65361401ee2caa766d00814afdd5073b2f25351fe153992317b35c6edc895a3908d051445a2f269453dae196ffb8bb1b6d84b8b645d2 +DIST kronometer-2.1.2.tar.xz 122492 SHA256 0359c091df7d0e96b03ca1b2d2fd91a377d32d9d16d551892343edbe99a5320b SHA512 781ea11a22f1db69dec686d4f21f22fe81b4fea89bdcb111da5e7665d563d5a07355b50e5cad31dbdd649405d00ed792c6b753ae02d14f16d3694bc83df9889b WHIRLPOOL 23feb31bea70cbe3086dcfc1aa30990db822b44f19837b181f189c60cc9ce79afbb420e5ac175a6f2f6c82b6ba2c2f0a0d8252ce6b08d597ccb90c61526753a8 diff --git a/x11-misc/kronometer/kronometer-2.1.2.ebuild b/x11-misc/kronometer/kronometer-2.1.2.ebuild new file mode 100644 index 000000000000..ec61f4d0bc1e --- /dev/null +++ b/x11-misc/kronometer/kronometer-2.1.2.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Stopwatch application" +HOMEPAGE="http://www.aelog.org/kronometer/" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="GPL-2+" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) +" +RDEPEND="${DEPEND}" |