Attachment #389818 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
	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}"

	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
		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

	if in_iuse awt ; then
		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]
		) ) )"

		if tc_version_is_between 3.4 4.1 ; then
			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

		if tc_version_is_at_least 3.4 ; then
			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

		if tc_version_is_at_least 4.0 ; then
			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

		if tc_version_is_at_least 4.1 ; then
			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

		if tc_version_is_at_least 4.2 ; then
			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

		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
		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

	if in_iuse dssi ; then
		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

	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 / +210 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	GCJ_ZLIB_DEPEND="
209	GCJ_GTK_DEPS="	233	amd64? ( multilib? ( \|\| (
210	x11-libs/libXt	234	sys-libs/zlib[abi_x86_32]
211	x11-libs/libX11	235	app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
212	x11-libs/libXtst	236	) ) )"
213	x11-proto/xproto	237	GCJ_ZLIB_RDEPEND="${GCJ_ZLIB_DEPEND}"
214	x11-proto/xextproto	238
215	=x11-libs/gtk+-2*	239	tc_version_is_at_least 4.2 && GCJ_ZIP_DEPEND="app-arch/zip app-arch/unzip"
216	virtual/pkgconfig	240
217	amd64? ( multilib? (	241	if tc_version_is_at_least 4.4 ; then
218	app-emulation/emul-linux-x86-gtklibs	242	GCJ_GMP_DEPEND="
219	app-emulation/emul-linux-x86-xlibs	243	amd64? ( multilib? ( \|\| (
220	) )	244	dev-libs/gmp[abi_x86_32]
221	"	245	app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
222	tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"	246	) ) )"
223	tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"	247	GCJ_GMP_RDEPEND="${GCJ_GMP_DEPEND}"
224	DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"	248	fi
		249
		250	if in_iuse awt ; then
		251	GCJ_GTK_DEPEND="
		252	virtual/pkgconfig
		253	x11-libs/gtk+:2
		254	x11-libs/libX11
		255	x11-proto/xproto
		256	amd64? ( multilib? ( \|\| (
		257	(
		258	x11-libs/gtk+:2[abi_x86_32]
		259	x11-libs/libX11[abi_x86_32]
		260	x11-proto/xproto[abi_x86_32]
		261	)
		262	(
		263	app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
		264	app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
		265	)
		266	) ) )"
		267	GCJ_GTK_RDEPEND="
		268	x11-libs/gtk+:2
		269	amd64? ( multilib? ( \|\| (
		270	x11-libs/gtk+:2[abi_x86_32]
		271	app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
		272	) ) )"
		273
		274	if tc_version_is_between 3.4 4.1 ; then
		275	GCJ_LIBART_DEPEND="
		276	>=media-libs/libart_lgpl-2.1
		277	amd64? ( multilib? ( \|\| (
		278	>=media-libs/libart_lgpl-2.1[abi_x86_32]
		279	app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
		280	) ) )"
		281	GCJ_LIBART_RDEPEND="${GCJ_LIBART_DEPEND}"
		282	fi
		283
		284	if tc_version_is_at_least 3.4 ; then
		285	GCJ_CAIRO_PANGO_DEPEND="
		286	x11-libs/cairo
		287	x11-libs/pango
		288	amd64? ( multilib? ( \|\| (
		289	(
		290	x11-libs/cairo[abi_x86_32]
		291	x11-libs/pango[abi_x86_32]
		292	)
		293	app-emulation/emul-linux-x86-gtklibs[-abi_x86_32]
		294	) ) )"
		295	GCJ_CAIRO_PANGO_RDEPEND="${GCJ_CAIRO_PANGO_DEPEND}"
		296	fi
		297
		298	if tc_version_is_at_least 4.0 ; then
		299	GCJ_XTST_DEPEND="
		300	x11-libs/libXtst
		301	amd64? ( multilib? ( \|\| (
		302	x11-libs/libXtst[abi_x86_32]
		303	app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
		304	) ) )"
		305	GCJ_XTST_RDEPEND="${GCJ_XTST_DEPEND}"
		306	fi
		307
		308	if tc_version_is_at_least 4.1 ; then
		309	GCJ_FREETYPE_DEPEND="
		310	media-libs/freetype
		311	amd64? ( multilib? ( \|\| (
		312	media-libs/freetype[abi_x86_32]
313	app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
314	) ) )"
315	GCJ_FREETYPE_RDEPEND="${GCJ_FREETYPE_DEPEND}"
316	fi
317
318	if tc_version_is_at_least 4.2 ; then
319	GCJ_XRANDR_XRENDER_DEPEND="
320	x11-libs/libXrandr
321	x11-libs/libXrender
322	amd64? ( multilib? ( \|\| (
323	(
324	x11-libs/libXrandr[abi_x86_32]
325	x11-libs/libXrender[abi_x86_32]
326	)
327	app-emulation/emul-linux-x86-xlibs[-abi_x86_32]
328	) ) )"
329	GCJ_XRANDR_XRENDER_RDEPEND="${GCJ_XRANDR_XRENDER_DEPEND}"
330	fi
331
332	GCJ_AWT_DEPEND="
333	awt? (
334	${GCJ_GTK_DEPEND}
335	${GCJ_LIBART_DEPEND}
336	${GCJ_CAIRO_PANGO_DEPEND}
337	${GCJ_XTST_DEPEND}
338	${GCJ_FREETYPE_DEPEND}
339	${GCJ_XRANDR_XRENDER_DEPEND}
340	)"
341	GCJ_AWT_RDEPEND="
342	awt? (
343	${GCJ_GTK_RDEPEND}
344	${GCJ_LIBART_RDEPEND}
345	${GCJ_CAIRO_PANGO_RDEPEND}
346	${GCJ_XTST_RDEPEND}
347	${GCJ_FREETYPE_RDEPEND}
348	${GCJ_XRANDR_XRENDER_RDEPEND}
349	)"
350	fi
351
352	if in_iuse alsa ; then
353	GCJ_ALSA_DEPEND="
354	alsa? (
355	media-libs/alsa-lib
356	virtual/pkgconfig
357	amd64? ( multilib? ( \|\| (
358	media-libs/alsa-lib[abi_x86_32]
359	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
360	) ) )
361	)"
362	GCJ_ALSA_RDEPEND="
363	alsa? (
364	media-libs/alsa-lib
365	amd64? ( multilib? ( \|\| (
366	media-libs/alsa-lib[abi_x86_32]
367	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
368	) ) )
369	)"
370	fi
371
372	if in_iuse dssi ; then
373	GCJ_DSSI_DEPEND="
374	dssi? (
375	media-libs/dssi
376	media-sound/jack-audio-connection-kit
377	amd64? ( multilib? ( \|\| (
378	media-sound/jack-audio-connection-kit[abi_x86_32]
379	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
380	) ) )
381	)"
382	GCJ_DSSI_RDEPEND="
383	dssi? (
384	media-sound/jack-audio-connection-kit
385	amd64? ( multilib? ( \|\| (
386	media-sound/jack-audio-connection-kit[abi_x86_32]
387	app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
388	) ) )
389	)"
390	fi
391
392	DEPEND+="
393	gcj? (
394	${GCJ_ZLIB_DEPEND}
395	${GCJ_ZIP_DEPEND}
396	${GCJ_GMP_DEPEND}
397	${GCJ_AWT_DEPEND}
398	${GCJ_ALSA_DEPEND}
399	${GCJ_DSSI_DEPEND}
400	)"
401	RDEPEND+="
402	gcj? (
403	${GCJ_ZLIB_RDEPEND}
404	${GCJ_GMP_RDEPEND}
405	${GCJ_AWT_RDEPEND}
406	${GCJ_ALSA_RDEPEND}
407	${GCJ_DSSI_RDEPEND}
408	)"
225	fi	409	fi
226		410
227	PDEPEND=">=sys-devel/gcc-config-1.7"	411	PDEPEND=">=sys-devel/gcc-config-1.7"
Lines 1126-1135 Link Here
1126		1310
1127	### library options	1311	### library options
1128		1312
1129	if ! is_gcj ; then	1313	if is_gcj ; then
		1314	if use awt ; then
		1315	confgcc+=( --enable-java-awt=gtk )
		1316	fi
		1317	confgcc+=( $(use_enable alsa) )
		1318	confgcc+=( $(use_enable dssi) )
		1319	else
1130	confgcc+=( --disable-libgcj )	1320	confgcc+=( --disable-libgcj )
1131	elif use awt ; then
1132	confgcc+=( --enable-java-awt=gtk )
1133	fi	1321	fi
1134		1322
1135	if tc_version_is_at_least 4.2 ; then	1323	if tc_version_is_at_least 4.2 ; then