| 1 |
zlin 08/02/03 14:26:39 |
| 2 |
|
| 3 |
Modified: kdevelop-3.4.1.ebuild kdevelop-3.5.0.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Fix KDE dependencies to use =cat/foo-3.5* so it cannot pull in KDE 4.x (bug #206528). Make sure kdesdk get compiled with USE=subversion when necessary (bug #208726). Put splits packages first in the dependency order (bug #207415). |
| 7 |
(Portage version: 2.1.4.1) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.11 dev-util/kdevelop/kdevelop-3.4.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild?rev=1.11&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild?rev=1.11&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild?r1=1.10&r2=1.11 |
| 15 |
|
| 16 |
Index: kdevelop-3.4.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild,v |
| 19 |
retrieving revision 1.10 |
| 20 |
retrieving revision 1.11 |
| 21 |
diff -u -r1.10 -r1.11 |
| 22 |
--- kdevelop-3.4.1.ebuild 28 Aug 2007 20:41:13 -0000 1.10 |
| 23 |
+++ kdevelop-3.4.1.ebuild 3 Feb 2008 14:26:38 -0000 1.11 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2007 Gentoo Foundation |
| 26 |
+# Copyright 1999-2008 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild,v 1.10 2007/08/28 20:41:13 nixnut Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.4.1.ebuild,v 1.11 2008/02/03 14:26:38 zlin Exp $ |
| 30 |
|
| 31 |
inherit kde eutils db-use |
| 32 |
|
| 33 |
@@ -16,10 +16,12 @@ |
| 34 |
|
| 35 |
DEPEND="sys-devel/gdb |
| 36 |
>=sys-libs/db-4.1 |
| 37 |
- cvs? ( || ( kde-base/cervisia kde-base/kdesdk ) )" |
| 38 |
+ cvs? ( || ( =kde-base/cervisia-3.5* |
| 39 |
+ =kde-base/kdesdk-3.5* ) )" |
| 40 |
|
| 41 |
RDEPEND="${DEPEND} |
| 42 |
- subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )" |
| 43 |
+ subversion? ( || ( =kde-base/kdesdk-kioslaves-3.5* |
| 44 |
+ =kde-base/kdesdk-3.5* ) )" |
| 45 |
DEPEND="${DEPEND} |
| 46 |
>=sys-devel/flex-2.5.33" |
| 47 |
|
| 48 |
@@ -29,12 +31,22 @@ |
| 49 |
|
| 50 |
MAKEOPTS="${MAKEOPTS} -j1" |
| 51 |
|
| 52 |
+pkg_setup() { |
| 53 |
+ if use subversion && \ |
| 54 |
+ has_version =kde-base/kdesdk-3.5* && \ |
| 55 |
+ ! built_with_use =kde-base/kdesdk-3.5* subversion; then |
| 56 |
+ eerror "To build this package with USE=subversion" |
| 57 |
+ eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too." |
| 58 |
+ die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion." |
| 59 |
+ fi |
| 60 |
+} |
| 61 |
+ |
| 62 |
src_unpack() { |
| 63 |
kde_src_unpack |
| 64 |
|
| 65 |
# Update the admin dir used in KDE template projects. |
| 66 |
# See also kde bug 104386. |
| 67 |
- for i in ${S}/admin/*; do |
| 68 |
+ for i in "${S}"/admin/*; do |
| 69 |
cp "${i}" "${S}/parts/appwizard/common/admin/" |
| 70 |
done |
| 71 |
|
| 72 |
@@ -69,29 +81,29 @@ |
| 73 |
|
| 74 |
# Default to exuberant-ctags so that we don't end up trying to run emacs's |
| 75 |
# ctags. |
| 76 |
- cat - >> "${D}/usr/share/config/kdeveloprc" <<EOF |
| 77 |
+ cat <<-EOF >> "${D}/usr/share/config/kdeveloprc" |
| 78 |
|
| 79 |
-[CTAGS] |
| 80 |
-ctags binary=/usr/bin/exuberant-ctags |
| 81 |
+ [CTAGS] |
| 82 |
+ ctags binary=/usr/bin/exuberant-ctags |
| 83 |
|
| 84 |
-EOF |
| 85 |
+ EOF |
| 86 |
} |
| 87 |
|
| 88 |
pkg_postinst() { |
| 89 |
elog "kdevelop can use a wide range of apps for extra functionality. This is an" |
| 90 |
elog "almost complete list. All these packages can be emerged after kdevelop." |
| 91 |
elog |
| 92 |
- elog "kde-base/konsole: (RECOMMENDED) embed konsole kpart in kdevelop ide" |
| 93 |
- elog "OR kde-base/kdebase: (RECOMMENDED) embed konsole kpart in kdevelop ide" |
| 94 |
- elog "dev-util/kdbg: (RECOMMENDED) kde frontend to gdb" |
| 95 |
- elog "dev-util/valgrind: (RECOMMENDED) integrates valgrind (memory debugger) commands" |
| 96 |
- elog "kde-base/kompare: (RECOMMENDED) show differences between files" |
| 97 |
- elog "media-gfx/graphviz: (RECOMMENDED) support the new graphical classbrowser" |
| 98 |
- elog "dev-java/ant: support projects using the ant build tool" |
| 99 |
- elog "dev-util/ctags: faster and more powerful code browsing logic" |
| 100 |
- elog "app-doc/doxygen: generate KDE-style documentation for your project" |
| 101 |
- elog "www-misc/htdig: index and search your project's documentation" |
| 102 |
- elog "app-arch/rpm: support creating RPMs of your project" |
| 103 |
+ elog "=kde-base/konsole-3.5*: (RECOMMENDED) embed konsole kpart in kdevelop ide" |
| 104 |
+ elog "OR =kde-base/kdebase-3.5*: (RECOMMENDED) embed konsole kpart in kdevelop ide" |
| 105 |
+ elog "dev-util/kdbg: (RECOMMENDED) kde frontend to gdb" |
| 106 |
+ elog "dev-util/valgrind: (RECOMMENDED) integrates valgrind (memory debugger) commands" |
| 107 |
+ elog "=kde-base/kompare-3.5*: (RECOMMENDED) show differences between files" |
| 108 |
+ elog "media-gfx/graphviz: (RECOMMENDED) support the new graphical classbrowser" |
| 109 |
+ elog "dev-java/ant: support projects using the ant build tool" |
| 110 |
+ elog "dev-util/ctags: faster and more powerful code browsing logic" |
| 111 |
+ elog "app-doc/doxygen: generate KDE-style documentation for your project" |
| 112 |
+ elog "www-misc/htdig: index and search your project's documentation" |
| 113 |
+ elog "app-arch/rpm: support creating RPMs of your project" |
| 114 |
elog "app-emulation/visualboyadvance: create and run projects for this gameboy" |
| 115 |
elog |
| 116 |
elog "Support for GNU-style make, tmake, qmake is included." |
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
1.7 dev-util/kdevelop/kdevelop-3.5.0.ebuild |
| 121 |
|
| 122 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild?rev=1.7&view=markup |
| 123 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild?rev=1.7&content-type=text/plain |
| 124 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild?r1=1.6&r2=1.7 |
| 125 |
|
| 126 |
Index: kdevelop-3.5.0.ebuild |
| 127 |
=================================================================== |
| 128 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild,v |
| 129 |
retrieving revision 1.6 |
| 130 |
retrieving revision 1.7 |
| 131 |
diff -u -r1.6 -r1.7 |
| 132 |
--- kdevelop-3.5.0.ebuild 6 Jan 2008 23:08:14 -0000 1.6 |
| 133 |
+++ kdevelop-3.5.0.ebuild 3 Feb 2008 14:26:38 -0000 1.7 |
| 134 |
@@ -1,6 +1,6 @@ |
| 135 |
# Copyright 1999-2008 Gentoo Foundation |
| 136 |
# Distributed under the terms of the GNU General Public License v2 |
| 137 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild,v 1.6 2008/01/06 23:08:14 philantrop Exp $ |
| 138 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.5.0.ebuild,v 1.7 2008/02/03 14:26:38 zlin Exp $ |
| 139 |
|
| 140 |
inherit kde eutils db-use |
| 141 |
|
| 142 |
@@ -15,24 +15,36 @@ |
| 143 |
IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion" |
| 144 |
|
| 145 |
DEPEND="sys-devel/gdb |
| 146 |
- >=sys-libs/db-4.1 |
| 147 |
- cvs? ( || ( kde-base/kdesdk kde-base/cervisia ) )" |
| 148 |
+ >=sys-libs/db-4.1 |
| 149 |
+ cvs? ( || ( =kde-base/cervisia-3.5* |
| 150 |
+ =kde-base/kdesdk-3.5* ) )" |
| 151 |
|
| 152 |
RDEPEND="${DEPEND} |
| 153 |
- subversion? ( || ( kde-base/kdesdk kde-base/kdesdk-kioslaves ) )" |
| 154 |
+ subversion? ( || ( =kde-base/kdesdk-kioslaves-3.5* |
| 155 |
+ =kde-base/kdesdk-3.5* ) )" |
| 156 |
DEPEND="${DEPEND} |
| 157 |
- >=sys-devel/flex-2.5.33" |
| 158 |
+ >=sys-devel/flex-2.5.33" |
| 159 |
|
| 160 |
need-kde 3.5 |
| 161 |
|
| 162 |
MAKEOPTS="${MAKEOPTS} -j1" |
| 163 |
|
| 164 |
+pkg_setup() { |
| 165 |
+ if use subversion && \ |
| 166 |
+ has_version =kde-base/kdesdk-3.5* && \ |
| 167 |
+ ! built_with_use =kde-base/kdesdk-3.5* subversion; then |
| 168 |
+ eerror "To build this package with USE=subversion" |
| 169 |
+ eerror "=kde-base/kdesdk-3.5* must be built with USE=subversion too." |
| 170 |
+ die "Please rebuild =kde-base/kdesdk-3.5* with USE=subversion." |
| 171 |
+ fi |
| 172 |
+} |
| 173 |
+ |
| 174 |
src_unpack() { |
| 175 |
kde_src_unpack |
| 176 |
|
| 177 |
# Update the admin dir used in KDE template projects. |
| 178 |
# See also kde bug 104386. |
| 179 |
- for i in "${S}"/admin/* ; do |
| 180 |
+ for i in "${S}"/admin/*; do |
| 181 |
cp "${i}" "${S}/parts/appwizard/common/admin/" |
| 182 |
done |
| 183 |
|
| 184 |
@@ -70,29 +82,29 @@ |
| 185 |
|
| 186 |
# Default to exuberant-ctags so that we don't end up trying to run emacs's |
| 187 |
# ctags. |
| 188 |
- cat - >> "${D}/usr/share/config/kdeveloprc" <<EOF |
| 189 |
+ cat <<-EOF >> "${D}/usr/share/config/kdeveloprc" |
| 190 |
|
| 191 |
-[CTAGS] |
| 192 |
-ctags binary=/usr/bin/exuberant-ctags |
| 193 |
+ [CTAGS] |
| 194 |
+ ctags binary=/usr/bin/exuberant-ctags |
| 195 |
|
| 196 |
-EOF |
| 197 |
+ EOF |
| 198 |
} |
| 199 |
|
| 200 |
pkg_postinst() { |
| 201 |
elog "kdevelop can use a wide range of apps for extra functionality. This is an" |
| 202 |
elog "almost complete list. All these packages can be emerged after kdevelop." |
| 203 |
elog |
| 204 |
- elog "kde-base/konsole: (RECOMMENDED) embed konsole kpart in kdevelop ide" |
| 205 |
- elog "OR kde-base/kdebase: (RECOMMENDED) embed konsole kpart in kdevelop ide" |
| 206 |
- elog "dev-util/kdbg: (RECOMMENDED) kde frontend to gdb" |
| 207 |
- elog "dev-util/valgrind: (RECOMMENDED) integrates valgrind (memory debugger) commands" |
| 208 |
- elog "kde-base/kompare: (RECOMMENDED) show differences between files" |
| 209 |
- elog "media-gfx/graphviz: (RECOMMENDED) support the new graphical classbrowser" |
| 210 |
- elog "dev-java/ant: support projects using the ant build tool" |
| 211 |
- elog "dev-util/ctags: faster and more powerful code browsing logic" |
| 212 |
- elog "app-doc/doxygen: generate KDE-style documentation for your project" |
| 213 |
- elog "www-misc/htdig: index and search your project's documentation" |
| 214 |
- elog "app-arch/rpm: support creating RPMs of your project" |
| 215 |
+ elog "=kde-base/konsole-3.5*: (RECOMMENDED) embed konsole kpart in kdevelop ide" |
| 216 |
+ elog "OR =kde-base/kdebase-3.5*: (RECOMMENDED) embed konsole kpart in kdevelop ide" |
| 217 |
+ elog "dev-util/kdbg: (RECOMMENDED) kde frontend to gdb" |
| 218 |
+ elog "dev-util/valgrind: (RECOMMENDED) integrates valgrind (memory debugger) commands" |
| 219 |
+ elog "=kde-base/kompare-3.5*: (RECOMMENDED) show differences between files" |
| 220 |
+ elog "media-gfx/graphviz: (RECOMMENDED) support the new graphical classbrowser" |
| 221 |
+ elog "dev-java/ant: support projects using the ant build tool" |
| 222 |
+ elog "dev-util/ctags: faster and more powerful code browsing logic" |
| 223 |
+ elog "app-doc/doxygen: generate KDE-style documentation for your project" |
| 224 |
+ elog "www-misc/htdig: index and search your project's documentation" |
| 225 |
+ elog "app-arch/rpm: support creating RPMs of your project" |
| 226 |
elog "app-emulation/visualboyadvance: create and run projects for this gameboy" |
| 227 |
elog |
| 228 |
elog "Support for GNU-style make, tmake, qmake is included." |
| 229 |
|
| 230 |
|
| 231 |
|
| 232 |
1.158 dev-util/kdevelop/ChangeLog |
| 233 |
|
| 234 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/ChangeLog?rev=1.158&view=markup |
| 235 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/ChangeLog?rev=1.158&content-type=text/plain |
| 236 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kdevelop/ChangeLog?r1=1.157&r2=1.158 |
| 237 |
|
| 238 |
Index: ChangeLog |
| 239 |
=================================================================== |
| 240 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v |
| 241 |
retrieving revision 1.157 |
| 242 |
retrieving revision 1.158 |
| 243 |
diff -u -r1.157 -r1.158 |
| 244 |
--- ChangeLog 6 Jan 2008 23:08:14 -0000 1.157 |
| 245 |
+++ ChangeLog 3 Feb 2008 14:26:38 -0000 1.158 |
| 246 |
@@ -1,6 +1,13 @@ |
| 247 |
# ChangeLog for dev-util/kdevelop |
| 248 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 249 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.157 2008/01/06 23:08:14 philantrop Exp $ |
| 250 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.158 2008/02/03 14:26:38 zlin Exp $ |
| 251 |
+ |
| 252 |
+ 03 Feb 2008; Bo Ørsted Andresen <zlin@g.o> kdevelop-3.4.1.ebuild, |
| 253 |
+ kdevelop-3.5.0.ebuild: |
| 254 |
+ Fix KDE dependencies to use =cat/foo-3.5* so it cannot pull in KDE 4.x (bug |
| 255 |
+ #206528). Make sure kdesdk get compiled with USE=subversion when necessary |
| 256 |
+ (bug #208726). Put splits packages first in the dependency order |
| 257 |
+ (bug #207415). |
| 258 |
|
| 259 |
06 Jan 2008; Wulf C. Krueger <philantrop@g.o> |
| 260 |
kdevelop-3.5.0.ebuild: |
| 261 |
|
| 262 |
|
| 263 |
|
| 264 |
-- |
| 265 |
gentoo-commits@l.g.o mailing list |
Archives