* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2007-09-27 20:25 Wulf Krueger (philantrop)
0 siblings, 0 replies; 15+ messages in thread
From: Wulf Krueger (philantrop) @ 2007-09-27 20:25 UTC (permalink / raw
To: gentoo-commits
philantrop 07/09/27 20:25:33
Modified: kde-functions.eclass
Log:
The buildsycoca function has been working fine for ~arch for almost 17 months now. Time to allow it to run for stable, too.
Revision Changes Path
1.158 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.157&r2=1.158
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kde-functions.eclass 19 Aug 2007 07:40:38 -0000 1.157
+++ kde-functions.eclass 27 Sep 2007 20:25:32 -0000 1.158
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.157 2007/08/19 07:40:38 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.158 2007/09/27 20:25:32 philantrop Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -896,7 +896,7 @@
[[ $EBUILD_PHASE != postinst ]] && [[ $EBUILD_PHASE != postrm ]] && \
die "buildsycoca() has to be calles in pkg_postinst() and pkg_postrm()."
- if [[ -x ${KDEDIR}/bin/kbuildsycoca ]] && [[ -z ${ROOT} || ${ROOT} == "/" ]] && has "~${ARCH}" "${ACCEPT_KEYWORDS}"; then
+ if [[ -x ${KDEDIR}/bin/kbuildsycoca ]] && [[ -z ${ROOT} || ${ROOT} == "/" ]] ; then
# First of all, make sure that the /usr/share/services directory exists
# and it has the right permissions
mkdir -p /usr/share/services
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2007-12-16 16:28 Wulf Krueger (philantrop)
0 siblings, 0 replies; 15+ messages in thread
From: Wulf Krueger (philantrop) @ 2007-12-16 16:28 UTC (permalink / raw
To: gentoo-commits
philantrop 07/12/16 16:28:42
Modified: kde-functions.eclass
Log:
Added knetwalk which is derived from kdegames.
Revision Changes Path
1.159 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.159&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.158&r2=1.159
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- kde-functions.eclass 27 Sep 2007 20:25:32 -0000 1.158
+++ kde-functions.eclass 16 Dec 2007 16:28:41 -0000 1.159
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.158 2007/09/27 20:25:32 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.159 2007/12/16 16:28:41 philantrop Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -142,6 +142,7 @@
kde-base/kdegames kde-base/klines
kde-base/kdegames kde-base/kmahjongg
kde-base/kdegames kde-base/kmines
+kde-base/kdegames kde-base/knetwalk
kde-base/kdegames kde-base/kolf
kde-base/kdegames kde-base/konquest
kde-base/kdegames kde-base/kpat
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-01-17 22:39 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 15+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-01-17 22:39 UTC (permalink / raw
To: gentoo-commits
ingmar 08/01/17 22:39:23
Modified: kde-functions.eclass
Log:
Make sure that KDE programs from the :kde-4 or :kde-svn SLOT don't show up in the K-menu for KDE 3.5.
Revision Changes Path
1.160 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.159&r2=1.160
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- kde-functions.eclass 16 Dec 2007 16:28:41 -0000 1.159
+++ kde-functions.eclass 17 Jan 2008 22:39:22 -0000 1.160
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.159 2007/12/16 16:28:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.160 2008/01/17 22:39:22 ingmar Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -905,6 +905,10 @@
chmod 0755 /usr/share/services
ebegin "Running kbuildsycoca to build global database"
+ # Filter all KDEDIRs not belonging to the current SLOT from XDG_DATA_DIRS
+ # before running kbuildsycoca. This makes sure they don't show up in the
+ # 3.5 K-menu unless the user manually adds them.
+ XDG_DATA_DIRS="/usr/share:${KDEDIR}/share:/usr/local/share"
${KDEDIR}/bin/kbuildsycoca --global --noincremental &> /dev/null
eend $?
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-01-19 14:20 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 15+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-01-19 14:20 UTC (permalink / raw
To: gentoo-commits
ingmar 08/01/19 14:20:17
Modified: kde-functions.eclass
Log:
kde-functions.eclass: need-kde now adds an {,R}DEPEND on <kde-base/kdelibs-3.80, the first KDE 4 preview, see bug 206528.
Revision Changes Path
1.161 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.160&r2=1.161
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kde-functions.eclass 17 Jan 2008 22:39:22 -0000 1.160
+++ kde-functions.eclass 19 Jan 2008 14:20:16 -0000 1.161
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.160 2008/01/17 22:39:22 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.161 2008/01/19 14:20:16 ingmar Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -661,10 +661,13 @@
RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}"
fi
else
- # Things outside kde-base only need a minimum version
+ # Things outside kde-base need a minimum version,
+ # but kde-base/kdelibs:kde-4 mustn't satisfy it.
min-kde-ver ${KDEVER}
- DEPEND="${DEPEND} >=kde-base/kdelibs-${selected_version}"
- RDEPEND="${x_DEPEND} >=kde-base/kdelibs-${selected_version}"
+ DEPEND="${DEPEND}
+ >=kde-base/kdelibs-${selected_version} <kde-base/kdelibs-3.80"
+ RDEPEND="${x_DEPEND}
+ >=kde-base/kdelibs-${selected_version} <kde-base/kdelibs-3.80"
fi
qtver-from-kdever ${KDEVER}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-01-19 14:36 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 15+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-01-19 14:36 UTC (permalink / raw
To: gentoo-commits
ingmar 08/01/19 14:36:35
Modified: kde-functions.eclass
Log:
kde-functions.eclass: Fix up previous commit, depend on =kde-base/kdelibs-3.5*, see bug 206528.
Revision Changes Path
1.162 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.162&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.162&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.161&r2=1.162
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- kde-functions.eclass 19 Jan 2008 14:20:16 -0000 1.161
+++ kde-functions.eclass 19 Jan 2008 14:36:35 -0000 1.162
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.161 2008/01/19 14:20:16 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.162 2008/01/19 14:36:35 ingmar Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -665,9 +665,9 @@
# but kde-base/kdelibs:kde-4 mustn't satisfy it.
min-kde-ver ${KDEVER}
DEPEND="${DEPEND}
- >=kde-base/kdelibs-${selected_version} <kde-base/kdelibs-3.80"
+ >=kde-base/kdelibs-${selected_version} =kde-base/kdelibs-3.5*"
RDEPEND="${x_DEPEND}
- >=kde-base/kdelibs-${selected_version} <kde-base/kdelibs-3.80"
+ >=kde-base/kdelibs-${selected_version} =kde-base/kdelibs-3.5*"
fi
qtver-from-kdever ${KDEVER}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-02-10 0:31 Wulf Krueger (philantrop)
0 siblings, 0 replies; 15+ messages in thread
From: Wulf Krueger (philantrop) @ 2008-02-10 0:31 UTC (permalink / raw
To: gentoo-commits
philantrop 08/02/10 00:31:43
Modified: kde-functions.eclass
Log:
Added an entry for knetworkconf.
Revision Changes Path
1.163 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.163&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.163&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.162&r2=1.163
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- kde-functions.eclass 19 Jan 2008 14:36:35 -0000 1.162
+++ kde-functions.eclass 10 Feb 2008 00:31:43 -0000 1.163
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.162 2008/01/19 14:36:35 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.163 2008/02/10 00:31:43 philantrop Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -35,6 +35,7 @@
kde-base/kdeadmin kde-base/kcron
kde-base/kdeadmin kde-base/kdat
kde-base/kdeadmin kde-base/kdeadmin-kfile-plugins
+kde-base/kdeadmin kde-base/knetworkconf
kde-base/kdeadmin kde-base/kpackage
kde-base/kdeadmin kde-base/ksysv
kde-base/kdeadmin kde-base/kuser
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-02-14 19:17 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 15+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-02-14 19:17 UTC (permalink / raw
To: gentoo-commits
ingmar 08/02/14 19:17:30
Modified: kde-functions.eclass
Log:
Depend on =kde-base/kdelibs-3.5*, regardless of
Revision Changes Path
1.164 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.164&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.164&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.163&r2=1.164
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- kde-functions.eclass 10 Feb 2008 00:31:43 -0000 1.163
+++ kde-functions.eclass 14 Feb 2008 19:17:30 -0000 1.164
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.163 2008/02/10 00:31:43 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.164 2008/02/14 19:17:30 ingmar Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -665,10 +665,8 @@
# Things outside kde-base need a minimum version,
# but kde-base/kdelibs:kde-4 mustn't satisfy it.
min-kde-ver ${KDEVER}
- DEPEND="${DEPEND}
- >=kde-base/kdelibs-${selected_version} =kde-base/kdelibs-3.5*"
- RDEPEND="${x_DEPEND}
- >=kde-base/kdelibs-${selected_version} =kde-base/kdelibs-3.5*"
+ DEPEND="${DEPEND} =kde-base/kdelibs-3.5*"
+ RDEPEND="${x_DEPEND} =kde-base/kdelibs-3.5*"
fi
qtver-from-kdever ${KDEVER}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-02-19 0:31 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 15+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-02-19 0:31 UTC (permalink / raw
To: gentoo-commits
ingmar 08/02/19 00:31:12
Modified: kde-functions.eclass
Log:
kde-functions.eclass: Kill need-auto{conf,make}, bug 148719, labelled as "don't use" for 1,5 year now...
Revision Changes Path
1.165 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.165&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.165&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.164&r2=1.165
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- kde-functions.eclass 14 Feb 2008 19:17:30 -0000 1.164
+++ kde-functions.eclass 19 Feb 2008 00:31:12 -0000 1.165
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.164 2008/02/14 19:17:30 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.165 2008/02/19 00:31:12 ingmar Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -350,39 +350,6 @@
EOF
return 1
}
-# convinience functions for requesting autotools versions
-need-automake() {
-
- debug-print-function $FUNCNAME $*
-
- echo "Please don't use need-automake function anymore, see bug #148719."
-
- unset WANT_AUTOMAKE
-
- case $1 in
- 1.4) export WANT_AUTOMAKE=1.4;;
- 1.5) export WANT_AUTOMAKE=1.5;;
- 1.6) export WANT_AUTOMAKE=1.6;;
- 1.7) export WANT_AUTOMAKE='1.7';;
- *) echo "!!! $FUNCNAME: Error: unrecognized automake version $1 requested";;
- esac
-
-}
-
-need-autoconf() {
-
- debug-print-function $FUNCNAME $*
-
- echo "Please don't use need-autoconf function anymore, see bug #148719."
-
- unset WANT_AUTOCONF
- case $1 in
- 2.1) export WANT_AUTOCONF=2.1;;
- 2.5) export WANT_AUTOCONF=2.5;;
- *) echo "!!! $FUNCNAME: Error: unrecognized autoconf version $1 requested";;
- esac
-
-}
# Usage: deprange minver maxver package [...]
# For minver, a -rN part is supported. For both minver and maxver, _alpha/beta/pre/rc suffixes
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-05-17 15:16 Carsten Lohrke (carlo)
0 siblings, 0 replies; 15+ messages in thread
From: Carsten Lohrke (carlo) @ 2008-05-17 15:16 UTC (permalink / raw
To: gentoo-commits
carlo 08/05/17 15:16:10
Modified: kde-functions.eclass
Log:
There is a difference between RDEPEND unset and explicitly set empty - cf. bug # 50721. Minor cleanup.
Revision Changes Path
1.167 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.166&r2=1.167
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- kde-functions.eclass 20 Feb 2008 20:59:43 -0000 1.166
+++ kde-functions.eclass 17 May 2008 15:16:10 -0000 1.167
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.166 2008/02/20 20:59:43 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.167 2008/05/17 15:16:10 carlo Exp $
# @ECLASS: kde-functions.eclass
# @MAINTAINER:
@@ -633,7 +633,7 @@
# determine install locations
set-kdedir ${KDEVER}
- if [[ -n "${RDEPEND}" ]]; then
+ if [[ "${RDEPEND-unset}" != "unset" ]]; then
x_DEPEND="${RDEPEND}"
else
x_DEPEND="${DEPEND}"
@@ -716,20 +716,13 @@
# install prefix
if [[ -n "$KDEPREFIX" ]]; then
export PREFIX="$KDEPREFIX"
- elif [[ "$KDEMAJORVER" == "2" ]]; then
- export PREFIX="/usr/kde/2"
else
if [[ -z "$KDEBASE" ]]; then
export PREFIX="/usr"
else
case $KDEMAJORVER.$KDEMINORVER in
- 3.0) export PREFIX="/usr/kde/3";;
- 3.1) export PREFIX="/usr/kde/3.1";;
- 3.2) export PREFIX="/usr/kde/3.2";;
- 3.3) export PREFIX="/usr/kde/3.3";;
- 3.4) export PREFIX="/usr/kde/3.4";;
3.5) export PREFIX="/usr/kde/3.5";;
- 5.0) export PREFIX="/usr/kde/cvs";;
+ 5.0) export PREFIX="/usr/kde/svn";;
*) die "failed to set PREFIX";;
esac
fi
@@ -738,12 +731,10 @@
# kdelibs location
if [[ -n "$KDELIBSDIR" ]]; then
export KDEDIR="$KDELIBSDIR"
- elif [[ "$KDEMAJORVER" == "2" ]]; then
- export KDEDIR="/usr/kde/2"
else
if [[ -z "$KDEBASE" ]]; then
# find the latest kdelibs installed
- for x in /usr/kde/{cvs,3.5,3.4,3.3,3.2,3.1,3.0,3} "${PREFIX}" \
+ for x in /usr/kde/{svn,3.5} "${PREFIX}" \
"${KDE3LIBSDIR}" "${KDELIBSDIR}" "${KDE3DIR}" "${KDEDIR}" /usr/kde/*; do
if [[ -f "${x}/include/kwin.h" ]]; then
debug-print found
@@ -754,13 +745,8 @@
else
# kde-base ebuilds must always use the exact version of kdelibs they came with
case $KDEMAJORVER.$KDEMINORVER in
- 3.0) export KDEDIR="/usr/kde/3";;
- 3.1) export KDEDIR="/usr/kde/3.1";;
- 3.2) export KDEDIR="/usr/kde/3.2";;
- 3.3) export KDEDIR="/usr/kde/3.3";;
- 3.4) export KDEDIR="/usr/kde/3.4";;
3.5) export KDEDIR="/usr/kde/3.5";;
- 5.0) export KDEDIR="/usr/kde/cvs";;
+ 5.0) export KDEDIR="/usr/kde/svn";;
*) die "failed to set KDEDIR";;
esac
fi
@@ -787,10 +773,6 @@
fi
case ${QTVER} in
- 2*)
- DEPEND="${DEPEND} =x11-libs/${QT}-2.3*"
- RDEPEND="${x_DEPEND} =x11-libs/${QT}-2.3*"
- ;;
3*)
case ${EAPI:-0} in
# Add EAPIs without SLOT dependencies.
@@ -824,7 +806,6 @@
local ver
case $1 in
- 2*) ver=2.3.1;;
3.1*) ver=3.1;;
3.2*) ver=3.2;;
3.3*) ver=3.3;;
@@ -843,7 +824,6 @@
debug-print-function $FUNCNAME "$@"
case $1 in
- 2*) selected_version="2.2.2";;
3.0*) selected_version="3.0";;
3.1*) selected_version="3.1";;
3.2*) selected_version="3.2";;
@@ -896,7 +876,7 @@
kde_remove_flag() {
debug-print-function $FUNCNAME "$@"
- cd "${S}"/${1} || die "cd to '${S}/${1}' failed."
+ cd "${S}"/${1} || die "cd to '${S}/${1}' failed."
[[ -n "$2" ]] || die "missing argument to kde_remove_flag"
cp Makefile Makefile.orig
@@ -964,4 +944,3 @@
debug-print "${ECLASS}: KDEBASE ebuild recognized"
export KDEBASE="true"
fi
-
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-05-17 15:19 Carsten Lohrke (carlo)
0 siblings, 0 replies; 15+ messages in thread
From: Carsten Lohrke (carlo) @ 2008-05-17 15:19 UTC (permalink / raw
To: gentoo-commits
carlo 08/05/17 15:19:56
Modified: kde-functions.eclass
Log:
Simplify postprocess_desktop_entries().
Revision Changes Path
1.168 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.167&r2=1.168
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- kde-functions.eclass 17 May 2008 15:16:10 -0000 1.167
+++ kde-functions.eclass 17 May 2008 15:19:56 -0000 1.168
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.167 2008/05/17 15:16:10 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.168 2008/05/17 15:19:56 carlo Exp $
# @ECLASS: kde-functions.eclass
# @MAINTAINER:
@@ -917,20 +917,11 @@
local desktop_entries="$(find "${D}${PREFIX}/share/applnk" -mindepth 2 -maxdepth 2 \
-name '*\.desktop' -not -path '*.hidden*' 2>/dev/null)"
- local uninstall_file="[Desktop Entry]
-Encoding=UTF-8
-Hidden=true"
-
if [[ -n ${desktop_entries} ]]; then
for entry in ${desktop_entries} ; do
- echo "${uninstall_file}" | diff -qs ${entry} - &> /dev/null
- if [[ $? != 0 ]]; then
- if [[ ! -f ${D}${PREFIX}/share/applications/kde/$(basename ${entry}) ]]; then
- dodir "${PREFIX}"/share/applications/kde
- mv ${entry} "${D}${PREFIX}"/share/applications/kde
- else
- ewarn "QA: $(basename ${entry}) already exists in ${PREFIX}/share/applications/kde."
- fi
+ if ! [[ -f "${D}${PREFIX}"/share/applications/kde/${entry##*/} ]] ; then
+ dodir "${PREFIX}"/share/applications/kde
+ mv ${entry} "${D}${PREFIX}"/share/applications/kde
fi
done
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-07-27 19:04 Carsten Lohrke (carlo)
0 siblings, 0 replies; 15+ messages in thread
From: Carsten Lohrke (carlo) @ 2008-07-27 19:04 UTC (permalink / raw
To: gentoo-commits
carlo 08/07/27 19:04:30
Modified: kde-functions.eclass
Log:
Get rid of deprecated qt_min_version().
Revision Changes Path
1.169 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.169&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.169&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.168&r2=1.169
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- kde-functions.eclass 17 May 2008 15:19:56 -0000 1.168
+++ kde-functions.eclass 27 Jul 2008 19:04:29 -0000 1.169
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.168 2008/05/17 15:19:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.169 2008/07/27 19:04:29 carlo Exp $
# @ECLASS: kde-functions.eclass
# @MAINTAINER:
@@ -773,16 +773,8 @@
fi
case ${QTVER} in
- 3*)
- case ${EAPI:-0} in
- # Add EAPIs without SLOT dependencies.
- 0) DEPEND="${DEPEND} $(qt_min_version ${QTVER})"
- RDEPEND="${x_DEPEND} $(qt_min_version ${QTVER})"
- ;;
- *) DEPEND="${DEPEND} >=x11-libs/qt-${QTVER}:3"
- RDEPEND="${RDEPEND} >=x11-libs/qt-${QTVER}:3"
- ;;
- esac
+ 3*) DEPEND="${DEPEND} =x11-libs/qt-3*"
+ RDEPEND="${RDEPEND} =x11-libs/qt-3*"
;;
*) echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;;
esac
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2008-10-04 15:28 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 15+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2008-10-04 15:28 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 08/10/04 15:28:59
Modified: kde-functions.eclass
Log:
Updated kde-functions eclass to install media-libs/libkipi, media-libs/libkdcraw and media-libs/libkexiv2 out of /usr
and into kde-3.5 prefix (/usr/kde/3.5). Thanks to Jan Kundrát (jkt) for the patch.
It's the first part to fix bug 239282.
Revision Changes Path
1.171 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.171&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.171&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.170&r2=1.171
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kde-functions.eclass 27 Aug 2008 15:29:26 -0000 1.170
+++ kde-functions.eclass 4 Oct 2008 15:28:58 -0000 1.171
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.170 2008/08/27 15:29:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.171 2008/10/04 15:28:58 jmbsvicetto Exp $
# @ECLASS: kde-functions.eclass
# @MAINTAINER:
@@ -718,7 +718,10 @@
export PREFIX="$KDEPREFIX"
else
if [[ -z "$KDEBASE" ]]; then
- export PREFIX="/usr"
+ case $PN in
+ libkipi|libkdcraw|libkexiv2) export PREFIX="/usr/kde/3.5";;
+ *) export PREFIX="/usr";;
+ esac
else
case $KDEMAJORVER.$KDEMINORVER in
3.5) export PREFIX="/usr/kde/3.5";;
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2009-05-13 21:00 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 15+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-05-13 21:00 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/05/13 21:00:42
Modified: kde-functions.eclass
Log:
Add export for kdedir when not working in kde-base.
Revision Changes Path
1.173 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.173&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.173&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.172&r2=1.173
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- kde-functions.eclass 12 May 2009 12:55:46 -0000 1.172
+++ kde-functions.eclass 13 May 2009 21:00:42 -0000 1.173
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.172 2009/05/12 12:55:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.173 2009/05/13 21:00:42 scarabeus Exp $
# @ECLASS: kde-functions.eclass
# @MAINTAINER:
@@ -717,11 +717,15 @@
if [[ -n "$KDEPREFIX" ]]; then
export PREFIX="$KDEPREFIX"
else
- case $KDEMAJORVER.$KDEMINORVER in
- 3*) export PREFIX="/usr/kde/3.5";;
- 5.0) export PREFIX="/usr/kde/svn";;
- *) die "failed to set PREFIX";;
- esac
+ if [[ -z "$KDEBASE" ]]; then
+ PREFIX="/usr/kde/3.5"
+ else
+ case $KDEMAJORVER.$KDEMINORVER in
+ 3*) export PREFIX="/usr/kde/3.5";;
+ 5.0) export PREFIX="/usr/kde/svn";;
+ *) die "failed to set PREFIX";;
+ esac
+ fi
fi
# kdelibs location
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2009-11-01 9:43 Jonathan Callen (abcd)
0 siblings, 0 replies; 15+ messages in thread
From: Jonathan Callen (abcd) @ 2009-11-01 9:43 UTC (permalink / raw
To: gentoo-commits
abcd 09/11/01 09:43:36
Modified: kde-functions.eclass
Log:
Drop the old deprange code, no longer used (if needed, use EAPI-1 SLOT deps)
Revision Changes Path
1.174 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.174&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.174&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.173&r2=1.174
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- kde-functions.eclass 13 May 2009 21:00:42 -0000 1.173
+++ kde-functions.eclass 1 Nov 2009 09:43:35 -0000 1.174
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.173 2009/05/13 21:00:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.174 2009/11/01 09:43:35 abcd Exp $
# @ECLASS: kde-functions.eclass
# @MAINTAINER:
@@ -365,257 +365,6 @@
return 1
}
-# @FUNCTION: deprange
-# @USAGE: < minver > < maxver > < package > [...]
-# @DESCRIPTION:
-# For minver, a -rN part is supported. For both minver and maxver, _alpha/beta/pre/rc suffixes
-# are supported, but not _p suffixes or teminating letters (eg 3.3.1a).
-#
-# This function echoes a string of the form (for package="kde-base/kdelibs")
-# || ( =kde-base/kdelibs-3.3.1-r1 ~kde-base/kdelibs-3.3.2 ~kde-base/kdelibs-3.3.3 )
-# This dep means versions of package from maxver through minver will be acceptable.
-# Note that only the kde versioning scheme is supported - ie x.y, and we only iterate through y
-# (i.e. x can contain more . separators).
-deprange() {
- local list="$(deprange-list $@)"
- if [[ ${list%% *} == "${list}" ]]; then
- echo "${list}"
- else
- echo "|| ( ${list} )"
- fi
-}
-
-deprange-list() {
- # Assign, parse params
- local MINVER=$1; shift
- local MAXVER=$1; shift
-
- # Workaround for 3.5.0_beta1 ebuilds being mistakenly versioned as 3.5_beta1
- # Ugly kludge, but will disappear once 3.5 prerelease ebuilds are removed from portage
- if [[ "$MINVER" == "3.5_beta1" ]]; then
-
- MINVER="3.5.0_beta1"
- FINALOPTIONVER="3.5_beta1"
- fi
- if [[ "$MAXVER" == "3.5_beta1" ]]; then
- MAXVER="3.5.0_beta1"
- fi
-
- # Get base version - the major X.Y components
- local BASEVER=${MINVER%.*}
- if [[ "${MAXVER%.*}" != "$BASEVER" ]]; then
- die "deprange(): unsupported parameters $MINVER $MAXVER - BASEVER must be identical"
- fi
-
- # Get version suffixes
- local MINSUFFIX MAXSUFFIX
- if [[ "$MINVER" != "${MINVER/_}" ]]; then
- MINSUFFIX=${MINVER##*_}
- SUFFIXLESSMINVER=${MINVER%_*}
- else
- SUFFIXLESSMINVER=$MINVER
- fi
- if [[ "$MAXVER" != "${MAXVER/_}" ]]; then
- MAXSUFFIX=${MAXVER##*_}
- SUFFIXLESSMAXVER=${MAXVER%_*}
- else
- SUFFIXLESSMAXVER=$MAXVER
- fi
-
- # Separate out the optional lower bound revision number
- if [[ "$MINVER" != "${MINVER/-}" ]]; then
- local MINREV=${MINVER##*-}
- fi
-
- # Get minor version components (the 1 in 3.3.1)
- local MINMINOR=${SUFFIXLESSMINVER##*.}
- local MAXMINOR=${SUFFIXLESSMAXVER##*.}
-
- # Iterate over packages
- while [[ -n "$1" ]]; do
- local PACKAGE=$1
- shift
-
- local NEWDEP=""
-
- # If the two versions are identical, our job is simple
- if [[ "$MINVER" == "$MAXVER" ]]; then
- NEWDEP="~$PACKAGE-$MINVER"
-
- # If the range bounds differ only by their suffixes
- elif [[ "$MINMINOR" == "$MAXMINOR" ]]; then
- NEWDEP="$(deprange-iterate-suffixes "~$PACKAGE-$BASEVER.$MINMINOR" $MINSUFFIX $MAXSUFFIX)"
-
- # Revision constraint on lower bound
- if [[ -n "$MINREV" ]]; then
- NEWDEP="$NEWDEP
- $(deprange-iterate-numbers "=$PACKAGE-$BASEVER.${MINMINOR}_$MINSUFFIX-r" $MINREV 50)"
- fi
-
- # If the minor version numbers are different too
- else
- # Max version's allowed suffixes
- if [[ -n "$MAXSUFFIX" ]]; then
- NEWDEP="$(deprange-iterate-suffixes "~$PACKAGE-$BASEVER.$MAXMINOR" alpha1 $MAXSUFFIX)"
- fi
-
- STARTMINOR="${MINMINOR}"
-
- # regular versions in between
- if [[ -n "$MINREV" ]] && [[ -z "$MINSUFFIX" ]]; then
- let STARTMINOR++
- fi
- NEWDEP="$NEWDEP
- $(deprange-iterate-numbers "~${PACKAGE}-${BASEVER}." $STARTMINOR $MAXMINOR)"
-
- # Min version's allowed suffixes
- if [[ -n "$MINSUFFIX" ]]; then
- NEWDEP="$NEWDEP
- $(deprange-iterate-suffixes "~$PACKAGE-$BASEVER.$MINMINOR" $MINSUFFIX rc10)"
- fi
- if [[ -n "$MINREV" ]]; then
- local BASE
- if [[ -n "$MINSUFFIX" ]]; then
- BASE="=$PACKAGE-$BASEVER.${MINMINOR}_${MINSUFFIX%-r*}-r"
- else
- BASE="=$PACKAGE-$BASEVER.${MINMINOR%-r*}-r"
- fi
- NEWDEP="$NEWDEP
- $(deprange-iterate-numbers $BASE ${MINREV#r} 50)"
- fi
- fi
-
- # second part of kludge
- if [[ -n "$FINALOPTIONVER" ]]; then
- NEWDEP="$NEWDEP ~$PACKAGE-$FINALOPTIONVER"
- fi
-
- # Output
- echo -n $NEWDEP
- done
-}
-
-# This internal function iterates over simple ranges where only a numerical suffix changes
-# Parameters: base name, lower bound, upper bound
-deprange-iterate-numbers() {
- local package=$1 lower=$2 upper=$3 i newdep=""
- for (( i=$upper ; $i >= $lower ; i-- )) ; do
- newdep="$newdep ${package}${i}"
- done
- echo -n $newdep
-}
-
-# This internal function iterates over ranges with the same base version and different suffixes.
-# If the lower bound has a revision number, this function won't mention the lower bound in its output.
-# Parameters: base name, lower version suffix, upper version suffix
-# eg: deprange-iterate-suffixes ~kde-base/libkonq-3.4.0 alpha8 beta2
-deprange-iterate-suffixes() {
- local NAME=$1 MINSUFFIX=$2 MAXSUFFIX=$3
-
- # Separate out the optional lower bound revision number
- if [[ "$MINSUFFIX" != "${MINSUFFIX/-}" ]]; then
- local MINREV=${MINSUFFIX##*-}
- fi
- MINSUFFIX=${MINSUFFIX%-*}
-
- # Separate out the version suffixes
- local MINalpha MINbeta MINpre MINrc
- if [[ "$MINSUFFIX" != "${MINSUFFIX/alpha}" ]]; then
- MINalpha="${MINSUFFIX##alpha}"
- elif [[ "$MINSUFFIX" != "${MINSUFFIX/beta}" ]]; then
- MINbeta="${MINSUFFIX##beta}"
- elif [[ "$MINSUFFIX" != "${MINSUFFIX/pre}" ]]; then
- MINpre="${MINSUFFIX##pre}"
- elif [[ "$MINSUFFIX" != "${MINSUFFIX/rc}" ]]; then
- MINrc="${MINSUFFIX##rc}"
- else
- die "deprange(): version suffix $MINSUFFIX (probably _pN) not supported"
- fi
- local MAXalpha MAXbeta MAXpre MAXrc
- if [[ "$MAXSUFFIX" != "${MAXSUFFIX/alpha}" ]]; then
- MAXalpha="${MAXSUFFIX##alpha}"
- elif [[ "$MAXSUFFIX" != "${MAXSUFFIX/beta}" ]]; then
- MAXbeta="${MAXSUFFIX##beta}"
- elif [[ "$MAXSUFFIX" != "${MAXSUFFIX/pre}" ]]; then
- MAXpre="${MAXSUFFIX##pre}"
- elif [[ "$MAXSUFFIX" != "${MAXSUFFIX/rc}" ]]; then
- MAXrc="${MAXSUFFIX##rc}"
- else
- die "deprange(): version suffix $MAXSUFFIX (probably _pN) not supported"
- fi
-
- local started="" NEWDEP="" var
-
- # Loop over version suffixes
- for suffix in rc pre beta alpha; do
- local upper="" lower=""
-
- # If -n $started, we've encountered the upper bound in a previous iteration
- # and so we use the maximum allowed upper bound for this prefix
- if [[ -n "$started" ]]; then
- upper=10
-
- else
-
- # Test for the upper bound in the current iteration
- var=MAX$suffix
- if [[ -n "${!var}" ]]; then
- upper=${!var}
- started=yes
- fi
- fi
-
- # If the upper bound has been found
- if [[ -n "$upper" ]]; then
-
- # Test for the lower bound in the current iteration (of the loop over prefixes)
- var=MIN$suffix
- if [[ -n "${!var}" ]]; then
- lower=${!var}
-
- # If the lower bound has a revision number, don't touch that yet
- if [[ -n "$MINREV" ]]; then
- let lower++
- fi
-
- # If not found, we go down to the minimum allowed for this prefix
- else
- lower=1
- fi
-
- # Add allowed versions with this prefix
- NEWDEP="$NEWDEP
- $(deprange-iterate-numbers ${NAME}_${suffix} $lower $upper)"
-
- # If we've encountered the lower bound on this iteration, don't consider additional prefixes
- if [[ -n "${!var}" ]]; then
- break
- fi
- fi
- done
- echo -n $NEWDEP
-}
-
-# @FUNCTION: deprange-dual
-# @USAGE: < minver > < maxver > < package >
-# @DESCRIPTION:
-# Wrapper around deprange() used for deps between split ebuilds.
-# It adds the parent monolithic ebuild of the dep as an alternative dep.
-# See deprange above for more deatils.
-deprange-dual() {
- local MIN=$1 MAX=$2 NEWDEP=""
- shift; shift
- for PACKAGE in $@; do
- PARENT=$(get-parent-package $PACKAGE)
- NEWDEP="$NEWDEP || ( $(deprange-list $MIN $MAX $PACKAGE)"
- if [[ "$PARENT" != "$(get-parent-package $CATEGORY/$PN)" ]]; then
- NEWDEP="$NEWDEP $(deprange-list $MIN $MAX $PARENT)"
- fi
- NEWDEP="$NEWDEP )"
- done
- echo -n $NEWDEP
-}
-
# ---------------------------------------------------------------
# kde/qt directory management etc. functions, was kde-dirs.ebuild
# ---------------------------------------------------------------
^ permalink raw reply [flat|nested] 15+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass
@ 2009-11-01 20:26 Jonathan Callen (abcd)
0 siblings, 0 replies; 15+ messages in thread
From: Jonathan Callen (abcd) @ 2009-11-01 20:26 UTC (permalink / raw
To: gentoo-commits
abcd 09/11/01 20:26:35
Modified: kde-functions.eclass
Log:
Fix last instance of deprange()
Revision Changes Path
1.175 eclass/kde-functions.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.175&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?rev=1.175&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde-functions.eclass?r1=1.174&r2=1.175
Index: kde-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- kde-functions.eclass 1 Nov 2009 09:43:35 -0000 1.174
+++ kde-functions.eclass 1 Nov 2009 20:26:34 -0000 1.175
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.174 2009/11/01 09:43:35 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.175 2009/11/01 20:26:34 abcd Exp $
# @ECLASS: kde-functions.eclass
# @MAINTAINER:
@@ -389,19 +389,10 @@
fi
if [[ -n "${KDEBASE}" ]]; then
# If we're a kde-base package, we need at least our own version of kdelibs.
- # Also, split kde-base ebuilds are not updated with every KDE release, and so
- # can require support of different versions of kdelibs.
- # KM_DEPRANGE should contain 2nd and 3rd parameter to deprange:
- # max and min KDE versions. E.g. KM_DEPRANGE="$PV $MAXKDEVER".
# Note: we only set RDEPEND if it is already set, otherwise
# we break packages relying on portage copying RDEPEND from DEPEND.
- if [[ -n "${KM_DEPRANGE}" ]]; then
- DEPEND="${DEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)"
- RDEPEND="${x_DEPEND} $(deprange ${KM_DEPRANGE} kde-base/kdelibs)"
- else
- DEPEND="${DEPEND} ~kde-base/kdelibs-$PV"
- RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}"
- fi
+ DEPEND="${DEPEND} ~kde-base/kdelibs-$PV"
+ RDEPEND="${x_DEPEND} ~kde-base/kdelibs-${PV}"
else
# Things outside kde-base need a minimum version,
# but kde-base/kdelibs:kde-4 mustn't satisfy it.
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2009-11-01 20:26 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-13 21:00 [gentoo-commits] gentoo-x86 commit in eclass: kde-functions.eclass Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2009-11-01 20:26 Jonathan Callen (abcd)
2009-11-01 9:43 Jonathan Callen (abcd)
2008-10-04 15:28 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2008-07-27 19:04 Carsten Lohrke (carlo)
2008-05-17 15:19 Carsten Lohrke (carlo)
2008-05-17 15:16 Carsten Lohrke (carlo)
2008-02-19 0:31 Ingmar Vanhassel (ingmar)
2008-02-14 19:17 Ingmar Vanhassel (ingmar)
2008-02-10 0:31 Wulf Krueger (philantrop)
2008-01-19 14:36 Ingmar Vanhassel (ingmar)
2008-01-19 14:20 Ingmar Vanhassel (ingmar)
2008-01-17 22:39 Ingmar Vanhassel (ingmar)
2007-12-16 16:28 Wulf Krueger (philantrop)
2007-09-27 20:25 Wulf Krueger (philantrop)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox