| 1 |
caleb 07/12/22 17:34:17 |
| 2 |
|
| 3 |
Modified: qt-gui-4.4.0_rc1.ebuild |
| 4 |
Log: |
| 5 |
Add a new dep, and use the new eclass functions |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: qt-gui-4.4.0_rc1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- qt-gui-4.4.0_rc1.ebuild 21 Dec 2007 20:41:33 -0000 1.3 |
| 22 |
+++ qt-gui-4.4.0_rc1.ebuild 22 Dec 2007 17:34:16 -0000 1.4 |
| 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-gui/qt-gui-4.4.0_rc1.ebuild,v 1.3 2007/12/21 20:41:33 caleb Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.4.0_rc1.ebuild,v 1.4 2007/12/22 17:34:16 caleb Exp $ |
| 28 |
|
| 29 |
inherit eutils qt4-build |
| 30 |
|
| 31 |
@@ -21,9 +21,13 @@ |
| 32 |
|
| 33 |
IUSE="accessibility cups dbus debug mng nas nis tiff xinerama ${IUSE_INPUT_DEVICES}" |
| 34 |
|
| 35 |
+# The dep on qt-sql may be able to come out when we track down which |
| 36 |
+# part of the build is linking to it. |
| 37 |
+ |
| 38 |
RDEPEND="~x11-libs/qt-core-${PV} |
| 39 |
~x11-libs/qt-script-${PV} |
| 40 |
dbus? ( ~x11-libs/qt-dbus-${PV} ) |
| 41 |
+ ~x11-libs/qt-sql-${PV} |
| 42 |
x11-libs/libXrandr |
| 43 |
x11-libs/libXcursor |
| 44 |
x11-libs/libXfont |
| 45 |
@@ -45,6 +49,8 @@ |
| 46 |
x11-proto/xextproto |
| 47 |
x11-proto/inputproto" |
| 48 |
|
| 49 |
+QT4_TARGET_DIRECTORIES="src/gui tools/assistant tools/designer tools/linguist" |
| 50 |
+ |
| 51 |
src_unpack() { |
| 52 |
qt4-build_src_unpack |
| 53 |
|
| 54 |
@@ -98,15 +104,13 @@ |
| 55 |
echo ./configure ${myconf} |
| 56 |
./configure ${myconf} || die |
| 57 |
|
| 58 |
- build_directories src/gui tools/assistant tools/designer tools/linguist |
| 59 |
- use dbus && build_directories tools/qdbus/qdbusviewer |
| 60 |
+ use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" |
| 61 |
+ build_target_directories |
| 62 |
} |
| 63 |
|
| 64 |
src_install() { |
| 65 |
- install_directories src/gui tools/assistant tools/designer tools/linguist |
| 66 |
- use dbus && install_directories tools/qdbus/qdbusviewer |
| 67 |
- |
| 68 |
- fix_library_files |
| 69 |
+ use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" |
| 70 |
+ qt4-build_src_install |
| 71 |
|
| 72 |
# Install .desktop files, from bug #174033 |
| 73 |
insinto /usr/share/applications |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
-- |
| 78 |
gentoo-commits@g.o mailing list |
Archives