* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-functions.eclass kde4-meta.eclass
@ 2011-12-18 0:00 Andreas HAttel (dilfridge)
0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2011-12-18 0:00 UTC (permalink / raw
To: gentoo-commits
dilfridge 11/12/18 00:00:45
Modified: ChangeLog kde4-base.eclass kde4-functions.eclass
kde4-meta.eclass
Log:
Re-sync kde4 eclasses with kde overlay: remove libkworkspace target hacks (requires libkworkspace rebuild), force qt-4.7.4 for kde-4.8, properly treat kde-4.[789] version numbers, warn if the handbook useflag is added manually. Proofread by reavertm.
Revision Changes Path
1.48 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.47&r2=1.48
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog 17 Dec 2011 03:57:38 -0000 1.47
+++ ChangeLog 18 Dec 2011 00:00:45 -0000 1.48
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.47 2011/12/17 03:57:38 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.48 2011/12/18 00:00:45 dilfridge Exp $
+
+ 18 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> kde4-base.eclass,
+ kde4-functions.eclass, kde4-meta.eclass:
+ Re-sync kde4 eclasses with kde overlay: remove libkworkspace target hacks
+ (requires libkworkspace rebuild), force qt-4.7.4 for kde-4.8, properly treat
+ kde-4.[789] version numbers, warn if the handbook useflag is added manually
17 Dec 2011; Maciej Mrozowski <reavertm@gentoo.org> eutils.eclass:
Revert old eshopts_{pop,push} implementations until new ones pass unit tests.
1.111 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.110&r2=1.111
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- kde4-base.eclass 29 Oct 2011 15:07:16 -0000 1.110
+++ kde4-base.eclass 18 Dec 2011 00:00:45 -0000 1.111
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.110 2011/10/29 15:07:16 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.111 2011/12/18 00:00:45 dilfridge Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -13,6 +13,13 @@
# NOTE: KDE 4 ebuilds currently support EAPI "3". This will be reviewed
# over time as new EAPI versions are approved.
+# @ECLASS-VARIABLE: KDE_SELINUX_MODULE
+# @DESCRIPTION:
+# If set to "none", do nothing.
+# For any other value, add selinux to IUSE, and depending on that useflag
+# add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND
+: ${KDE_SELINUX_MODULE:=none}
+
# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
# @DESCRIPTION:
# For proper description see virtualx.eclass manpage.
@@ -192,10 +199,10 @@
# @ECLASS-VARIABLE: QT_MINIMAL
# @DESCRIPTION:
# Determine version of qt we enforce as minimal for the package.
-if version_is_at_least 4.5.50 "${KDE_MINIMAL}"; then
- QT_MINIMAL="${QT_MINIMAL:-4.7.0}"
+if version_is_at_least 4.7.80 "${KDE_MINIMAL}"; then
+ QT_MINIMAL="${QT_MINIMAL:-4.7.4}"
else
- QT_MINIMAL="${QT_MINIMAL:-4.6.3}"
+ QT_MINIMAL="${QT_MINIMAL:-4.7.0}"
fi
# Declarative dependencies
@@ -381,6 +388,14 @@
esac
unset kdehandbookdepend kdehandbookrdepend
+case ${KDE_SELINUX_MODULE} in
+ none) ;;
+ *)
+ IUSE+=" selinux"
+ kdecommondepend+=" selinux? ( sec-policy/selinux-${KDE_SELINUX_MODULE} )"
+ ;;
+esac
+
case ${KDE_REQUIRED} in
always)
IUSE+=" aqua"
@@ -437,7 +452,7 @@
case ${KDEBASE} in
kde-base)
case ${PV} in
- 4.[456].8[05] | 4.[456].9[023568])
+ 4.[456789].8[05] | 4.[456789].9[023568])
# Unstable KDE SC releases
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2"
if ! version_is_at_least 4.6.80 ${PV}
@@ -600,6 +615,11 @@
kde4-base_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
+ if has handbook ${IUSE} || has "+handbook" ${IUSE} && [ "${KDE_HANDBOOK}" != optional ] ; then
+ eqawarn "Handbook support is enabled via KDE_HANDBOOK=optional in the ebuild."
+ eqawarn "Please do not just set IUSE=handbook, as this leads to dependency errors."
+ fi
+
if use_if_iuse kdeprefix; then
eerror "Sorry, kdeprefix support has been removed."
eerror "Please remove kdeprefix from your USE variable."
@@ -721,27 +741,6 @@
load_library_dependencies
fi
- # Replace KDE4Workspace library targets
- find "${S}" -name CMakeLists.txt \
- -exec sed -i -r \
- -e 's/\$\{KDE4WORKSPACE_TASKMANAGER_(LIBRARY|LIBS)\}/taskmanager/g' \
- -e 's/\$\{KDE4WORKSPACE_KWORKSPACE_(LIBRARY|LIBS)\}/kworkspace/g' \
- -e 's/\$\{KDE4WORKSPACE_SOLIDCONTROLIFACES_(LIBRARY|LIBS)\}/solidcontrolifaces/g' \
- -e 's/\$\{KDE4WORKSPACE_SOLIDCONTROL_(LIBRARY|LIBS)\}/solidcontrol/g' \
- -e 's/\$\{KDE4WORKSPACE_PROCESSUI_(LIBRARY|LIBS)\}/processui/g' \
- -e 's/\$\{KDE4WORKSPACE_LSOFUI_(LIBRARY|LIBS)\}/lsofui/g' \
- -e 's/\$\{KDE4WORKSPACE_PLASMACLOCK_(LIBRARY|LIBS)\}/plasmaclock/g' \
- -e 's/\$\{KDE4WORKSPACE_NEPOMUKQUERYCLIENT_(LIBRARY|LIBS)\}/nepomukqueryclient/g' \
- -e 's/\$\{KDE4WORKSPACE_NEPOMUKQUERY_(LIBRARY|LIBS)\}/nepomukquery/g' \
- -e 's/\$\{KDE4WORKSPACE_KSCREENSAVER_(LIBRARY|LIBS)\}/kscreensaver/g' \
- -e 's/\$\{KDE4WORKSPACE_WEATHERION_(LIBRARY|LIBS)\}/weather_ion/g' \
- -e 's/\$\{KDE4WORKSPACE_KWINEFFECTS_(LIBRARY|LIBS)\}/kwineffects/g' \
- -e 's/\$\{KDE4WORKSPACE_KDECORATIONS_(LIBRARY|LIBS)\}/kdecorations/g' \
- -e 's/\$\{KDE4WORKSPACE_KSGRD_(LIBRARY|LIBS)\}/ksgrd/g' \
- -e 's/\$\{KDE4WORKSPACE_KEPHAL_(LIBRARY|LIBS)\}/kephal/g' \
- {} + \
- || die 'failed to replace KDE4Workspace library targets'
-
# Hack for manuals relying on outdated DTD, only outside kde-base/koffice/...
if [[ -z ${KDEBASE} ]]; then
find "${S}" -name "*.docbook" \
1.58 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.57&r2=1.58
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- kde4-functions.eclass 6 Oct 2011 14:13:29 -0000 1.57
+++ kde4-functions.eclass 18 Dec 2011 00:00:45 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.57 2011/10/06 14:13:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.58 2011/12/18 00:00:45 dilfridge Exp $
inherit versionator
@@ -418,11 +418,6 @@
[[ -z ${1} ]] && die "Missing parameter"
- # There will be no kdelibs 4.8+ (the next kdelibs will be a non-BC 5.0, apparently)
- if [[ ${1} == kdelibs ]] && version_is_at_least 4.7.50 ${ver}; then
- ver=4.7.1
- fi
-
echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
}
1.59 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.58&r2=1.59
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kde4-meta.eclass 29 Oct 2011 15:07:16 -0000 1.58
+++ kde4-meta.eclass 18 Dec 2011 00:00:45 -0000 1.59
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.58 2011/10/29 15:07:16 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.59 2011/12/18 00:00:45 dilfridge Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -556,6 +556,9 @@
sed -e '/startkde/s/^/#DONOTINSTALL /' \
-i CMakeLists.txt || die "${LINENO}: sed died in the kdebase-startkde collision prevention section"
fi
+ # Remove workspace target prefix in order to get direct linking to workspace libs
+ sed -e '/set(KDE4WORKSPACE_TARGET_PREFIX/s/^/#OVERRIDE /' \
+ -i CMakeLists.txt || die "${LINENO}: sed died in KDE4WORKSPACE_TARGET_PREFIX removal section"
# Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82
if [[ ${PN} != libkworkspace ]]; then
sed -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-functions.eclass kde4-meta.eclass
@ 2012-08-01 19:38 Johannes Huber (johu)
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber (johu) @ 2012-08-01 19:38 UTC (permalink / raw
To: gentoo-commits
johu 12/08/01 19:38:52
Modified: ChangeLog kde4-base.eclass kde4-functions.eclass
kde4-meta.eclass
Log:
Make .xz compression as default for SRC_URI calculation. Add KDE prefix to BUILD_TYPE. No #DONOTCOMPILE if add_subdirectory has a variable parameter ("${...").
Revision Changes Path
1.362 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.362&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.362&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.361&r2=1.362
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -r1.361 -r1.362
--- ChangeLog 29 Jul 2012 05:54:17 -0000 1.361
+++ ChangeLog 1 Aug 2012 19:38:52 -0000 1.362
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.361 2012/07/29 05:54:17 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.362 2012/08/01 19:38:52 johu Exp $
+
+ 01 Aug 2012; Johannes Huber <johu@gentoo.org> kde4-base.eclass,
+ kde4-functions.eclass, kde4-meta.eclass:
+ Make .xz compression as default for SRC_URI calculation. Add KDE prefix to
+ BUILD_TYPE. No #DONOTCOMPILE if add_subdirectory has a variable parameter
+ ("${...").
29 Jul 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
add support for file:// URI scheme wrt bug #416649
1.120 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.119&r2=1.120
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kde4-base.eclass 22 Jun 2012 09:19:46 -0000 1.119
+++ kde4-base.eclass 1 Aug 2012 19:38:52 -0000 1.120
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.119 2012/06/22 09:19:46 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.120 2012/08/01 19:38:52 johu Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -33,7 +33,7 @@
inherit kde4-functions toolchain-funcs fdo-mime flag-o-matic gnome2-utils base virtualx versionator eutils multilib
-if [[ ${BUILD_TYPE} = live ]]; then
+if [[ ${KDE_BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
svn) inherit subversion ;;
git) inherit git-2 ;;
@@ -70,7 +70,7 @@
SLOT="2"
;;
kdevelop)
- if [[ ${BUILD_TYPE} = live ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live ]]; then
# @ECLASS-VARIABLE: KDEVELOP_VERSION
# @DESCRIPTION:
# Specifies KDevelop version. Default is 4.0.0 for tagged packages and 9999 for live packages.
@@ -159,7 +159,7 @@
# Set this varible if you want your live package to manage its
# translations. (Mostly all kde ebuilds does not ship documentation
# and translations in live ebuilds)
-if [[ ${BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
+if [[ ${KDE_BUILD_TYPE} == live && -z ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
# Kdebase actualy provides the handbooks even for live stuff
[[ ${KDEBASE} == kde-base ]] || KDE_HANDBOOK=never
KDE_LINGUAS=""
@@ -170,7 +170,7 @@
kde-base)
HOMEPAGE="http://www.kde.org/"
LICENSE="GPL-2"
- if [[ ${BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
# Disable tests for live ebuilds by default
RESTRICT+=" test"
fi
@@ -450,18 +450,18 @@
# KDEPIM 4.4, special case
# TODO: Remove this part when KDEPIM 4.4 gets out of the tree
SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;;
- 4.[4567].8[05] | 4.[4567].9[0235678])
+ 4.[89].8[05] | 4.[89].9[0235678])
# Unstable KDE SC releases
- SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
- 4.8.[12345])
- # Stable KDE SC releases with .xz support
- SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
+ SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
+ 4.[1234567].[12345])
+ # Stable KDE SC with old .bz2 support
+ SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
4.[89].8[05] | 4.[89].9[0235678])
# Unstable KDE SC releases
SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
*)
# Stable KDE SC releases
- SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
+ SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
esac
;;
koffice)
@@ -590,7 +590,7 @@
esac
}
-case ${BUILD_TYPE} in
+case ${KDE_BUILD_TYPE} in
live) _calculate_live_repo ;;
*) _calculate_src_uri ;;
esac
@@ -662,7 +662,7 @@
kde4-base_src_unpack() {
debug-print-function ${FUNCNAME} "$@"
- if [[ ${BUILD_TYPE} = live ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
svn)
migrate_store_dir
@@ -716,7 +716,7 @@
fi
# SCM bootstrap
- if [[ ${BUILD_TYPE} = live ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
svn) subversion_src_prepare ;;
esac
@@ -755,7 +755,7 @@
if use_if_iuse debug; then
# Set "real" debug mode
- CMAKE_BUILD_TYPE="Debugfull"
+ CMAKE_KDE_BUILD_TYPE="Debugfull"
else
# Handle common release builds
append-cppflags -DQT_NO_DEBUG
@@ -892,7 +892,7 @@
debug-print-function ${FUNCNAME} "$@"
gnome2_icon_savelist
- if [[ ${BUILD_TYPE} == live && ${KDE_SCM} == svn ]]; then
+ if [[ ${KDE_BUILD_TYPE} == live && ${KDE_SCM} == svn ]]; then
subversion_pkg_preinst
fi
}
@@ -909,7 +909,7 @@
buildsycoca
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
- if [[ ${BUILD_TYPE} = live ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live ]]; then
echo
einfo "WARNING! This is an experimental live ebuild of ${CATEGORY}/${PN}"
einfo "Use it at your own risk."
1.60 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.59&r2=1.60
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- kde4-functions.eclass 8 May 2012 22:00:49 -0000 1.59
+++ kde4-functions.eclass 1 Aug 2012 19:38:52 -0000 1.60
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.59 2012/05/08 22:00:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.60 2012/08/01 19:38:52 johu Exp $
inherit versionator
@@ -46,15 +46,15 @@
# determine the build type
if [[ ${PV} = *9999* ]]; then
- BUILD_TYPE="live"
+ KDE_BUILD_TYPE="live"
else
- BUILD_TYPE="release"
+ KDE_BUILD_TYPE="release"
fi
-export BUILD_TYPE
+export KDE_BUILD_TYPE
-# Set reponame and SCM for moduleses that have fully migrated to git
+# Set reponame and SCM for modules that have fully migrated to git
# (hack - it's here because it needs to be before SCM inherits from kde4-base)
-if [[ ${BUILD_TYPE} == live ]]; then
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
case "${KMNAME}" in
kdebase-workspace)
KDE_SCM="git"
@@ -93,7 +93,7 @@
# this for you.
#
# Example: KDE_LINGUAS="en_GB de nl"
-if [[ ${BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
+if [[ ${KDE_BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
for _lingua in ${KDE_LINGUAS}; do
IUSE="${IUSE} linguas_${_lingua}"
done
1.65 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.64&r2=1.65
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- kde4-meta.eclass 8 May 2012 22:00:49 -0000 1.64
+++ kde4-meta.eclass 1 Aug 2012 19:38:52 -0000 1.65
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.64 2012/05/08 22:00:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.65 2012/08/01 19:38:52 johu Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -69,7 +69,7 @@
debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"
# Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc)
-case ${BUILD_TYPE} in
+case ${KDE_BUILD_TYPE} in
live)
if [[ ${KDE_SCM} == svn ]]; then
case ${KMNAME} in
@@ -147,7 +147,7 @@
kde4-meta_src_unpack() {
debug-print-function ${FUNCNAME} "$@"
- if [[ ${BUILD_TYPE} = live ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live ]]; then
case "${KDE_SCM}" in
svn)
migrate_store_dir
@@ -173,7 +173,7 @@
kde4-meta_src_extract() {
debug-print-function ${FUNCNAME} "$@"
- if [[ ${BUILD_TYPE} = live ]]; then
+ if [[ ${KDE_BUILD_TYPE} = live ]]; then
# Export working copy to ${S}
einfo "Exporting parts of working copy to ${S}"
kde4-meta_create_extractlists
@@ -210,12 +210,12 @@
else
local abort tarball tarfile f extractlist postfix
- if [[ ${PV} =~ 4.8.[12345] ]]; then
- postfix="xz"
- KMTARPARAMS+=" --xz"
- else
+ if [[ ${PV} =~ 4.7.[12345] ]]; then
postfix="bz2"
KMTARPARAMS+=" --bzip2"
+ else
+ postfix="xz"
+ KMTARPARAMS+=" --xz"
fi
case ${KMNAME} in
@@ -312,6 +312,7 @@
;;
kdebase-runtime | kde-runtime)
KMEXTRACTONLY+="
+ CTestConfig.cmake
config-runtime.h.cmake"
;;
kdebase-workspace | kde-workspace)
@@ -380,16 +381,8 @@
&& ! [[ ${KMNAME} == kdeedu && ( ${PV} == 4.6.4 || ${PV} == 4.6.5 ) ]]; then
case ${KMNAME} in
kdebase-runtime|kde-runtime|kdebase-workspace|kde-workspace|kdeedu|kdegames|kdegraphics)
- case ${PN} in
- libkdegames|libkdeedu|libkworkspace)
- KMEXTRA+="
- cmake/modules/"
- ;;
- *)
- KMCOMPILEONLY+="
- cmake/modules/"
- ;;
- esac
+ KMEXTRACTONLY+="
+ cmake/modules/"
;;
esac
fi
@@ -495,6 +488,13 @@
-i CMakeLists.txt || die "${LINENO}: cmake sed died"
fi
+ # Restore "add_subdirectory( ${ ..." (this is done in kdesdk)
+ if [[ -f CMakeLists.txt ]]; then
+ sed -e '/add_subdirectory[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \
+ -e '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*\${/s/^#DONOTCOMPILE //' \
+ -i CMakeLists.txt || die "${LINENO}: cmake sed died"
+ fi
+
if [[ -z ${KMNOMODULE} ]]; then
# Restore "add_subdirectory" in $KMMODULE subdirectories
find "${S}"/${KMMODULE} -name CMakeLists.txt -print0 | \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-functions.eclass kde4-meta.eclass
@ 2012-08-19 11:12 Johannes Huber (johu)
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber (johu) @ 2012-08-19 11:12 UTC (permalink / raw
To: gentoo-commits
johu 12/08/19 11:12:35
Modified: ChangeLog kde4-base.eclass kde4-functions.eclass
kde4-meta.eclass
Log:
Remove obsolete koffice handling. Simplify Qt minimal requirement. Remove
duplicated entry for unstable KDE SC releases in SRC_URI calculation. Arrange
docs example for KDE_LINGUAS alphabetically.
Revision Changes Path
1.377 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.377&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.377&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.376&r2=1.377
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- ChangeLog 19 Aug 2012 11:04:37 -0000 1.376
+++ ChangeLog 19 Aug 2012 11:12:35 -0000 1.377
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.376 2012/08/19 11:04:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.377 2012/08/19 11:12:35 johu Exp $
+
+ 19 Aug 2012; Johannes Huber <johu@gentoo.org> kde4-base.eclass,
+ kde4-functions.eclass, kde4-meta.eclass:
+ Remove obsolete koffice handling. Simplify Qt minimal requirement. Remove
+ duplicated entry for unstable KDE SC releases in SRC_URI calculation. Arrange
+ docs example for KDE_LINGUAS alphabetically.
19 Aug 2012; Johannes Huber <johu@gentoo.org> -tetex-3.eclass, -tetex.eclass:
Remove obsolete. Announced on 2012/07/18.
1.121 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.120&r2=1.121
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- kde4-base.eclass 1 Aug 2012 19:38:52 -0000 1.120
+++ kde4-base.eclass 19 Aug 2012 11:12:35 -0000 1.121
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.120 2012/08/01 19:38:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.121 2012/08/19 11:12:35 johu Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -66,9 +66,6 @@
SLOT=4
KDE_MINIMAL="${PV}"
;;
- koffice)
- SLOT="2"
- ;;
kdevelop)
if [[ ${KDE_BUILD_TYPE} = live ]]; then
# @ECLASS-VARIABLE: KDEVELOP_VERSION
@@ -190,10 +187,6 @@
;;
esac
;;
- koffice)
- HOMEPAGE="http://www.koffice.org/"
- LICENSE="GPL-2"
- ;;
kdevelop)
HOMEPAGE="http://www.kdevelop.org/"
LICENSE="GPL-2"
@@ -206,10 +199,8 @@
if version_is_at_least 4.8.50 "${KDE_MINIMAL}"; then
# Upstream has added an *undeclared* dependency on Qt 4.8...
QT_MINIMAL="${QT_MINIMAL:-4.8.0}"
-elif version_is_at_least 4.7.80 "${KDE_MINIMAL}"; then
- QT_MINIMAL="${QT_MINIMAL:-4.7.4}"
else
- QT_MINIMAL="${QT_MINIMAL:-4.7.0}"
+ QT_MINIMAL="${QT_MINIMAL:-4.7.4}"
fi
# Declarative dependencies
@@ -421,7 +412,7 @@
unset COMMONDEPEND
# Fetch section - If the ebuild's category is not 'kde-base' and if it is not a
-# koffice ebuild, the URI should be set in the ebuild itself
+# kdevelop ebuild, the URI should be set in the ebuild itself
_calculate_src_uri() {
debug-print-function ${FUNCNAME} "$@"
@@ -456,20 +447,11 @@
4.[1234567].[12345])
# Stable KDE SC with old .bz2 support
SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
- 4.[89].8[05] | 4.[89].9[0235678])
- # Unstable KDE SC releases
- SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz" ;;
*)
# Stable KDE SC releases
SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz" ;;
esac
;;
- koffice)
- case ${PV} in
- 2.[1234].[6-9]*) SRC_URI="mirror://kde/unstable/${_kmname_pv}/${_kmname_pv}.tar.bz2" ;;
- *) SRC_URI="mirror://kde/stable/${_kmname_pv}/${_kmname_pv}.tar.bz2" ;;
- esac
- ;;
kdevelop|kdevelop-php*|kdevplatform)
case ${KDEVELOP_VERSION} in
4.[12].[6-9]*) SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_VERSION}/src/${P}.tar.bz2" ;;
@@ -537,9 +519,6 @@
ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
ESVN_PROJECT="${PN}${ESVN_PROJECT_SUFFIX}"
;;
- koffice)
- ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
- ;;
*)
ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
;;
@@ -552,9 +531,9 @@
# @ECLASS-VARIABLE: ESVN_UP_FREQ
# @DESCRIPTION:
# This variable is used for specifying the timeout between svn synces
- # for kde-base and koffice modules. Does not affect misc apps.
+ # for kde-base modules. Does not affect misc apps.
# Default value is 1 hour.
- [[ ${KDEBASE} = kde-base || ${KDEBASE} = koffice ]] && ESVN_UP_FREQ=${ESVN_UP_FREQ:-1}
+ [[ ${KDEBASE} = kde-base ]] && ESVN_UP_FREQ=${ESVN_UP_FREQ:-1}
;;
git)
local _kmname
@@ -735,7 +714,7 @@
load_library_dependencies
fi
- # Hack for manuals relying on outdated DTD, only outside kde-base/koffice/...
+ # Hack for manuals relying on outdated DTD, only outside kde-base/...
if [[ -z ${KDEBASE} ]]; then
find "${S}" -name "*.docbook" \
-exec sed -i -r \
1.61 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.60&r2=1.61
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- kde4-functions.eclass 1 Aug 2012 19:38:52 -0000 1.60
+++ kde4-functions.eclass 19 Aug 2012 11:12:35 -0000 1.61
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.60 2012/08/01 19:38:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.61 2012/08/19 11:12:35 johu Exp $
inherit versionator
@@ -32,13 +32,10 @@
# @ECLASS-VARIABLE: KDEBASE
# @DESCRIPTION:
# This gets set to a non-zero value when a package is considered a kde or
-# koffice ebuild.
+# kdevelop ebuild.
if [[ ${CATEGORY} = kde-base ]]; then
debug-print "${ECLASS}: KDEBASE ebuild recognized"
KDEBASE=kde-base
-elif [[ ${KMNAME-${PN}} = koffice ]]; then
- debug-print "${ECLASS}: KOFFICE ebuild recognized"
- KDEBASE=koffice
elif [[ ${KMNAME-${PN}} = kdevelop ]]; then
debug-print "${ECLASS}: KDEVELOP ebuild recognized"
KDEBASE=kdevelop
@@ -92,7 +89,7 @@
# translations, ebuilds must call enable_selected_linguas(). kde4-{base,meta}.eclass does
# this for you.
#
-# Example: KDE_LINGUAS="en_GB de nl"
+# Example: KDE_LINGUAS="de en_GB nl"
if [[ ${KDE_BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then
for _lingua in ${KDE_LINGUAS}; do
IUSE="${IUSE} linguas_${_lingua}"
1.67 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.66&r2=1.67
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kde4-meta.eclass 2 Aug 2012 07:29:29 -0000 1.66
+++ kde4-meta.eclass 19 Aug 2012 11:12:35 -0000 1.67
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.66 2012/08/02 07:29:29 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.67 2012/08/19 11:12:35 johu Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -37,28 +37,6 @@
COMMONDEPEND+=" $(add_kdebase_dep libkdegames)"
fi
;;
- koffice)
- [[ ${PN} != koffice-data ]] && IUSE+=" debug"
- RDEPEND+="
- !app-office/${PN}:0
- !app-office/koffice:0
- !app-office/koffice-meta:0
- "
- if has openexr ${IUSE//+}; then
- COMMONDEPEND+=" media-gfx/imagemagick[openexr?]"
- else
- COMMONDEPEND+=" media-gfx/imagemagick"
- fi
-
- COMMONDEPEND+="
- dev-cpp/eigen:2
- media-libs/fontconfig
- media-libs/freetype:2
- "
- if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then
- COMMONDEPEND+=" >=app-office/koffice-libs-${PV}:${SLOT}"
- fi
- ;;
esac
DEPEND+=" ${COMMONDEPEND}"
@@ -356,20 +334,6 @@
KMEXTRACTONLY+="
kdeutils-version.h"
;;
- koffice)
- KMEXTRACTONLY+="
- filters/config-filters.h.cmake
- "
- case ${PV} in
- 2.[12].*)
- KMEXTRACTONLY+="
- config-endian.h.cmake
- config-openexr.h.cmake
- config-opengl.h.cmake
- config-prefix.h.cmake"
- ;;
- esac
- ;;
esac
# Don't install cmake modules for split ebuilds, to avoid collisions.
# note: kdegraphics >= 4.6.2 does not even have code to do that, so we
@@ -619,14 +583,6 @@
-e 's/find_package(Boost REQUIRED)/macro_optional_find_package(Boost)/' \
-i CMakeLists.txt || die "failed to disable hardcoded checks"
;;
- koffice)
- # Prevent collisions
- if [[ ${PN} != koffice-data ]]; then
- sed -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \
- -i cmake/modules/CMakeLists.txt || die "${LINENO}: sed died in collision prevention section"
- sed -e '/install(.\+config-openexr\.h.\+)/d' \
- -i CMakeLists.txt || die "${LINENO}: sed died in collision prevention section"
- fi
esac
popd > /dev/null
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-functions.eclass kde4-meta.eclass
@ 2013-08-15 15:10 Michael Palimaka (kensington)
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka (kensington) @ 2013-08-15 15:10 UTC (permalink / raw
To: gentoo-commits
kensington 13/08/15 15:10:05
Modified: ChangeLog kde4-base.eclass kde4-functions.eclass
kde4-meta.eclass
Log:
Remove old, unused code.
Revision Changes Path
1.928 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.928&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.928&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.927&r2=1.928
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -r1.927 -r1.928
--- ChangeLog 15 Aug 2013 14:52:58 -0000 1.927
+++ ChangeLog 15 Aug 2013 15:10:05 -0000 1.928
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.927 2013/08/15 14:52:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.928 2013/08/15 15:10:05 kensington Exp $
+
+ 15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass,
+ kde4-functions.eclass, kde4-meta.eclass:
+ Remove old, unused code.
15 Aug 2013; Michael Palimaka <kensington@gentoo.org> kde4-base.eclass,
kde4-functions.eclass:
1.129 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.128&r2=1.129
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- kde4-base.eclass 15 Aug 2013 14:52:58 -0000 1.128
+++ kde4-base.eclass 15 Aug 2013 15:10:05 -0000 1.129
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.128 2013/08/15 14:52:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.129 2013/08/15 15:10:05 kensington Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -444,13 +444,7 @@
# calculate tarball module name
if [[ -n ${KMNAME} ]]; then
- # fixup kdebase-apps name
- case ${KMNAME} in
- kdebase-apps)
- _kmname="kdebase" ;;
- *)
- _kmname="${KMNAME}" ;;
- esac
+ _kmname="${KMNAME}"
else
_kmname=${PN}
fi
@@ -647,7 +641,6 @@
if [[ ${KDE_BUILD_TYPE} = live ]]; then
case ${KDE_SCM} in
svn)
- migrate_store_dir
subversion_src_unpack
;;
git)
1.67 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.66&r2=1.67
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kde4-functions.eclass 15 Aug 2013 14:52:58 -0000 1.66
+++ kde4-functions.eclass 15 Aug 2013 15:10:05 -0000 1.67
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.66 2013/08/15 14:52:58 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.67 2013/08/15 15:10:05 kensington Exp $
inherit versionator
@@ -62,9 +62,6 @@
kdebase-runtime)
EGIT_REPONAME=${EGIT_REPONAME:=kde-runtime}
;;
- kdebase-apps)
- EGIT_REPONAME=${EGIT_REPONAME:=kde-baseapps}
- ;;
esac
fi
@@ -221,60 +218,6 @@
[[ -n "${linguas}" ]] && einfo "Enabling handbook translations:${linguas}"
}
-# @FUNCTION: migrate_store_dir
-# @DESCRIPTION:
-# Universal store dir migration
-# * performs split of kdebase to kdebase-apps when needed
-# * moves playground/extragear kde4-base-style to toplevel dir
-migrate_store_dir() {
- if [[ ${KDE_SCM} != svn ]]; then
- die "migrate_store_dir() only makes sense for subversion"
- fi
-
- local cleandir="${ESVN_STORE_DIR}/KDE"
-
- if [[ -d ${cleandir} ]]; then
- ewarn "'${cleandir}' has been found. Moving contents to new location."
- addwrite "${ESVN_STORE_DIR}"
- # Split kdebase
- local module
- if pushd "${cleandir}"/kdebase/kdebase > /dev/null; then
- for module in `find . -maxdepth 1 -type d -name [a-z0-9]\*`; do
- module="${module#./}"
- mkdir -p "${ESVN_STORE_DIR}/kdebase-${module}" && mv -f "${module}" "${ESVN_STORE_DIR}/kdebase-${module}" || \
- die "Failed to move to '${ESVN_STORE_DIR}/kdebase-${module}'."
- done
- popd > /dev/null
- rm -fr "${cleandir}/kdebase" || \
- die "Failed to remove ${cleandir}/kdebase. You need to remove it manually."
- fi
- # Move the rest
- local pkg
- for pkg in "${cleandir}"/*; do
- mv -f "${pkg}" "${ESVN_STORE_DIR}"/ || eerror "Failed to move '${pkg}'"
- done
- rmdir "${cleandir}" || die "Could not move obsolete KDE store dir. Please move '${cleandir}' contents to appropriate location (possibly ${ESVN_STORE_DIR}) and manually remove '${cleandir}' in order to continue."
- fi
-
- if ! has kde4-meta ${INHERITED}; then
- case ${KMNAME} in
- extragear*|playground*)
- local scmlocalpath="${ESVN_STORE_DIR}"/"${KMNAME}"/"${PN}"
- if [[ -d "${scmlocalpath}" ]]; then
- local destdir="${ESVN_STORE_DIR}"/"${ESVN_PROJECT}"/"`basename "${ESVN_REPO_URI}"`"
- ewarn "'${scmlocalpath}' has been found."
- ewarn "Moving contents to new location: ${destdir}"
- addwrite "${ESVN_STORE_DIR}"
- mkdir -p "${ESVN_STORE_DIR}"/"${ESVN_PROJECT}" && mv -f "${scmlocalpath}" "${destdir}" \
- || die "Failed to move to '${scmlocalpath}'"
- # Try cleaning empty directories
- rmdir "`dirname "${scmlocalpath}"`" 2> /dev/null
- fi
- ;;
- esac
- fi
-}
-
# Functions handling KMLOADLIBS and KMSAVELIBS
# @FUNCTION: save_library_dependencies
1.71 eclass/kde4-meta.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.70&r2=1.71
Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kde4-meta.eclass 7 Apr 2013 17:46:23 -0000 1.70
+++ kde4-meta.eclass 15 Aug 2013 15:10:05 -0000 1.71
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.70 2013/04/07 17:46:23 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.71 2013/08/15 15:10:05 kensington Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -35,11 +35,6 @@
;;
esac
;;
- kdegames)
- if [[ ${PN} != libkdegames ]]; then
- COMMONDEPEND+=" $(add_kdebase_dep libkdegames)"
- fi
- ;;
esac
DEPEND+=" ${COMMONDEPEND}"
@@ -131,7 +126,6 @@
if [[ ${KDE_BUILD_TYPE} = live ]]; then
case "${KDE_SCM}" in
svn)
- migrate_store_dir
S="${WORKDIR}/${P}"
mkdir -p "${S}"
ESVN_RESTRICT="export" subversion_src_unpack
@@ -199,16 +193,7 @@
KMTARPARAMS+=" --xz"
fi
- case ${KMNAME} in
- kdebase-apps)
- # kdebase/apps -> kdebase-apps
- tarball="kdebase-${PV}.tar.${postfix}"
- ;;
- *)
- # Create tarball name from module name (this is the default)
- tarball="${KMNAME}-${PV}.tar.${postfix}"
- ;;
- esac
+ tarball="${KMNAME}-${PV}.tar.${postfix}"
# Full path to source tarball
tarfile="${DISTDIR}/${tarball}"
@@ -286,18 +271,18 @@
# Note that this actually doesn't include KMEXTRA handling.
# In those cases you should care to add the relevant files to KMEXTRACTONLY
case ${KMNAME} in
- kdebase | kdebase-apps | kde-baseapps)
+ kde-baseapps)
KMEXTRACTONLY+="
CTestConfig.cmake
config-apps.h.cmake
ConfigureChecks.cmake"
;;
- kdebase-runtime | kde-runtime)
+ kde-runtime)
KMEXTRACTONLY+="
CTestConfig.cmake
config-runtime.h.cmake"
;;
- kdebase-workspace | kde-workspace)
+ kde-workspace)
KMEXTRACTONLY+="
config-unix.h.cmake
ConfigureChecks.cmake
@@ -306,13 +291,6 @@
startkde.cmake
KDE4WorkspaceConfig.cmake.in"
;;
- kdegames)
- if [[ ${PN} != libkdegames ]]; then
- KMEXTRACTONLY+="
- libkdegames/"
- KMLOADLIBS="${KMLOADLIBS} libkdegames"
- fi
- ;;
kdepim)
if [[ ${PN} != libkdepim ]]; then
KMEXTRACTONLY+="
@@ -329,10 +307,6 @@
kontact/plugins/${PLUGINNAME:-${PN}}/"
fi
;;
- kdeutils)
- KMEXTRACTONLY+="
- kdeutils-version.h"
- ;;
esac
# Don't install cmake modules for split ebuilds, to avoid collisions.
# note: kdegraphics >= 4.6.2 does not even have code to do that, so we
@@ -511,7 +485,7 @@
done
case ${KMNAME} in
- kdebase-workspace | kde-workspace)
+ kde-workspace)
# COLLISION PROTECT section
# Install the startkde script just once, as a part of kde-base/kdebase-startkde,
# not as a part of every package.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-15 15:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-19 11:12 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass kde4-functions.eclass kde4-meta.eclass Johannes Huber (johu)
-- strict thread matches above, loose matches on Subject: below --
2013-08-15 15:10 Michael Palimaka (kensington)
2012-08-01 19:38 Johannes Huber (johu)
2011-12-18 0:00 Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox