Attachment #391244 for bug #511832

View | Details | Raw Unified | Return to bug 511832 | Differences between
Collapse All | Expand All




++ toolchain.eclass

	tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
	tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
	tc_version_is_at_least 4.1 && IUSE+=" alsa dssi libssp objc++"
	tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )
	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
	tc_version_is_at_least 4.6 && IUSE+=" graphite"

		>=sys-devel/autogen-5.5.4
	)"

GCJ_ZLIB_DEPEND=""
GCJ_ZLIB_RDEPEND=""
GCJ_ZIP_DEPEND=""
GCJ_GMP_DEPEND=""
GCJ_GMP_RDEPEND=""
GCJ_GTK_DEPEND=""
GCJ_GTK_RDEPEND=""
GCJ_LIBART_DEPEND=""
GCJ_LIBART_RDEPEND=""
GCJ_CAIRO_PANGO_DEPEND=""
GCJ_CAIRO_PANGO_RDEPEND=""
GCJ_XTST_DEPEND=""
GCJ_XTST_RDEPEND=""
GCJ_FREETYPE_DEPEND=""
GCJ_FREETYPE_RDEPEND=""
GCJ_XRANDR_XRENDER_DEPEND=""
GCJ_XRANDR_XRENDER_RDEPEND=""
GCJ_AWT_DEPEND=""
GCJ_AWT_RDEPEND=""
GCJ_ALSA_DEPEND=""
GCJ_ALSA_RDEPEND=""
GCJ_DSSI_DEPEND=""
GCJ_DSSI_RDEPEND=""

if in_iuse gcj ; then
	if [[ ${EAPI:-0} != [01] ]]; then
		GCJ_ZLIB_DEPEND="
			amd64? ( multilib? ( || (
				sys-libs/zlib[abi_x86_32]
				app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
			) ) )"
		GCJ_ZLIB_RDEPEND="${GCJ_ZLIB_DEPEND}"
	fi

	tc_version_is_at_least 4.2 && GCJ_ZIP_DEPEND="app-arch/zip app-arch/unzip"

	if tc_version_is_at_least 4.4 ; then
		if [[ ${EAPI:-0} != [01] ]]; then
			GCJ_GMP_DEPEND="
				amd64? ( multilib? ( || (
					dev-libs/gmp[abi_x86_32]
					app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
				) ) )"
			GCJ_GMP_RDEPEND="${GCJ_GMP_DEPEND}"
		fi
	fi

	if in_iuse awt ; then
		if [[ ${EAPI:-0} == [01] ]]; then
			GCJ_GTK_DEPEND="
				virtual/pkgconfig
				=x11-libs/gtk+-2*
				x11-libs/libX11
				x11-proto/xproto"
			GCJ_GTK_RDEPEND="
				=x11-libs/gtk+-2*"
		else
			GCJ_GTK_DEPEND="
				virtual/pkgconfig
				x11-libs/gtk+:2
				x11-libs/libX11
				x11-proto/xproto
				amd64? ( multilib? ( || (
					(
						x11-libs/gtk+:2[abi_x86_32]
						x11-libs/libX11[abi_x86_32]
						x11-proto/xproto[abi_x86_32]
					)
					(
						app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
						app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
					)
				) ) )"
			GCJ_GTK_RDEPEND="
				x11-libs/gtk+:2
				amd64? ( multilib? ( || (
					x11-libs/gtk+:2[abi_x86_32]
					app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
			) ) )"
		fi

		if tc_version_is_between 3.4 4.1 ; then
			if [[ ${EAPI:-0} == [01] ]]; then
				GCJ_LIBART_DEPEND="
					>=media-libs/libart_lgpl-2.1"
				GCJ_LIBART_RDEPEND="${GCJ_LIBART_DEPEND}"
			else
				GCJ_LIBART_DEPEND="
					>=media-libs/libart_lgpl-2.1
					amd64? ( multilib? ( || (
						>=media-libs/libart_lgpl-2.1[abi_x86_32]
						app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
					) ) )"
				GCJ_LIBART_RDEPEND="${GCJ_LIBART_DEPEND}"
			fi
		fi

		if tc_version_is_at_least 3.4 ; then
			if [[ ${EAPI:-0} == [01] ]]; then
				GCJ_CAIRO_PANGO_DEPEND="
					x11-libs/cairo
					x11-libs/pango"
				GCJ_CAIRO_PANGO_RDEPEND="${GCJ_CAIRO_PANGO_DEPEND}"
			else
				GCJ_CAIRO_PANGO_DEPEND="
					x11-libs/cairo
					x11-libs/pango
					amd64? ( multilib? ( || (
						(
							x11-libs/cairo[abi_x86_32]
							x11-libs/pango[abi_x86_32]
						)
						app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
					) ) )"
				GCJ_CAIRO_PANGO_RDEPEND="${GCJ_CAIRO_PANGO_DEPEND}"
			fi
		fi

		if tc_version_is_at_least 4.0 ; then
			if [[ ${EAPI:-0} == [01] ]]; then
				GCJ_XTST_DEPEND="
					x11-libs/libXtst"
				GCJ_XTST_RDEPEND="${GCJ_XTST_DEPEND}"
			else
				GCJ_XTST_DEPEND="
					x11-libs/libXtst
					amd64? ( multilib? ( || (
						x11-libs/libXtst[abi_x86_32]
						app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
					) ) )"
				GCJ_XTST_RDEPEND="${GCJ_XTST_DEPEND}"
			fi
		fi

		if tc_version_is_at_least 4.1 ; then
			if [[ ${EAPI:-0} == [01] ]]; then
				GCJ_FREETYPE_DEPEND="
					media-libs/freetype"
				GCJ_FREETYPE_RDEPEND="${GCJ_FREETYPE_DEPEND}"
			else
				GCJ_FREETYPE_DEPEND="
					media-libs/freetype
					amd64? ( multilib? ( || (
						media-libs/freetype[abi_x86_32]
						app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
					) ) )"
				GCJ_FREETYPE_RDEPEND="${GCJ_FREETYPE_DEPEND}"
			fi
		fi

		if tc_version_is_at_least 4.2 ; then
			if [[ ${EAPI:-0} == [01] ]]; then
				GCJ_XRANDR_XRENDER_DEPEND="
					x11-libs/libXrandr
					x11-libs/libXrender"
				GCJ_XRANDR_XRENDER_RDEPEND="${GCJ_XRANDR_XRENDER_DEPEND}"
			else
				GCJ_XRANDR_XRENDER_DEPEND="
					x11-libs/libXrandr
					x11-libs/libXrender
					amd64? ( multilib? ( || (
						(
							x11-libs/libXrandr[abi_x86_32]
							x11-libs/libXrender[abi_x86_32]
						)
						app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
					) ) )"
				GCJ_XRANDR_XRENDER_RDEPEND="${GCJ_XRANDR_XRENDER_DEPEND}"
			fi
		fi

		GCJ_AWT_DEPEND="
			awt? (
				${GCJ_GTK_DEPEND}
				${GCJ_LIBART_DEPEND}
				${GCJ_CAIRO_PANGO_DEPEND}
				${GCJ_XTST_DEPEND}
				${GCJ_FREETYPE_DEPEND}
				${GCJ_XRANDR_XRENDER_DEPEND}
			)"
		GCJ_AWT_RDEPEND="
			awt? (
				${GCJ_GTK_RDEPEND}
				${GCJ_LIBART_RDEPEND}
				${GCJ_CAIRO_PANGO_RDEPEND}
				${GCJ_XTST_RDEPEND}
				${GCJ_FREETYPE_RDEPEND}
				${GCJ_XRANDR_XRENDER_RDEPEND}
			)"
	fi

	if in_iuse alsa ; then
		if [[ ${EAPI:-0} == [01] ]]; then
			GCJ_ALSA_DEPEND="
				alsa? (
					media-libs/alsa-lib
					virtual/pkgconfig
				)"
			GCJ_ALSA_RDEPEND="
				alsa? (
					media-libs/alsa-lib
				)"
		else
			GCJ_ALSA_DEPEND="
				alsa? (
					media-libs/alsa-lib
					virtual/pkgconfig
					amd64? ( multilib? ( || (
						media-libs/alsa-lib[abi_x86_32]
						app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
					) ) )
				)"
			GCJ_ALSA_RDEPEND="
				alsa? (
					media-libs/alsa-lib
					amd64? ( multilib? ( || (
						media-libs/alsa-lib[abi_x86_32]
						app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
					) ) )
				)"
		fi
	fi

	if in_iuse dssi ; then
		if [[ ${EAPI:-0} == [01] ]]; then
			GCJ_DSSI_DEPEND="
				dssi? (
					media-libs/dssi
					media-sound/jack-audio-connection-kit
				)"
			GCJ_DSSI_RDEPEND="
				dssi? (
					media-sound/jack-audio-connection-kit
				)"
		else
			GCJ_DSSI_DEPEND="
				dssi? (
					media-libs/dssi
					media-sound/jack-audio-connection-kit
					amd64? ( multilib? ( || (
						media-sound/jack-audio-connection-kit[abi_x86_32]
						app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
					) ) )
				)"
			GCJ_DSSI_RDEPEND="
				dssi? (
					media-sound/jack-audio-connection-kit
					amd64? ( multilib? ( || (
						media-sound/jack-audio-connection-kit[abi_x86_32]
						app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
					) ) )
				)"
		fi
	fi

	DEPEND+="
		gcj? (
			${GCJ_ZLIB_DEPEND}
			${GCJ_ZIP_DEPEND}
			${GCJ_GMP_DEPEND}
			${GCJ_AWT_DEPEND}
			${GCJ_ALSA_DEPEND}
			${GCJ_DSSI_DEPEND}
		)"
	RDEPEND+="
		gcj? (
			${GCJ_ZLIB_RDEPEND}
			${GCJ_GMP_RDEPEND}
			${GCJ_AWT_RDEPEND}
			${GCJ_ALSA_RDEPEND}
			${GCJ_DSSI_RDEPEND}
		)"
