| 1 |
caleb 07/12/21 19:41:25 |
| 2 |
|
| 3 |
Modified: qt-qt3support-4.4.0_rc1.ebuild |
| 4 |
Log: |
| 5 |
I think we can get away without this use flag here |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: qt-qt3support-4.4.0_rc1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 19:36:23 -0000 1.6 |
| 22 |
+++ qt-qt3support-4.4.0_rc1.ebuild 21 Dec 2007 19:41:24 -0000 1.7 |
| 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-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.6 2007/12/21 19:36:23 caleb Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.4.0_rc1.ebuild,v 1.7 2007/12/21 19:41:24 caleb Exp $ |
| 28 |
|
| 29 |
inherit qt4-build |
| 30 |
|
| 31 |
@@ -17,7 +17,7 @@ |
| 32 |
SLOT="4" |
| 33 |
KEYWORDS="~x86" |
| 34 |
|
| 35 |
-IUSE="debug accessibility" |
| 36 |
+IUSE="debug" |
| 37 |
|
| 38 |
RDEPEND="~x11-libs/qt-gui-${PV} |
| 39 |
~x11-libs/qt-sql-${PV}" |
| 40 |
@@ -25,13 +25,7 @@ |
| 41 |
DEPEND="${RDEPEND}" |
| 42 |
|
| 43 |
pkg_setup() { |
| 44 |
- if use accessibility && !built_with_use =x11-libs/qt-gui-4* accessibility; then |
| 45 |
- eerror "Attempting to build qt3support with accessibility use flag without support in Qt4." |
| 46 |
- eerror "You must either turn off this use flag or re-emerge x11-libs/qt with accessibility support." |
| 47 |
- die |
| 48 |
- fi |
| 49 |
- |
| 50 |
- if !built_with_use =x11-libs/qt-core-4* qt3support; then |
| 51 |
+ if ! built_with_use =x11-libs/qt-core-4* qt3support; then |
| 52 |
eerror "In order for the qt-qt3support package to install, you must set the \"qt3support\" use flag, then" |
| 53 |
eerror "re-emerge the following packages: x11-libs/qt-core, x11-libs/qt-gui, x11-libs/qt-sql." |
| 54 |
die |
| 55 |
@@ -49,9 +43,11 @@ |
| 56 |
src_compile() { |
| 57 |
local myconf=$(standard_configure_options) |
| 58 |
|
| 59 |
- # Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other |
| 60 |
- # cases. From bug #178535 |
| 61 |
- use accessibility && myconf="${myconf} -accessibility" || myconf="${myconf} -no-accessibility" |
| 62 |
+ if built_with_use ~x11-libs/qt-gui-${PV} accessibility; then |
| 63 |
+ myconf="${myconf} -accessibility" |
| 64 |
+ else |
| 65 |
+ myconf="${myconf} -no-accessibility" |
| 66 |
+ fi |
| 67 |
|
| 68 |
myconf="${myconf} -qt3support" |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
-- |
| 74 |
gentoo-commits@g.o mailing list |
Archives