[patch] Patch to make qt-4.3.2.ebuild accept USE="-X"

qt-4.3.2.ebuild.no-X11.patch (text/plain), 3.35 KB, created by Manuel Nickschas on 2007-11-27 17:23:05 UTC

--- qt-4.3.2.ebuild.orig	2007-11-27 18:13:56.000000000 +0100
+++ qt-4.3.2.ebuild	2007-11-27 18:16:11.000000000 +0100
@@ -17,15 +17,17 @@
 
 IUSE_INPUT_DEVICES="input_devices_wacom"
 
-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}"
+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 X xinerama zlib ${IUSE_INPUT_DEVICES}"
 
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/libXfont
-	x11-libs/libSM
-	xinerama? ( x11-libs/libXinerama )
-	media-libs/fontconfig
-	>=media-libs/freetype-2
+RDEPEND="X? (
+           x11-libs/libXrandr
+	   x11-libs/libXcursor
+	   x11-libs/libXfont
+	   x11-libs/libSM
+	   xinerama? ( x11-libs/libXinerama )
+	   media-libs/fontconfig
+	   >=media-libs/freetype-2
+        )
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
 	mng? ( >=media-libs/libmng-1.0.9 )
@@ -43,12 +45,14 @@
 	glib? ( dev-libs/glib )
 	dbus? ( >=sys-apps/dbus-1.0.2 )
 	ssl? ( dev-libs/openssl )
-	input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )"
+	X? (input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom ) )"
 
 DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/inputproto
+	X? (
+	  xinerama? ( x11-proto/xineramaproto )
+	  x11-proto/xextproto
+	  x11-proto/inputproto
+        )
 	dev-util/pkgconfig"
 
 pkg_setup() {
@@ -98,7 +102,7 @@
 		*-linux-*|*-linux)
 			spec="linux" ;;
 		*)
-			die "Unknown CHOST, no platform choosed."
+			die "Unknown CHOST, no platform chosen."
 	esac
 
 	CXX=$(tc-getCXX)
@@ -118,6 +122,7 @@
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch
+	! use X && epatch "${FILESDIR}"/qt-4.3.2-no-X11.patch
 
 	cd "${S}"/mkspecs/$(qt_mkspecs_dir)
 	# set c/xxflags and ldflags
@@ -141,9 +146,6 @@
 	# 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
-
 	# The trolls moved the definitions of the above stuff for g++, so we need to edit those files
 	# separately as well.
 	cd "${S}"/mkspecs/common
@@ -156,9 +158,6 @@
 	# 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
-
 	cd "${S}"/qmake
 
 	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \
@@ -208,9 +207,14 @@
 
 	use pch		&& myconf="${myconf} -pch" || myconf="${myconf} -no-pch"
 
-	use input_devices_wacom	&& myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
-
-	myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
+	if use X; then
+		myconf="${myconf} $(qt_use accessibility) $(qt_use xinerama) -xrender -xrandr -xkb -xshape -sm"
+		use qt3support && myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support"
+		use input_devices_wacom && myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet"
+	else
+		myconf="${myconf} -no-xrender -no-xrandr -no-xkb -no-xshape -no-sm -no-opengl \
+ 			-no-xinerama -no-xcursor -no-xfixes -no-fontconfig -no-tablet -no-xkb"
+	fi
 
 	if ! use examples; then
 		myconf="${myconf} -nomake examples"