fi

PDEPEND=">=sys-devel/gcc-config-1.7"


	### library options

	if is_gcj ; then
		if use awt ; then
			confgcc+=( --enable-java-awt=gtk )
		fi
		confgcc+=( $(use_enable alsa) )
		confgcc+=( $(use_enable dssi) )
	else
		confgcc+=( --disable-libgcj )
	elif use awt ; then
		confgcc+=( --enable-java-awt=gtk )
	fi

	if tc_version_is_at_least 4.2 ; then

Return to bug 511832

Line Link Here

(-)file_not_specified_in_diff (-22 / +280 lines)
0	-- toolchain.eclass	0	++ toolchain.eclass
Lines 143-149 Link Here
143	tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"	143	tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
144	tc_version_is_at_least 4.0 && IUSE+=" objc-gc"	144	tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
145	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"	145	tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
146	tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"	146	tc_version_is_at_least 4.1 && IUSE+=" alsa dssi libssp objc++"
147	tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )	147	tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )
148	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"	148	tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
149	tc_version_is_at_least 4.6 && IUSE+=" graphite"	149	tc_version_is_at_least 4.6 && IUSE+=" graphite"
Lines 204-227 Link Here
204	>=sys-devel/autogen-5.5.4	204	>=sys-devel/autogen-5.5.4
205	)"	205	)"
206		206
		207	GCJ_ZLIB_DEPEND=""
		208	GCJ_ZLIB_RDEPEND=""
		209	GCJ_ZIP_DEPEND=""
		210	GCJ_GMP_DEPEND=""
		211	GCJ_GMP_RDEPEND=""
		212	GCJ_GTK_DEPEND=""
		213	GCJ_GTK_RDEPEND=""
		214	GCJ_LIBART_DEPEND=""
		215	GCJ_LIBART_RDEPEND=""
		216	GCJ_CAIRO_PANGO_DEPEND=""
		217	GCJ_CAIRO_PANGO_RDEPEND=""
		218	GCJ_XTST_DEPEND=""
		219	GCJ_XTST_RDEPEND=""
		220	GCJ_FREETYPE_DEPEND=""
		221	GCJ_FREETYPE_RDEPEND=""
		222	GCJ_XRANDR_XRENDER_DEPEND=""
		223	GCJ_XRANDR_XRENDER_RDEPEND=""
		224	GCJ_AWT_DEPEND=""
		225	GCJ_AWT_RDEPEND=""
		226	GCJ_ALSA_DEPEND=""
		227	GCJ_ALSA_RDEPEND=""
		228	GCJ_DSSI_DEPEND=""
		229	GCJ_DSSI_RDEPEND=""
		230
