gentoo resync : 03.12.2017

4 files changed, 9 insertions, 9 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 6a62566d5825..cb6abacbf046 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 148fbc3cff33..28b29eb3f0f9 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -9,6 +9,7 @@
 # Maciej Mrozowski <reavertm@gentoo.org>
 # (undisclosed contributors)
 # Original author: Zephyrus (zephyrus@mirach.it)
+# @SUPPORTED_EAPIS: 5 6
 # @BLURB: common ebuild functions for cmake-based packages
 # @DESCRIPTION:
 # The cmake-utils eclass makes creating ebuilds for cmake-based packages much easier.
@@ -44,6 +45,7 @@ _CMAKE_UTILS_ECLASS=1
 : ${CMAKE_BUILD_TYPE:=Gentoo}
 
 # @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Set to enable in-source build.
 
@@ -88,12 +90,14 @@ _CMAKE_UTILS_ECLASS=1
 # "no" to disable (default) or anything else to enable.
 
 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # Specifies an extra cache file to pass to cmake. This is the analog of EXTRA_ECONF
 # for econf and is needed to pass TRY_RUN results when cross-compiling.
 # Should be set by user in a per-package basis in /etc/portage/package.env.
 
 # @ECLASS-VARIABLE: CMAKE_UTILS_QA_SRC_DIR_READONLY
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # After running cmake-utils_src_prepare, sets ${S} to read-only. This is
 # a user flag and should under _no circumstances_ be set in the ebuild.
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 44e45e4734fd..36d61f8fc503 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,6 +4,7 @@
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
 # kde@gentoo.org
+# @SUPPORTED_EAPIS: 6
 # @BLURB: Common ebuild functions for packages based on KDE Frameworks 5.
 # @DESCRIPTION:
 # This eclass contains functions shared by the other KDE eclasses and forms
@@ -16,9 +17,6 @@ _KDE5_FUNCTIONS_ECLASS=1
 
 inherit toolchain-funcs versionator
 
-# @ECLASS-VARIABLE: EAPI
-# @DESCRIPTION:
-# Currently EAPI 6 is supported.
 case ${EAPI} in
 	6) ;;
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
@@ -28,10 +26,9 @@ esac
 # @DESCRIPTION:
 # If PV matches "*9999*", this is automatically set to "live".
 # Otherwise, this is automatically set to "release".
+KDE_BUILD_TYPE="release"
 if [[ ${PV} = *9999* ]]; then
 	KDE_BUILD_TYPE="live"
-else
-	KDE_BUILD_TYPE="release"
 fi
 export KDE_BUILD_TYPE
 
@@ -74,6 +71,7 @@ esac
 # kde5_pkg_pretend and kde5_pkg_setup.
 
 # @ECLASS-VARIABLE: KDEBASE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # This gets set to a non-zero value when a package is considered a
 # kdevelop ebuild.
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index f1538e297e05..51eeb57bad51 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -102,9 +102,8 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # and install Qt compressed help files with -DBUILD_QCH=ON when USE=doc.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_QTHELP:=true}
-else
-	: ${KDE_QTHELP:=false}
 fi
+: ${KDE_QTHELP:=false}
 
 # @ECLASS-VARIABLE: KDE_TESTPATTERN
 # @DESCRIPTION:
@@ -127,9 +126,8 @@ fi
 # fix and creates ${T}/${P}-tests-optional.patch to refine and submit upstream.
 if [[ ${CATEGORY} = kde-frameworks ]]; then
 	: ${KDE_TEST:=true}
-else
-	: ${KDE_TEST:=false}
 fi
+: ${KDE_TEST:=false}
 
 # @ECLASS-VARIABLE: KDE_SELINUX_MODULE
 # @DESCRIPTION: