Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 103239 | Differences between
and this patch

Collapse All | Expand All

(-)net-p2p/mldonkey/mldonkey-2.6.2.ebuild (-24 / +28 lines)
Lines 18-27 Link Here
18
KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
18
KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
19
19
20
RDEPEND="dev-lang/perl
20
RDEPEND="dev-lang/perl
21
	gtk2? ( >=gnome-base/librsvg-2.4.0
21
	gtk? (
22
			>=dev-ml/lablgtk-2.4 )
22
		gtk2? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.4 )
23
	gtk? ( =dev-ml/lablgtk-1.2.7* )
23
		!gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
24
	oldgtk? ( =dev-ml/lablgtk-1.2.7* )
24
	guionly? (
25
                gtk2? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.4 )
26
                !gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
25
	gd? ( >=media-libs/gd-2.0.28 )"
27
	gd? ( >=media-libs/gd-2.0.28 )"
26
28
27
DEPEND="${RDEPEND}
29
DEPEND="${RDEPEND}
Lines 41-59 Link Here
41
	einfo "see the ocaml ebuild for details"
43
	einfo "see the ocaml ebuild for details"
42
	echo ""
44
	echo ""
43
45
44
	if (use gtk && use gtk2) || (use gtk && use oldgtk) || (use gtk2 && use oldgtk); then
46
	if !(use gtk || use guionly) && use oldgtk; then
45
		eerror "Only one GUI must be chosen! (gtk || gtk2 || oldgtk)"
47
		ewarn "You have oldgtk in your USE flags, but not gtk."
46
		die "Choose only one GUI"
48
		ewarn "This will _NOT_ build _ANY_ gui. To build the old gtk gui,"
47
	fi
49
		ewarn "Enable the gtk use flag."
48
49
	if use guionly && !(use gtk2 || use gtk || use oldgtk); then
50
		eerror "You need to choose a GUI (gtk || gtk2 || oldgtk)"
51
		die "You have guionly enabled, but you haven't chosen any of GUIs"
52
	fi
50
	fi
53
51
54
	if use gtk2 && !(built_with_use dev-ml/lablgtk svg); then
52
	if use gtk2 && !(built_with_use dev-ml/lablgtk svg); then
55
		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk2 gui"
53
		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk2 gui"
56
		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
54
		die
57
	fi
55
	fi
58
}
56
}
59
57
Lines 72-84 Link Here
72
	# threads 	Enables multiple threads (TURN IT ON YES WILL YA?)
70
	# threads 	Enables multiple threads (TURN IT ON YES WILL YA?)
73
	# onlygui	Disable all nets support, build only chosen GUI
71
	# onlygui	Disable all nets support, build only chosen GUI
74
72
75
	if use gtk2; then
73
	if (use gtk || use guionly); then
76
		myconf="--enable-gui=newgui2"
74
		if use oldgtk; then
77
	elif use gtk; then
75
			myconf="--enable-gui=oldgui"
78
		myconf="--enable-gui=newgui1"
76
		elif use gtk2; then
79
	elif use oldgtk; then
77
			myconf="--enable-gui=newgui2"
80
		myconf="--enable-gui=oldgui"
78
		else
81
	else myconf="--disable-gui"
79
			myconf="--enable-gui=newgui1"
80
		fi
81
	else
82
		myconf="--disable-gui"
82
	fi
83
	fi
83
84
84
	if use guionly; then
85
	if use guionly; then
Lines 113-123 Link Here
113
		exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
114
		exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
114
	fi
115
	fi
115
116
116
	if (use gtk2 || use gtk || use oldgtk); then
117
	if (use gtk || use guionly); then
117
		dobin mlgui mlguistarter mlchat mlim mlprogress
118
		dobin mlgui mlguistarter mlchat mlim mlprogress
118
119
119
		domenu ${FILESDIR}/${PN}-gui.desktop
120
		insinto /usr/share/applications
120
		doicon ${FILESDIR}/${PN}.png
121
		doins ${FILESDIR}/${PN}-gui.desktop
122
123
		insinto /usr/share/pixmaps
124
		doins ${FILESDIR}/${PN}.png
121
	fi
125
	fi
122
126
123
	if use doc ; then
127
	if use doc ; then
Lines 141-147 Link Here
141
	fi
145
	fi
142
146
143
	if use mozilla; then
147
	if use mozilla; then
144
		insinto /usr/share/${PN}
148
		insinto /usr/share/{PN}
145
		doins ${DISTFILES}/mldonkey_protocol_handler-${MOZVER}.xpi
149
		doins ${DISTFILES}/mldonkey_protocol_handler-${MOZVER}.xpi
146
	fi;
150
	fi;
147
}
151
}

Return to bug 103239