[patch] proposed patch

mldonkey-fix-use-gtk.patch (text/plain), 2.40 KB, created by UncleOwen on 2005-08-22 15:17:58 UTC

--- net-p2p/mldonkey/mldonkey-2.6.2.ebuild	2005-08-21 23:05:59.000000000 +0200
+++ net-p2p/mldonkey/mldonkey-2.6.2.ebuild	2005-08-23 00:12:42.000000000 +0200
@@ -18,10 +18,12 @@
 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* )
+	gtk? (
+		gtk2? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.4 )
+		!gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
+	guionly? (
+                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,19 +43,15 @@
 	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"
-	fi
-
-	if use guionly && !(use gtk2 || 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"
+	if !(use gtk || use guionly) && use oldgtk; then
+		ewarn "You have oldgtk in your USE flags, but not gtk."
+		ewarn "This will _NOT_ build _ANY_ gui. To build the old gtk gui,"
+		ewarn "Enable the gtk use flag."
 	fi
 
 	if use gtk2 && !(built_with_use dev-ml/lablgtk svg); then
 		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk2 gui"
-		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
+		die
 	fi
 }
 
@@ -72,13 +70,16 @@
 	# threads 	Enables multiple threads (TURN IT ON YES WILL YA?)
 	# onlygui	Disable all nets support, build only chosen GUI
 
-	if use gtk2; 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"
+	if (use gtk || use guionly); then
+		if use oldgtk; then
+			myconf="--enable-gui=oldgui"
+		elif use gtk2; then
+			myconf="--enable-gui=newgui2"
+		else
+			myconf="--enable-gui=newgui1"
+		fi
+	else
+		myconf="--disable-gui"
 	fi
 
 	if use guionly; then
@@ -113,7 +114,7 @@
 		exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
 	fi
 
-	if (use gtk2 || use gtk || use oldgtk); then
+	if (use gtk || use guionly); then
 		dobin mlgui mlguistarter mlchat mlim mlprogress
 
 		domenu ${FILESDIR}/${PN}-gui.desktop