[patch] The diff to in-tree eclasses

eclass.patch (text/plain), 1.52 KB, created by Alexey Charkov on 2008-11-13 23:06:04 UTC

diff -ur /usr/portage/eclass/mozconfig-3.eclass eclass/mozconfig-3.eclass
--- /usr/portage/eclass/mozconfig-3.eclass	2008-07-30 01:05:58.000000000 +0400
+++ eclass/mozconfig-3.eclass	2008-10-26 23:08:49.000000000 +0300
@@ -6,7 +6,7 @@
 
 inherit multilib flag-o-matic mozcoreconf-2
 
-IUSE="gnome ipv6 dbus startup-notification"
+IUSE="gnome ipv6 dbus startup-notification qt4"
 
 RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
@@ -35,9 +35,17 @@
 
 mozconfig_config() {
 	if ${MN} || ${XUL} || ${TB}; then
-	    mozconfig_annotate thebes --enable-default-toolkit=cairo-gtk2
+	    if use qt4; then
+		mozconfig_annotate thebes --enable-default-toolkit=cairo-qt
+	    else
+		mozconfig_annotate thebes --enable-default-toolkit=cairo-gtk2
+	    fi
 	else
-	    mozconfig_annotate -thebes --enable-default-toolkit=gtk2
+	    if use qt4; then
+		mozconfig_annotate thebes --enable-default-toolkit=cairo-qt
+	    else
+		mozconfig_annotate -thebes --enable-default-toolkit=gtk2
+	    fi
 	fi
 	mozconfig_use_enable ipv6
 
diff -ur /usr/portage/eclass/mozcoreconf-2.eclass eclass/mozcoreconf-2.eclass
--- /usr/portage/eclass/mozcoreconf-2.eclass	2008-07-30 15:05:38.000000000 +0400
+++ eclass/mozcoreconf-2.eclass	2008-10-26 23:32:46.000000000 +0300
@@ -180,11 +180,11 @@
 		--enable-pango \
 		--enable-svg \
 		--enable-svg-renderer=cairo \
-		--enable-system-cairo \
 		--disable-strip \
 		--disable-strip-libs \
 		--disable-install-strip \
 		--with-distribution-id=org.gentoo
+# 		--enable-system-cairo \
 
 		# This doesn't work yet
 		#--with-system-png \