[patch] proposed patch

mldonkey-fix-use-gtk.patch (text/plain), 1.93 KB, created by UncleOwen on 2005-08-21 17:35:26 UTC

--- /usr/portage/net-p2p/mldonkey/mldonkey-2.6.2.ebuild	2005-08-21 01:45:36.000000000 +0200
+++ net-p2p/mldonkey/mldonkey-2.6.2.ebuild	2005-08-22 02:25:33.000000000 +0200
@@ -18,10 +18,12 @@
 KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
 
 RDEPEND="dev-lang/perl
-	gtk2? >=gnome-base/librsvg-2.4.0
-	gtk2? >=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,13 +43,8 @@
 	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
-	fi
-
-	if use guionly && !(use gtk2 || use gtk || use oldgtk); then
-		eerror "You need to choose a GUI (gtk || gtk2 || oldgtk)"
+	if (use gtk || use guionly) && use gtk2 && use oldgtk
+		eerror "Only one GUI may be chosen! ((!gtk2 && !oldgtk) || gtk2 || oldgtk)"
 		die
 	fi
 
@@ -72,11 +69,11 @@
 	# 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 gtk || use guionly) && use gtk2; then
 		myconf="--enable-gui=newgui2"
-	elif use gtk; then
+	elif (use gtk || use guionly) && ! use gtk2 && ! use oldgtk; then
 		myconf="--enable-gui=newgui1"
-	elif use oldgtk; then
+	elif (use gtk || use guionly) && use oldgtk; then
 		myconf="--enable-gui=oldgui"
 	else myconf="--disable-gui"
 	fi
@@ -113,7 +110,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
 
 		insinto /usr/share/applications