207	if in_iuse gcj ; then	231	if in_iuse gcj ; then
208	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"	232	if [[ ${EAPI:-0} != [01] ]]; then
209	GCJ_GTK_DEPS="	233	GCJ_ZLIB_DEPEND="
210	x11-libs/libXt	234	amd64? ( multilib? ( \|\| (
211	x11-libs/libX11	235	sys-libs/zlib[abi_x86_32]
212	x11-libs/libXtst	236	app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
213	x11-proto/xproto	237	) ) )"
214	x11-proto/xextproto	238	GCJ_ZLIB_RDEPEND="${GCJ_ZLIB_DEPEND}"
215	=x11-libs/gtk+-2*	239	fi
216	virtual/pkgconfig	240
217	amd64? ( multilib? (	241	tc_version_is_at_least 4.2 && GCJ_ZIP_DEPEND="app-arch/zip app-arch/unzip"
218	app-emulation/emul-linux-x86-gtklibs	242
219	app-emulation/emul-linux-x86-xlibs	243	if tc_version_is_at_least 4.4 ; then
220	) )	244	if [[ ${EAPI:-0} != [01] ]]; then
221	"	245	GCJ_GMP_DEPEND="
222	tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"	246	amd64? ( multilib? ( \|\| (
223	tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"	247	dev-libs/gmp[abi_x86_32]
224	DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"	248	app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
		249	) ) )"
		250	GCJ_GMP_RDEPEND="${GCJ_GMP_DEPEND}"
		251	fi
		252	fi
		253
		254	if in_iuse awt ; then
		255	if [[ ${EAPI:-0} == [01] ]]; then
		256	GCJ_GTK_DEPEND="
		257	virtual/pkgconfig
		258	=x11-libs/gtk+-2*
		259	x11-libs/libX11
		260	x11-proto/xproto"
		261	GCJ_GTK_RDEPEND="
		262	=x11-libs/gtk+-2*"
		263	else
		264	GCJ_GTK_DEPEND="
		265	virtual/pkgconfig
		266	x11-libs/gtk+:2
		267	x11-libs/libX11
		268	x11-proto/xproto
		269	amd64? ( multilib? ( \|\| (
		270	(
		271	x11-libs/gtk+:2[abi_x86_32]
		272	x11-libs/libX11[abi_x86_32]
		273	x11-proto/xproto[abi_x86_32]
		274	)
		275	(
		276	app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
		277	app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
		278	)
		279	) ) )"
		280	GCJ_GTK_RDEPEND="
		281	x11-libs/gtk+:2
		282	amd64? ( multilib? ( \|\| (
		283	x11-libs/gtk+:2[abi_x86_32]
		284	app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
		285	) ) )"
		286	fi
		287
		288	if tc_version_is_between 3.4 4.1 ; then
		289	if [[ ${EAPI:-0} == [01] ]]; then
		290	GCJ_LIBART_DEPEND="
		291	>=media-libs/libart_lgpl-2.1"
		292	GCJ_LIBART_RDEPEND="${GCJ_LIBART_DEPEND}"
		293	else
		294	GCJ_LIBART_DEPEND="
		295	>=media-libs/libart_lgpl-2.1
		296	amd64? ( multilib? ( \|\| (
		297	>=media-libs/libart_lgpl-2.1[abi_x86_32]
		298	app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
		299	) ) )"
		300	GCJ_LIBART_RDEPEND="${GCJ_LIBART_DEPEND}"
		301	fi
		302	fi
		303
		304	if tc_version_is_at_least 3.4 ; then
		305	if [[ ${EAPI:-0} == [01] ]]; then
		306	GCJ_CAIRO_PANGO_DEPEND="
		307	x11-libs/cairo
		308	x11-libs/pango"
		309	GCJ_CAIRO_PANGO_RDEPEND="${GCJ_CAIRO_PANGO_DEPEND}"
		310	else
		311	GCJ_CAIRO_PANGO_DEPEND="
		312	x11-libs/cairo
