| 1 |
commit: b0c6bf7aaef17b9f7e5d2359cd0cc831b34f38a4 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jun 30 08:23:04 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 30 08:45:02 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b0c6bf7a |
| 7 |
|
| 8 |
kde4-base.eclass: Remove kdelibs conditionals, no longer inherits kde4-base |
| 9 |
|
| 10 |
eclass/kde4-base.eclass | 46 ++++++++++++++++++++-------------------------- |
| 11 |
1 file changed, 20 insertions(+), 26 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
| 14 |
index 5a9a49c..d8e922e 100644 |
| 15 |
--- a/eclass/kde4-base.eclass |
| 16 |
+++ b/eclass/kde4-base.eclass |
| 17 |
@@ -360,25 +360,23 @@ kdecommondepend=" |
| 18 |
" |
| 19 |
unset qtcoreuse |
| 20 |
|
| 21 |
-if [[ ${PN} != kdelibs ]]; then |
| 22 |
- [[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]" |
| 23 |
- kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}" |
| 24 |
- if [[ ${KDEBASE} = kdevelop ]]; then |
| 25 |
- if [[ ${PN} != kdevplatform ]]; then |
| 26 |
- # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED |
| 27 |
- # @DESCRIPTION: |
| 28 |
- # Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'. |
| 29 |
- # Applies to KDEBASE=kdevelop only. |
| 30 |
- KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}" |
| 31 |
- case ${KDEVPLATFORM_REQUIRED} in |
| 32 |
- always) |
| 33 |
- kdecommondepend+=" |
| 34 |
- >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4 |
| 35 |
- " |
| 36 |
- ;; |
| 37 |
- *) ;; |
| 38 |
- esac |
| 39 |
- fi |
| 40 |
+[[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]" |
| 41 |
+kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}" |
| 42 |
+if [[ ${KDEBASE} = kdevelop ]]; then |
| 43 |
+ if [[ ${PN} != kdevplatform ]]; then |
| 44 |
+ # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED |
| 45 |
+ # @DESCRIPTION: |
| 46 |
+ # Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'. |
| 47 |
+ # Applies to KDEBASE=kdevelop only. |
| 48 |
+ KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}" |
| 49 |
+ case ${KDEVPLATFORM_REQUIRED} in |
| 50 |
+ always) |
| 51 |
+ kdecommondepend+=" |
| 52 |
+ >=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4 |
| 53 |
+ " |
| 54 |
+ ;; |
| 55 |
+ *) ;; |
| 56 |
+ esac |
| 57 |
fi |
| 58 |
fi |
| 59 |
unset kdelibsuse |
| 60 |
@@ -421,12 +419,12 @@ kdehandbookrdepend=" |
| 61 |
case ${KDE_HANDBOOK} in |
| 62 |
always) |
| 63 |
kdedepend+=" ${kdehandbookdepend}" |
| 64 |
- [[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}" |
| 65 |
+ kderdepend+=" ${kdehandbookrdepend}" |
| 66 |
;; |
| 67 |
optional) |
| 68 |
IUSE+=" +handbook" |
| 69 |
kdedepend+=" handbook? ( ${kdehandbookdepend} )" |
| 70 |
- [[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )" |
| 71 |
+ kderdepend+=" handbook? ( ${kdehandbookrdepend} )" |
| 72 |
;; |
| 73 |
*) ;; |
| 74 |
esac |
| 75 |
@@ -720,10 +718,9 @@ kde4-base_src_prepare() { |
| 76 |
|
| 77 |
# Enable/disable handbooks for kde4-base packages |
| 78 |
# kde4-l10n inherits kde4-base but is metapackage, so no check for doc |
| 79 |
- # kdelibs inherits kde4-base but handle installing the handbook itself |
| 80 |
if ! has kde4-meta ${INHERITED} && in_iuse handbook; then |
| 81 |
if [[ ${KDEBASE} == kde-base ]]; then |
| 82 |
- if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then |
| 83 |
+ if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n ]] && use !handbook; then |
| 84 |
# documentation in kde4-functions |
| 85 |
: ${KDE_DOC_DIRS:=doc} |
| 86 |
local dir |
| 87 |
@@ -786,9 +783,6 @@ kde4-base_src_configure() { |
| 88 |
append-cppflags -DQT_NO_DEBUG |
| 89 |
fi |
| 90 |
|
| 91 |
- # Set distribution name |
| 92 |
- [[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo) |
| 93 |
- |
| 94 |
# Here we set the install prefix |
| 95 |
tc-is-cross-compiler || cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}") |
Archives