* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass kde4-meta-pkg.eclass
@ 2011-06-06 21:38 Jonathan Callen (abcd)
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Callen (abcd) @ 2011-06-06 21:38 UTC (permalink / raw
To: gentoo-commits
abcd 11/06/06 21:38:19
Modified: kde4-base.eclass kde4-functions.eclass
kde4-meta-pkg.eclass
Log:
Goodbye kdeprefix (for >= 4.6.4)
Remove all usage of the kdeprefix flag that doesn't die immediately;
remove the flag itself on >= 4.6.4
Revision Changes Path
1.96 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.95&r2=1.96
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- kde4-base.eclass 6 Jun 2011 18:42:55 -0000 1.95
+++ kde4-base.eclass 6 Jun 2011 21:38:18 -0000 1.96
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.95 2011/06/06 18:42:55 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.96 2011/06/06 21:38:18 abcd Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -175,12 +175,14 @@
if [[ $BUILD_TYPE = live ]]; then
# Disable tests for live ebuilds
RESTRICT+=" test"
- # Live ebuilds in kde-base default to kdeprefix by default
- IUSE+=" +kdeprefix"
- else
- # All other ebuild types default to -kdeprefix as before
+ fi
+
+ # Only add the kdeprefix USE flag for older versions, to help
+ # non-portage package managers handle the upgrade
+ if [[ ${PV} < 4.6.4 ]]; then
IUSE+=" kdeprefix"
fi
+
# This code is to prevent portage from searching GENTOO_MIRRORS for
# packages that will never be mirrored. (As they only will ever be in
# the overlay).
@@ -615,7 +617,7 @@
# @FUNCTION: kde4-base_pkg_setup
# @DESCRIPTION:
-# Do the basic kdeprefix KDEDIR settings and determine with which kde should
+# Do the basic KDEDIR settings and determine with which kde should
# optional applications link
kde4-base_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
@@ -648,40 +650,9 @@
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
&& die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)."
- if [[ ${KDEBASE} = kde-base ]]; then
- if use kdeprefix; then
- KDEDIR=/usr/kde/${SLOT}
- else
- KDEDIR=/usr
- fi
- : ${PREFIX:=${KDEDIR}}
- else
- # Determine KDEDIR by loooking for the closest match with KDE_MINIMAL
- KDEDIR=
- local kde_minimal_met
- for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do
- [[ -z ${kde_minimal_met} ]] && [[ ${slot} = ${KDE_MINIMAL} ]] && kde_minimal_met=1
- if [[ -n ${kde_minimal_met} ]] && has_version "kde-base/kdelibs:${slot}"; then
- if has_version "kde-base/kdelibs:${slot}[kdeprefix]"; then
- KDEDIR=/usr/kde/${slot}
- else
- KDEDIR=/usr
- fi
- break;
- fi
- done
- unset slot
-
- # Bail out if kdelibs required but not found
- if [[ ${KDE_REQUIRED} = always ]] || { [[ ${KDE_REQUIRED} = optional ]] && use kde; }; then
- [[ -z ${KDEDIR} ]] && die "Failed to determine KDEDIR!"
- else
- [[ -z ${KDEDIR} ]] && KDEDIR=/usr
- fi
-
- : ${PREFIX:=/usr}
- fi
- EKDEDIR=${EPREFIX}${KDEDIR}
+ KDEDIR=/usr
+ : ${PREFIX:=/usr}
+ EKDEDIR=${EPREFIX}/usr
# Point pkg-config path to KDE *.pc files
export PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
@@ -832,33 +803,13 @@
# Shadow existing /usr installations
unset KDEDIRS
- # Handle kdeprefix-ed KDE
- if [[ ${KDEDIR} != /usr ]]; then
- # Override some environment variables - only when kdeprefix is different,
- # to not break ccache/distcc
- PATH="${EKDEDIR}/bin:${PATH}"
-
- # Append library search path
- append-ldflags -L"${EKDEDIR}/$(get_libdir)"
-
- # Append full RPATH
- cmakeargs+=(-DCMAKE_SKIP_RPATH=OFF)
-
- # Set cmake prefixes to allow buildsystem to locate valid KDE installation
- # when more are present
- cmakeargs+=(-DCMAKE_SYSTEM_PREFIX_PATH="${EKDEDIR}")
- fi
-
#qmake -query QT_INSTALL_LIBS unavailable when cross-compiling
- tc-is-cross-compiler && cmakeargs+=(-DQT_LIBRARY_DIR=${ROOT}/usr/lib/qt4)
+ tc-is-cross-compiler && cmakeargs+=(-DQT_LIBRARY_DIR=${ROOT}/usr/$(get_libdir)/qt4)
#kde-config -path data unavailable when cross-compiling
tc-is-cross-compiler && cmakeargs+=(-DKDE4_DATA_DIR=${ROOT}/usr/share/apps/)
- # Handle kdeprefix in application itself
- if ! has kdeprefix ${IUSE//+} || ! use kdeprefix; then
- # If prefix is /usr, sysconf needs to be /etc, not /usr/etc
- cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc)
- fi
+ # sysconf needs to be /etc, not /usr/etc
+ cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc)
if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
mycmakeargs=(${mycmakeargs})
@@ -991,15 +942,6 @@
fi
fi
fi
- if has kdeprefix ${IUSE//+} && use kdeprefix; then
- # warning about kdeprefix
- echo
- ewarn "WARNING! You have the kdeprefix useflag enabled."
- eerror "This setting will be removed on or about 2011-06-06."
- ewarn "You are using this setup at your own risk and the kde team does not"
- ewarn "take responsibilities for dead kittens."
- echo
- fi
}
# @FUNCTION: kde4-base_pkg_postrm
1.50 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.49&r2=1.50
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- kde4-functions.eclass 6 Jun 2011 17:51:26 -0000 1.49
+++ kde4-functions.eclass 6 Jun 2011 21:38:18 -0000 1.50
@@ -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.49 2011/06/06 17:51:26 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.50 2011/06/06 21:38:18 abcd Exp $
inherit versionator
@@ -350,8 +350,7 @@
# @FUNCTION: block_other_slots
# @DESCRIPTION:
-# Create blocks for the current package in other slots when
-# installed with USE=-kdeprefix
+# Create blocks for the current package in other slots
block_other_slots() {
debug-print-function ${FUNCNAME} "$@"
@@ -381,8 +380,8 @@
# As an example, if SLOT=live, then
# add_blocker kdelibs 0 :4.3 '<4.3.96:4.4' 9999:live
# will add the following to RDEPEND:
-# !kdeprefix? ( !kde-base/kdelibs:4.3[-kdeprefix] )
-# !kdeprefix? ( !<kde-base/kdelibs-4.3.96:4.4[-kdeprefix] )
+# !kde-base/kdelibs:4.3
+# !<kde-base/kdelibs-4.3.96:4.4
# !<=kde-base/kdelibs-9999:live
add_blocker() {
debug-print-function ${FUNCNAME} "$@"
@@ -429,12 +428,7 @@
local use=${2:+,${2}}
- if [[ ${KDEBASE} = kde-base ]]; then
- echo " !kdeprefix? ( >=kde-base/${1}-${ver}[aqua=,-kdeprefix${use}] )"
- # kdeprefix is no-go for kdepim 4.4
- [[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${SLOT} == 4.4 ]] || \
- echo " kdeprefix? ( >=kde-base/${1}-${ver}:${SLOT}[aqua=,kdeprefix${use}] )"
- elif [[ ${ver} == live ]]; then
+ if [[ ${ver} == live ]]; then
echo " kde-base/${1}:live[aqua=${use}]"
else
echo " >=kde-base/${1}-${ver}[aqua=${use}]"
@@ -535,13 +529,7 @@
else
atom="<=${pkg}-${!var}"
fi
- # we always block our own slot, ignoring kdeprefix
- if [[ ${SLOT} == ${slot} ]]; then
- echo " !${atom}:${slot}${use:+[${use}]}"
- else
- # we only block other slots on -kdeprefix
- echo " !kdeprefix? ( !${atom}:${slot}[-kdeprefix${use:+,${use}}] )"
- fi
+ echo " !${atom}:${slot}${use:+[${use}]}"
done
# This is a special case block for :3.5; it does not use the
1.3 eclass/kde4-meta-pkg.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?r1=1.2&r2=1.3
Index: kde4-meta-pkg.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kde4-meta-pkg.eclass 6 Apr 2011 15:56:32 -0000 1.2
+++ kde4-meta-pkg.eclass 6 Jun 2011 21:38:18 -0000 1.3
@@ -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-pkg.eclass,v 1.2 2011/04/06 15:56:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.3 2011/06/06 21:38:18 abcd Exp $
# @ECLASS: kde4-meta-pkg.eclass
# @MAINTAINER:
@@ -14,7 +14,13 @@
HOMEPAGE="http://www.kde.org/"
LICENSE="GPL-2"
-IUSE="aqua kdeprefix"
+IUSE="aqua"
+
+# Only add the kdeprefix USE flag for older versions, to help
+# non-portage package managers handle the upgrade
+if [[ ${PV} < 4.6.4 ]]; then
+ IUSE+=" kdeprefix"
+fi
SLOT=$(_calculate_kde_slot)
[[ -z ${SLOT} ]] && die "Unsupported ${PV}"
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass kde4-meta-pkg.eclass
@ 2011-06-15 22:03 Jonathan Callen (abcd)
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Callen (abcd) @ 2011-06-15 22:03 UTC (permalink / raw
To: gentoo-commits
abcd 11/06/15 22:03:13
Modified: kde4-base.eclass kde4-functions.eclass
kde4-meta-pkg.eclass
Log:
The Great KDE Slot Move: gentoo-x86 Edition (move all the kde-base/ packages from version-specific slots to :4)
Revision Changes Path
1.100 eclass/kde4-base.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.99&r2=1.100
Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- kde4-base.eclass 15 Jun 2011 00:11:05 -0000 1.99
+++ kde4-base.eclass 15 Jun 2011 22:03:13 -0000 1.100
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.99 2011/06/15 00:11:05 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.100 2011/06/15 22:03:13 abcd Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -52,8 +52,7 @@
# Set slot for KDEBASE known packages
case ${KDEBASE} in
kde-base)
- SLOT=$(get_kde_version)
- [[ -z ${SLOT} ]] && die "Unsupported PV ${PV}"
+ SLOT=4
KDE_MINIMAL="${PV}"
;;
koffice)
@@ -179,8 +178,6 @@
RESTRICT+=" mirror"
;;
esac
- # Block installation of other SLOTS unless kdeprefix
- RDEPEND+=" $(block_other_slots)"
;;
koffice)
HOMEPAGE="http://www.koffice.org/"
@@ -608,13 +605,12 @@
# @ECLASS-VARIABLE: PREFIX
# @DESCRIPTION:
# Set the installation PREFIX for non kde-base applications. It defaults to /usr.
-# kde-base packages go into KDE4 installation directory (KDEDIR) by default.
-# No matter the PREFIX, package will be built against KDE installed in KDEDIR.
+# kde-base packages go into KDE4 installation directory (/usr).
+# No matter the PREFIX, package will be built against KDE installed in /usr.
# @FUNCTION: kde4-base_pkg_setup
# @DESCRIPTION:
-# Do the basic KDEDIR settings and determine with which kde should
-# optional applications link
+# Do some basic settings
kde4-base_pkg_setup() {
debug-print-function ${FUNCNAME} "$@"
@@ -647,10 +643,8 @@
: ${PREFIX:=/usr}
EKDEDIR=${EPREFIX}/usr
- # Point pkg-config path to KDE *.pc files
- export PKG_CONFIG_PATH="${EKDEDIR}/$(get_libdir)/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
# Point to correct QT plugins path
- QT_PLUGIN_PATH="${EKDEDIR}/$(get_libdir)/kde4/plugins/"
+ QT_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/kde4/plugins/"
# Fix XDG collision with sandbox
export XDG_CONFIG_HOME="${T}"
@@ -793,7 +787,7 @@
# Use colors
QTEST_COLORED=1
- # Shadow existing /usr installations
+ # Shadow existing installations
unset KDEDIRS
#qmake -query QT_INSTALL_LIBS unavailable when cross-compiling
1.54 eclass/kde4-functions.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.53&r2=1.54
Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kde4-functions.eclass 15 Jun 2011 12:10:54 -0000 1.53
+++ kde4-functions.eclass 15 Jun 2011 22:03:13 -0000 1.54
@@ -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.53 2011/06/15 12:10:54 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.54 2011/06/15 22:03:13 abcd Exp $
inherit versionator
@@ -44,17 +44,6 @@
KDEBASE=kdevelop
fi
-# @ECLASS-VARIABLE: KDE_SLOTS
-# @DESCRIPTION:
-# The slots used by all KDE versions later than 4.0. The live KDE releases use
-# KDE_LIVE_SLOTS instead. Values should be ordered.
-KDE_SLOTS=( "4.1" "4.2" "4.3" "4.4" "4.5" "4.6" "4.7" )
-
-# @ECLASS-VARIABLE: KDE_LIVE_SLOTS
-# @DESCRIPTION:
-# The slots used by KDE live versions. Values should be ordered.
-KDE_LIVE_SLOTS=( "live" )
-
# determine the build type
if [[ ${PV} = *9999* ]]; then
BUILD_TYPE="live"
@@ -337,22 +326,6 @@
eend $?
}
-# @FUNCTION: block_other_slots
-# @DESCRIPTION:
-# Create blocks for the current package in other slots
-block_other_slots() {
- debug-print-function ${FUNCNAME} "$@"
- local slot
-
- # Temporary HACK, remove this function after slotmove
- # (moved from _do_blocker, as this only needs a very specialized listing)
- for slot in "${KDE_SLOTS[@]}" "${KDE_LIVE_SLOTS[@]}"; do
- if [[ ${slot} != ${SLOT} ]]; then
- echo " !kde-base/${PN}:${slot}"
- fi
- done
-}
-
# @FUNCTION: add_blocker
# @DESCRIPTION:
# Create correct RDEPEND value for blocking correct package.
@@ -377,13 +350,47 @@
add_blocker() {
debug-print-function ${FUNCNAME} "$@"
- RDEPEND+=" $(_do_blocker "$@")"
+ [[ -z ${1} ]] && die "Missing parameter"
+ local pkg=kde-base/$1 atom old_ver="unset" use
+ if [[ $pkg == *\[*\] ]]; then
+ use=${pkg/#*\[/[}
+ pkg=${pkg%\[*\]}
+ fi
+
+ [[ "$3" == *:3.5 ]] && old_ver=${3%:3.5}
+
+ # If the version passed is "0", do nothing
+ if [[ ${2} != 0 ]]; then
+ # If no version was passed, block all versions in this slot
+ if [[ -z ${2} ]]; then
+ atom=${pkg}
+ # If the version passed begins with a "<", then use "<" instead of "<="
+ elif [[ ${2::1} == "<" ]]; then
+ # this also removes the first character of the version, which is a "<"
+ atom="<${pkg}-${2:1}"
+ else
+ atom="<=${pkg}-${2}"
+ fi
+ RDEPEND+=" !${atom}:4${use}"
+ fi
+
+ # Do the same thing as above for :3.5, except that we don't want any
+ # output if no parameter was passed.
+ if [[ ${old_ver} != "unset" ]]; then
+ if [[ -z ${old_ver} ]]; then
+ atom=${pkg}
+ elif [[ ${old_ver::1} == "<" ]]; then
+ atom="<${pkg}-${old_ver:1}"
+ else
+ atom="<=${pkg}-${old_ver}"
+ fi
+ RDEPEND+=" !${atom}:3.5${use}"
+ fi
}
# @FUNCTION: add_kdebase_dep
# @DESCRIPTION:
-# Create proper dependency for kde-base/ dependencies, adding SLOT when needed
-# (and *only* when needed).
+# Create proper dependency for kde-base/ dependencies.
# This takes 1 to 3 arguments. The first being the package name, the optional
# second is additional USE flags to append, and the optional third is the
# version to use instead of the automatic version (use sparingly).
@@ -401,7 +408,7 @@
ver=${KDE_OVERRIDE_MINIMAL}
elif [[ ${KDEBASE} != kde-base ]]; then
ver=${KDE_MINIMAL}
- # if building stable-live version depend just on slot
+ # if building stable-live version depend just on the raw KDE version
# to allow merging packages against more stable basic stuff
elif [[ ${PV} == *.9999 ]]; then
ver=$(get_kde_version)
@@ -411,91 +418,7 @@
[[ -z ${1} ]] && die "Missing parameter"
- echo " >=kde-base/${1}-${ver}[aqua=${2:+,${2}}]"
-}
-
-# _greater_max_in_slot ver slot
-# slot must be 4.x or live
-# returns true if ver is >= the maximum possibile version in slot
-_greater_max_in_slot() {
- local ver=$1
- local slot=$2
- # If slot is live, then return false
- # (nothing is greater than the maximum live version)
- [[ $slot == live ]] && return 1
- # Otherwise, for slot X.Y, test against X.Y.50
- local test=${slot}.50
- version_compare $1 ${test}
- # 1 = '<', 2 = '=', 3 = '>'
- (( $? != 1 ))
-}
-
-# _less_min_in_slot ver slot
-# slot must be 4.x or live
-# returns true if ver is <= the minimum possibile version in slot
-_less_min_in_slot() {
- local ver=$1
- local slot=$2
- # If slot == live, then test with "9999_pre", so that 9999 tests false
- local test=9999_pre
- # If slot == X.Y, then test with X.(Y-1).50
- [[ $slot != live ]] && test=${slot%.*}.$((${slot#*.} - 1)).50
- version_compare $1 ${test}
- # 1 = '<', 2 = '=', 3 = '>'
- (( $? != 3 ))
-}
-
-# Internal function used for add_blocker and block_other_slots
-# This takes the same parameters as add_blocker, but echos to
-# stdout instead of updating a variable.
-_do_blocker() {
- debug-print-function ${FUNCNAME} "$@"
-
- [[ -z ${1} ]] && die "Missing parameter"
- local pkg=kde-base/$1 use
- shift
- if [[ $pkg == *\[*\] ]]; then
- use=${pkg#*\[}
- use=${use%\]}
- pkg=${pkg%\[*\]}
- fi
-
- local slot ver="$1" atom old_ver="unset"
- [[ "$2" == *:3.5 ]] && old_ver=${2%:3.5}
-
- for slot in ${KDE_SLOTS[@]} ${KDE_LIVE_SLOTS[@]}; do
- # If no version was passed, or the version is greater than the maximum
- # possible version in this slot, block all versions in this slot
- if [[ ${ver} == "unset" ]] || [[ -z ${ver} ]] || _greater_max_in_slot ${ver#<} ${slot}; then
- atom=${pkg}
- # If the version is "0" or less than the minimum possible version in
- # this slot, do nothing
- elif [[ ${ver} == "0" ]] || _less_min_in_slot ${ver#<} ${slot}; then
- continue
- # If the version passed begins with a "<", then use "<" instead of "<="
- elif [[ ${ver::1} == "<" ]]; then
- # this also removes the first character of the version, which is a "<"
- atom="<${pkg}-${ver:1}"
- else
- atom="<=${pkg}-${ver}"
- fi
- echo " !${atom}:${slot}${use:+[${use}]}"
- done
-
- # This is a special case block for :3.5; it does not use the
- # default version passed, and no blocker is output *unless* a version
- # is passed, or ":3.5" is passed to explicitly request a block on all
- # 3.5 versions.
- if [[ ${old_ver} != "unset" && ${old_ver} != "0" ]]; then
- if [[ -z ${old_ver} ]]; then
- atom=${pkg}
- elif [[ ${old_ver::1} == "<" ]]; then
- atom="<${pkg}-${old_ver:1}"
- else
- atom="<=${pkg}-${old_ver}"
- fi
- echo " !${atom}:3.5${use:+[${use}]}"
- fi
+ echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
}
# local function to enable specified translations for specified directory
1.6 eclass/kde4-meta-pkg.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta-pkg.eclass?r1=1.5&r2=1.6
Index: kde4-meta-pkg.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kde4-meta-pkg.eclass 9 Jun 2011 21:05:45 -0000 1.5
+++ kde4-meta-pkg.eclass 15 Jun 2011 22:03:13 -0000 1.6
@@ -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-pkg.eclass,v 1.5 2011/06/09 21:05:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.6 2011/06/15 22:03:13 abcd Exp $
# @ECLASS: kde4-meta-pkg.eclass
# @MAINTAINER:
@@ -22,7 +22,4 @@
IUSE+=" kdeprefix"
fi
-SLOT=$(get_kde_version)
-[[ -z ${SLOT} ]] && die "Unsupported ${PV}"
-
-RDEPEND="$(block_other_slots)"
+SLOT=4
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-15 22:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-15 22:03 [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass kde4-meta-pkg.eclass Jonathan Callen (abcd)
-- strict thread matches above, loose matches on Subject: below --
2011-06-06 21:38 Jonathan Callen (abcd)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox