[patch] Patch to set order, and warn if oldgtk is enabled with -gtk

ebuild.patch (text/plain), 1.90 KB, created by Simon Farnsworth on 2005-08-22 16:39:20 UTC

--- mldonkey-2.6.2.ebuild.old	2005-08-21 22:05:59.000000000 +0100
+++ mldonkey-2.6.2.ebuild	2005-08-23 00:33:48.000000000 +0100
@@ -18,10 +18,16 @@
 KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
 
 RDEPEND="dev-lang/perl
-	gtk2? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.4 )
-	gtk? ( =dev-ml/lablgtk-1.2.7* )
 	oldgtk? ( =dev-ml/lablgtk-1.2.7* )
+	!oldgtk?
+	(
+		gtk?
+		(
+			gtk2?	( >=gnome-base/librsvg-2.4.0
+					  >=dev-ml/lablgtk-2.4 )
+			!gtk2?	( =dev-ml/lablgtk-1.2.7* )
+		)
+	)
 	gd? ( >=media-libs/gd-2.0.28 )"
 
 DEPEND="${RDEPEND}
@@ -41,12 +47,12 @@
 	einfo "see the ocaml ebuild for details"
 	echo ""
 
-	if (use gtk && use gtk2) || (use gtk && use oldgtk) || (use gtk2 && use oldgtk); then
-		eerror "Only one GUI must be chosen! (gtk || gtk2 || oldgtk)"
-		die "Choose only one GUI"
+	if (!use gtk && use oldgtk); then
+		ewarn "You have requested the old GTK1 GUI with oldgtk, but"
+		ewarn "disabled GTK with -gtk. Assuming you want the old GTK1 GUI."
 	fi
 
-	if use guionly && !(use gtk2 || use gtk || use oldgtk); then
+	if use guionly && !(use gtk || use oldgtk); then
 		eerror "You need to choose a GUI (gtk || gtk2 || oldgtk)"
 		die "You have guionly enabled, but you haven't chosen any of GUIs"
 	fi
@@ -72,12 +78,12 @@
 	# threads 	Enables multiple threads (TURN IT ON YES WILL YA?)
 	# onlygui	Disable all nets support, build only chosen GUI
 
-	if use gtk2; then
+    if use oldgtk; then
+        myconf="--enable-gui=oldgui"
+	elif use gtk2 && use gtk; then
 		myconf="--enable-gui=newgui2"
 	elif use gtk; then
 		myconf="--enable-gui=newgui1"
-	elif use oldgtk; then
-		myconf="--enable-gui=oldgui"
 	else myconf="--disable-gui"
 	fi
 
@@ -113,7 +119,7 @@
 		exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
 	fi
 
-	if (use gtk2 || use gtk || use oldgtk); then
+	if (use gtk || use oldgtk); then
 		dobin mlgui mlguistarter mlchat mlim mlprogress
 
 		domenu ${FILESDIR}/${PN}-gui.desktop