| 1 |
caleb 07/12/21 20:55:36 |
| 2 |
|
| 3 |
Modified: qt-core-4.4.0_rc1.ebuild |
| 4 |
Log: |
| 5 |
A little cleaner on the packages |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: qt-core-4.4.0_rc1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- qt-core-4.4.0_rc1.ebuild 21 Dec 2007 18:59:13 -0000 1.1 |
| 22 |
+++ qt-core-4.4.0_rc1.ebuild 21 Dec 2007 20:55:35 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v 1.1 2007/12/21 18:59:13 caleb Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v 1.2 2007/12/21 20:55:35 caleb Exp $ |
| 28 |
|
| 29 |
inherit qt4-build |
| 30 |
|
| 31 |
@@ -82,6 +82,9 @@ |
| 32 |
qt4-build_pkg_setup |
| 33 |
|
| 34 |
if has_version x11-libs/qt-core; then |
| 35 |
+ |
| 36 |
+ # Check to see if they've changed the glib flag since the last time installing this package. |
| 37 |
+ |
| 38 |
if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then |
| 39 |
ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package." |
| 40 |
ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." |
| 41 |
@@ -90,35 +93,32 @@ |
| 42 |
ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change." |
| 43 |
fi |
| 44 |
|
| 45 |
+ # Check to see if they've changed the qt3support flag since the last time installing this package. |
| 46 |
+ # If so, give a list of packages they need to un-emerge first. |
| 47 |
+ |
| 48 |
if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then |
| 49 |
local need_to_remove=""; |
| 50 |
ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." |
| 51 |
- if has_version x11-libs/qt-sql; then |
| 52 |
- need_to_remove="${need_to_remove} x11-libs/qt-sql" |
| 53 |
- fi |
| 54 |
- if has_version x11-libs/qt-opengl; then |
| 55 |
- need_to_remove="${need_to_remove} x11-libs/qt-opengl" |
| 56 |
- fi |
| 57 |
- if has_version x11-libs/qt-gui; then |
| 58 |
- need_to_remove="${need_to_remove} x11-libs/qt-gui" |
| 59 |
- fi |
| 60 |
+ for x in sql opengl gui qt3support; do |
| 61 |
+ local pkg="x11-libs/qt-${x}" |
| 62 |
+ if has_version $pkg; then |
| 63 |
+ need_to_remove="${need_to_remove} ${pkg}" |
| 64 |
+ fi |
| 65 |
+ done |
| 66 |
if [ -n "${need_to_remove}" ]; then |
| 67 |
- die "You must first unmerge these packages before continuing: ${need_to_remove}" |
| 68 |
+ die "You must first un-emerge these packages before continuing: \n\t\t${need_to_remove}" |
| 69 |
fi |
| 70 |
elif ! use qt3support && built_with_use x11-libs/qt-core qt3support; then |
| 71 |
local need_to_remove=""; |
| 72 |
ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package." |
| 73 |
- if has_version x11-libs/qt-sql; then |
| 74 |
- need_to_remove="${need_to_remove} x11-libs/qt-sql" |
| 75 |
- fi |
| 76 |
- if has_version x11-libs/qt-opengl; then |
| 77 |
- need_to_remove="${need_to_remove} x11-libs/qt-opengl" |
| 78 |
- fi |
| 79 |
- if has_version x11-libs/qt-gui; then |
| 80 |
- need_to_remove="${need_to_remove} x11-libs/qt-gui" |
| 81 |
- fi |
| 82 |
+ for x in sql opengl gui qt3support; do |
| 83 |
+ local pkg="x11-libs/qt-${x}" |
| 84 |
+ if has_version $pkg; then |
| 85 |
+ need_to_remove="${need_to_remove} ${pkg}" |
| 86 |
+ fi |
| 87 |
+ done |
| 88 |
if [ -n "${need_to_remove}" ]; then |
| 89 |
- die "You must first unmerge these packages before continuing: ${need_to_remove}" |
| 90 |
+ die "You must first un-emerge these packages before continuing: \n\t\t${need_to_remove}" |
| 91 |
fi |
| 92 |
fi |
| 93 |
fi |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
-- |
| 98 |
gentoo-commits@g.o mailing list |
Archives