| 1 |
abcd 11/10/29 15:07:16 |
| 2 |
|
| 3 |
Modified: kde4-base.eclass kde4-meta.eclass |
| 4 |
Log: |
| 5 |
Sync kde4 eclasses |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.110 eclass/kde4-base.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.110&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.110&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.109&r2=1.110 |
| 13 |
|
| 14 |
Index: kde4-base.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v |
| 17 |
retrieving revision 1.109 |
| 18 |
retrieving revision 1.110 |
| 19 |
diff -u -r1.109 -r1.110 |
| 20 |
--- kde4-base.eclass 21 Oct 2011 23:00:19 -0000 1.109 |
| 21 |
+++ kde4-base.eclass 29 Oct 2011 15:07:16 -0000 1.110 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2010 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.109 2011/10/21 23:00:19 dilfridge Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.110 2011/10/29 15:07:16 abcd Exp $ |
| 27 |
|
| 28 |
# @ECLASS: kde4-base.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -600,7 +600,7 @@ |
| 31 |
kde4-base_pkg_setup() { |
| 32 |
debug-print-function ${FUNCNAME} "$@" |
| 33 |
|
| 34 |
- if has kdeprefix ${IUSE//+} && use kdeprefix; then |
| 35 |
+ if use_if_iuse kdeprefix; then |
| 36 |
eerror "Sorry, kdeprefix support has been removed." |
| 37 |
eerror "Please remove kdeprefix from your USE variable." |
| 38 |
die "kdeprefix support has been removed" |
| 39 |
@@ -682,7 +682,7 @@ |
| 40 |
# Enable/disable handbooks for kde4-base packages |
| 41 |
# kde-l10n inherits kde4-base but is metpackage, so no check for doc |
| 42 |
# kdelibs inherits kde4-base but handle installing the handbook itself |
| 43 |
- if ! has kde4-meta ${INHERITED} && has handbook ${IUSE//+}; then |
| 44 |
+ if ! has kde4-meta ${INHERITED} && in_iuse handbook; then |
| 45 |
if [[ ${KDEBASE} == kde-base ]]; then |
| 46 |
if [[ ${PN} != kde-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then |
| 47 |
# documentation in kde4-functions |
| 48 |
@@ -760,11 +760,11 @@ |
| 49 |
# Build tests in src_test only, where we override this value |
| 50 |
local cmakeargs=(-DKDE4_BUILD_TESTS=OFF) |
| 51 |
|
| 52 |
- if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then |
| 53 |
+ if use_if_iuse kdeenablefinal; then |
| 54 |
cmakeargs+=(-DKDE4_ENABLE_FINAL=ON) |
| 55 |
fi |
| 56 |
|
| 57 |
- if has debug ${IUSE//+} && use debug; then |
| 58 |
+ if use_if_iuse debug; then |
| 59 |
# Set "real" debug mode |
| 60 |
CMAKE_BUILD_TYPE="Debugfull" |
| 61 |
else |
| 62 |
@@ -880,6 +880,9 @@ |
| 63 |
debug-print-function ${FUNCNAME} "$@" |
| 64 |
|
| 65 |
gnome2_icon_savelist |
| 66 |
+ if [[ ${BUILD_TYPE} == live && ${KDE_SCM} == svn ]]; then |
| 67 |
+ subversion_pkg_preinst |
| 68 |
+ fi |
| 69 |
} |
| 70 |
|
| 71 |
# @FUNCTION: kde4-base_pkg_postinst |
| 72 |
@@ -894,7 +897,7 @@ |
| 73 |
buildsycoca |
| 74 |
|
| 75 |
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then |
| 76 |
- if has kdeenablefinal ${IUSE//+} && use kdeenablefinal; then |
| 77 |
+ if use_if_iuse kdeenablefinal; then |
| 78 |
echo |
| 79 |
ewarn "WARNING! you have kdeenable final useflag enabled." |
| 80 |
ewarn "This useflag needs to be enabled on ALL kde using packages and" |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.58 eclass/kde4-meta.eclass |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.58&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.58&content-type=text/plain |
| 88 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.57&r2=1.58 |
| 89 |
|
| 90 |
Index: kde4-meta.eclass |
| 91 |
=================================================================== |
| 92 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v |
| 93 |
retrieving revision 1.57 |
| 94 |
retrieving revision 1.58 |
| 95 |
diff -u -r1.57 -r1.58 |
| 96 |
--- kde4-meta.eclass 6 Oct 2011 14:13:29 -0000 1.57 |
| 97 |
+++ kde4-meta.eclass 29 Oct 2011 15:07:16 -0000 1.58 |
| 98 |
@@ -1,6 +1,6 @@ |
| 99 |
# Copyright 1999-2011 Gentoo Foundation |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.57 2011/10/06 14:13:29 alexxy Exp $ |
| 102 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.58 2011/10/29 15:07:16 abcd Exp $ |
| 103 |
# |
| 104 |
# @ECLASS: kde4-meta.eclass |
| 105 |
# @MAINTAINER: |
| 106 |
@@ -289,7 +289,7 @@ |
| 107 |
|
| 108 |
# Add default handbook locations |
| 109 |
# FIXME - legacy code - remove when 4.4.5 is gone or preferrably port 4.4.5. |
| 110 |
- if [[ $(get_kde_version) < 4.5 ]] && has handbook ${IUSE//+} && use handbook && [[ -z ${KMNOMODULE} ]]; then |
| 111 |
+ if [[ $(get_kde_version) < 4.5 ]] && use_if_iuse handbook && [[ -z ${KMNOMODULE} ]]; then |
| 112 |
# We use the basename of $KMMODULE because $KMMODULE can contain |
| 113 |
# the path to the module subdirectory. |
| 114 |
KMEXTRA_NONFATAL+=" |
| 115 |
@@ -346,7 +346,7 @@ |
| 116 |
KMEXTRACTONLY+=" |
| 117 |
kdepim-version.h" |
| 118 |
fi |
| 119 |
- if has kontact ${IUSE//+} && use kontact; then |
| 120 |
+ if use_if_iuse kontact; then |
| 121 |
KMEXTRA+=" |
| 122 |
kontact/plugins/${PLUGINNAME:-${PN}}/" |
| 123 |
fi |
| 124 |
@@ -584,13 +584,13 @@ |
| 125 |
sed -r -e '/find_package\(KdepimLibs/s/REQUIRED//' \ |
| 126 |
-e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ |
| 127 |
-e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ |
| 128 |
- -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \ |
| 129 |
- -e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/#OVERRIDE /' \ |
| 130 |
+ -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*/if(1) # &/' \ |
| 131 |
+ -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \ |
| 132 |
-i CMakeLists.txt || die "failed to disable hardcoded checks" |
| 133 |
# Disable broken or redundant build logic |
| 134 |
- if ( has kontact ${IUSE//+} && use kontact ) || [[ ${PN} = kontact ]]; then |
| 135 |
- sed -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \ |
| 136 |
- -e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/#OVERRIDE /' \ |
| 137 |
+ if use_if_iuse kontact || [[ ${PN} = kontact ]]; then |
| 138 |
+ sed -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*$/if(1) # &/' \ |
| 139 |
+ -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:space:]]*$/if(1) # &/' \ |
| 140 |
-i kontact/plugins/CMakeLists.txt || die 'failed to override build logic' |
| 141 |
fi |
| 142 |
if [[ $(get_kde_version) < 4.5 ]]; then |
Archives