[patch] Ebuild patch

qt-deps-patch (text/plain), 1.91 KB, created by Diego Elio Pettenò (RETIRED) on 2007-06-07 14:14:19 UTC

Index: qt-4.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.0.ebuild,v
retrieving revision 1.8
diff -u -B -r1.8 qt-4.3.0.ebuild
--- qt-4.3.0.ebuild	4 Jun 2007 15:07:30 -0000	1.8
+++ qt-4.3.0.ebuild	7 Jun 2007 13:52:23 -0000
@@ -19,16 +19,12 @@
 
 IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}"
 
-DEPEND="x11-libs/libXrandr
+RDEPEND="x11-libs/libXrandr
 	x11-libs/libXcursor
-	x11-libs/libXi
 	x11-libs/libXfont
 	x11-libs/libSM
-	x11-proto/xextproto
-	x11-proto/inputproto
-	dev-util/pkgconfig
-	xinerama? ( x11-proto/xineramaproto x11-libs/libXinerama )
-	virtual/xft
+	xinerama? ( x11-libs/libXinerama )
+	media-libs/fontconfig
 	>=media-libs/freetype-2
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
@@ -47,7 +43,13 @@
 	glib? ( dev-libs/glib )
 	dbus? ( >=sys-apps/dbus-1.0.2 )
 	ssl? ( dev-libs/openssl )
-	input_devices_wacom? ( x11-drivers/linuxwacom )"
+	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )"
+
+DEPEND="${RDEPEND}
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	input_device_wacom? ( x11-proto/inputproto )
+	dev-util/pkgconfig"
 
 pkg_setup() {
 	QTBASEDIR=/usr/$(get_libdir)/qt4
@@ -132,9 +134,6 @@
 		-e "/CONFIG/s:$: nostrip:" \
 		qmake.conf
 
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf
-
 	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
 	sed -i -e "s:X11R6/::" qmake.conf
 
@@ -147,9 +146,6 @@
 		-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		g++.conf
 
-	# Do not link with -rpath. See bug #75181.
-	sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf
-
 	# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib
 	sed -i -e "s:X11R6/::" linux.conf