313	x11-libs/pango
314	amd64? ( multilib? ( \|\| (
315	(
316	x11-libs/cairo[abi_x86_32]
317	x11-libs/pango[abi_x86_32]
318	)
319	app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
320	) ) )"
321	GCJ_CAIRO_PANGO_RDEPEND="${GCJ_CAIRO_PANGO_DEPEND}"
322	fi
323	fi
324
325	if tc_version_is_at_least 4.0 ; then
326	if [[ ${EAPI:-0} == [01] ]]; then
327	GCJ_XTST_DEPEND="
328	x11-libs/libXtst"
329	GCJ_XTST_RDEPEND="${GCJ_XTST_DEPEND}"
330	else
331	GCJ_XTST_DEPEND="
332	x11-libs/libXtst
333	amd64? ( multilib? ( \|\| (
334	x11-libs/libXtst[abi_x86_32]
335	app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
336	) ) )"
337	GCJ_XTST_RDEPEND="${GCJ_XTST_DEPEND}"
338	fi
339	fi
340
341	if tc_version_is_at_least 4.1 ; then
342	if [[ ${EAPI:-0} == [01] ]]; then
343	GCJ_FREETYPE_DEPEND="
344	media-libs/freetype"
345	GCJ_FREETYPE_RDEPEND="${GCJ_FREETYPE_DEPEND}"
346	else
347	GCJ_FREETYPE_DEPEND="
348	media-libs/freetype
349	amd64? ( multilib? ( \|\| (
350	media-libs/freetype[abi_x86_32]
351	app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
352	) ) )"
353	GCJ_FREETYPE_RDEPEND="${GCJ_FREETYPE_DEPEND}"
354	fi
355	fi
356
357	if tc_version_is_at_least 4.2 ; then
358	if [[ ${EAPI:-0} == [01] ]]; then
359	GCJ_XRANDR_XRENDER_DEPEND="
360	x11-libs/libXrandr
361	x11-libs/libXrender"
362	GCJ_XRANDR_XRENDER_RDEPEND="${GCJ_XRANDR_XRENDER_DEPEND}"
363	else
364	GCJ_XRANDR_XRENDER_DEPEND="
365	x11-libs/libXrandr
366	x11-libs/libXrender
367	amd64? ( multilib? ( \|\| (
368	(
369	x11-libs/libXrandr[abi_x86_32]
370	x11-libs/libXrender[abi_x86_32]
371	)
372	app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
373	) ) )"
374	GCJ_XRANDR_XRENDER_RDEPEND="${GCJ_XRANDR_XRENDER_DEPEND}"
375	fi
376	fi
377
378	GCJ_AWT_DEPEND="
379	awt? (
380	${GCJ_GTK_DEPEND}
381	${GCJ_LIBART_DEPEND}
382	${GCJ_CAIRO_PANGO_DEPEND}
383	${GCJ_XTST_DEPEND}
384	${GCJ_FREETYPE_DEPEND}
385	${GCJ_XRANDR_XRENDER_DEPEND}
386	)"
387	GCJ_AWT_RDEPEND="
388	awt? (
389	${GCJ_GTK_RDEPEND}
390	${GCJ_LIBART_RDEPEND}
391	${GCJ_CAIRO_PANGO_RDEPEND}
392	${GCJ_XTST_RDEPEND}
393	${GCJ_FREETYPE_RDEPEND}
394	${GCJ_XRANDR_XRENDER_RDEPEND}
395	)"
396	fi
397
398	if in_iuse alsa ; then
399	if [[ ${EAPI:-0} == [01] ]]; then
400	GCJ_ALSA_DEPEND="
401	alsa? (
402	media-libs/alsa-lib
403	virtual/pkgconfig
404	)"
405	GCJ_ALSA_RDEPEND="
406	alsa? (
407	media-libs/alsa-lib
408	)"
409	else
410	GCJ_ALSA_DEPEND="
411	alsa? (
412	media-libs/alsa-lib
413	virtual/pkgconfig
414	amd64? ( multilib? ( \|\| (
415	media-libs/alsa-lib[abi_x86_32]
416	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
417	) ) )
418	)"
419	GCJ_ALSA_RDEPEND="
420	alsa? (
421	media-libs/alsa-lib
422	amd64? ( multilib? ( \|\| (
423	media-libs/alsa-lib[abi_x86_32]
424	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
425	) ) )
426	)"
427	fi
428	fi
429
430	if in_iuse dssi ; then
431	if [[ ${EAPI:-0} == [01] ]]; then
432	GCJ_DSSI_DEPEND="
433	dssi? (
434	media-libs/dssi
435	media-sound/jack-audio-connection-kit
436	)"
437	GCJ_DSSI_RDEPEND="
438	dssi? (
439	media-sound/jack-audio-connection-kit
440	)"
441	else
442	GCJ_DSSI_DEPEND="
443	dssi? (
444	media-libs/dssi
445	media-sound/jack-audio-connection-kit
446	amd64? ( multilib? ( \|\| (
447	media-sound/jack-audio-connection-kit[abi_x86_32]
448	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
449	) ) )
450	)"
451	GCJ_DSSI_RDEPEND="
452	dssi? (
453	media-sound/jack-audio-connection-kit
454	amd64? ( multilib? ( \|\| (
455	media-sound/jack-audio-connection-kit[abi_x86_32]
456	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
457	) ) )
458	)"
459	fi
460	fi
461
462	DEPEND+="
463	gcj? (
464	${GCJ_ZLIB_DEPEND}
465	${GCJ_ZIP_DEPEND}
466	${GCJ_GMP_DEPEND}
467	${GCJ_AWT_DEPEND}
468	${GCJ_ALSA_DEPEND}
469	${GCJ_DSSI_DEPEND}
470	)"
471	RDEPEND+="
472	gcj? (
473	${GCJ_ZLIB_RDEPEND}
474	${GCJ_GMP_RDEPEND}
475	${GCJ_AWT_RDEPEND}
476	${GCJ_ALSA_RDEPEND}
477	${GCJ_DSSI_RDEPEND}
478	)"
225	fi	479	fi
226		480
227	PDEPEND=">=sys-devel/gcc-config-1.7"	481	PDEPEND=">=sys-devel/gcc-config-1.7"
Lines 1126-1135 Link Here
1126		1380
1127	### library options	1381	### library options
1128		1382
1129	if ! is_gcj ; then	1383	if is_gcj ; then
		1384	if use awt ; then
		1385	confgcc+=( --enable-java-awt=gtk )
		1386	fi
		1387	confgcc+=( $(use_enable alsa) )
		1388	confgcc+=( $(use_enable dssi) )
		1389	else
1130	confgcc+=( --disable-libgcj )	1390	confgcc+=( --disable-libgcj )
1131	elif use awt ; then
1132	confgcc+=( --enable-java-awt=gtk )
1133	fi	1391	fi
1134		1392
1135	if tc_version_is_at_least 4.2 ; then	1393	if tc_version_is_at_least 4.2 ; then