Attachment #404448 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.7 && IUSE+=" go"

		>=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="
		multilib? ( amd64? (
			sys-libs/zlib[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="
			multilib? ( amd64? (
				dev-libs/gmp[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
			multilib? ( amd64? (
				virtual/pkgconfig[abi_x86_32]
				x11-libs/gtk+:2[abi_x86_32]
				x11-libs/libX11[abi_x86_32]
				x11-proto/xproto[abi_x86_32]
			) )"
		GCJ_GTK_RDEPEND="
			x11-libs/gtk+:2
			multilib? ( amd64? (
				x11-libs/gtk+:2[abi_x86_32]
		) )"

		if tc_version_is_between 3.4 4.1 ; then
			GCJ_LIBART_DEPEND="
				>=media-libs/libart_lgpl-2.1
				multilib? ( amd64? (
					>=media-libs/libart_lgpl-2.1[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
				multilib? ( amd64? (
					x11-libs/cairo[abi_x86_32]
					x11-libs/pango[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
				multilib? ( amd64? (
					x11-libs/libXtst[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
				multilib? ( amd64? (
					media-libs/freetype[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
				multilib? ( amd64? (
						x11-libs/libXrandr[abi_x86_32]
						x11-libs/libXrender[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
				multilib? ( amd64? (
					media-libs/alsa-lib[abi_x86_32]
					virtual/pkgconfig[abi_x86_32]
				) )
			)"
		GCJ_ALSA_RDEPEND="
			alsa? (
				media-libs/alsa-lib
				multilib? ( amd64? (
					media-libs/alsa-lib[abi_x86_32]
				) )
			)"
	fi

	if in_iuse dssi ; then
		GCJ_DSSI_DEPEND="
			dssi? (
				media-libs/dssi
				media-sound/jack-audio-connection-kit
				multilib? ( amd64? (
					media-sound/jack-audio-connection-kit[abi_x86_32]
				) )
			)"
		GCJ_DSSI_RDEPEND="
			dssi? (
				media-sound/jack-audio-connection-kit
				multilib? ( amd64? (
					media-sound/jack-audio-connection-kit[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 / +190 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.7 && IUSE+=" go"	149	tc_version_is_at_least 4.7 && IUSE+=" go"
Lines 203-226 Link Here
203	>=sys-devel/autogen-5.5.4	203	>=sys-devel/autogen-5.5.4
204	)"	204	)"
205		205
		206	GCJ_ZLIB_DEPEND=""
		207	GCJ_ZLIB_RDEPEND=""
		208	GCJ_ZIP_DEPEND=""
		209	GCJ_GMP_DEPEND=""
		210	GCJ_GMP_RDEPEND=""
		211	GCJ_GTK_DEPEND=""
		212	GCJ_GTK_RDEPEND=""
		213	GCJ_LIBART_DEPEND=""
		214	GCJ_LIBART_RDEPEND=""
		215	GCJ_CAIRO_PANGO_DEPEND=""
		216	GCJ_CAIRO_PANGO_RDEPEND=""
		217	GCJ_XTST_DEPEND=""
		218	GCJ_XTST_RDEPEND=""
		219	GCJ_FREETYPE_DEPEND=""
		220	GCJ_FREETYPE_RDEPEND=""
		221	GCJ_XRANDR_XRENDER_DEPEND=""
		222	GCJ_XRANDR_XRENDER_RDEPEND=""
		223	GCJ_AWT_DEPEND=""
		224	GCJ_AWT_RDEPEND=""
		225	GCJ_ALSA_DEPEND=""
		226	GCJ_ALSA_RDEPEND=""
		227	GCJ_DSSI_DEPEND=""
		228	GCJ_DSSI_RDEPEND=""
		229
206	if in_iuse gcj ; then	230	if in_iuse gcj ; then
207	GCJ_DEPS=">=media-libs/libart_lgpl-2.1"	231	GCJ_ZLIB_DEPEND="
208	GCJ_GTK_DEPS="	232	multilib? ( amd64? (
209	x11-libs/libXt	233	sys-libs/zlib[abi_x86_32]
210	x11-libs/libX11	234	) )"
211	x11-libs/libXtst	235	GCJ_ZLIB_RDEPEND="${GCJ_ZLIB_DEPEND}"
212	x11-proto/xproto	236
213	x11-proto/xextproto	237	tc_version_is_at_least 4.2 && GCJ_ZIP_DEPEND="app-arch/zip app-arch/unzip"
214	=x11-libs/gtk+-2*	238
215	virtual/pkgconfig	239	if tc_version_is_at_least 4.4 ; then
216	amd64? ( multilib? (	240	GCJ_GMP_DEPEND="
217	app-emulation/emul-linux-x86-gtklibs	241	multilib? ( amd64? (
218	app-emulation/emul-linux-x86-xlibs	242	dev-libs/gmp[abi_x86_32]
219	) )	243	) )"
220	"	244	GCJ_GMP_RDEPEND="${GCJ_GMP_DEPEND}"
221	tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"	245	fi
222	tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"	246
223	DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"	247	if in_iuse awt ; then
		248	GCJ_GTK_DEPEND="
		249	virtual/pkgconfig
		250	x11-libs/gtk+:2
		251	x11-libs/libX11
		252	x11-proto/xproto
		253	multilib? ( amd64? (
		254	virtual/pkgconfig[abi_x86_32]
		255	x11-libs/gtk+:2[abi_x86_32]
		256	x11-libs/libX11[abi_x86_32]
		257	x11-proto/xproto[abi_x86_32]
		258	) )"
		259	GCJ_GTK_RDEPEND="
		260	x11-libs/gtk+:2
		261	multilib? ( amd64? (
		262	x11-libs/gtk+:2[abi_x86_32]
		263	) )"
		264
		265	if tc_version_is_between 3.4 4.1 ; then
		266	GCJ_LIBART_DEPEND="
		267	>=media-libs/libart_lgpl-2.1
		268	multilib? ( amd64? (
		269	>=media-libs/libart_lgpl-2.1[abi_x86_32]
		270	) )"
		271	GCJ_LIBART_RDEPEND="${GCJ_LIBART_DEPEND}"
		272	fi
		273
		274	if tc_version_is_at_least 3.4 ; then
		275	GCJ_CAIRO_PANGO_DEPEND="
		276	x11-libs/cairo
		277	x11-libs/pango
		278	multilib? ( amd64? (
		279	x11-libs/cairo[abi_x86_32]
		280	x11-libs/pango[abi_x86_32]
		281	) )"
		282	GCJ_CAIRO_PANGO_RDEPEND="${GCJ_CAIRO_PANGO_DEPEND}"
		283	fi
		284
		285	if tc_version_is_at_least 4.0 ; then
		286	GCJ_XTST_DEPEND="
		287	x11-libs/libXtst
		288	multilib? ( amd64? (
		289	x11-libs/libXtst[abi_x86_32]
		290	) )"
		291	GCJ_XTST_RDEPEND="${GCJ_XTST_DEPEND}"
		292	fi
		293
		294	if tc_version_is_at_least 4.1 ; then
		295	GCJ_FREETYPE_DEPEND="
		296	media-libs/freetype
		297	multilib? ( amd64? (
		298	media-libs/freetype[abi_x86_32]
		299	) )"
		300	GCJ_FREETYPE_RDEPEND="${GCJ_FREETYPE_DEPEND}"
		301	fi
		302
		303	if tc_version_is_at_least 4.2 ; then
		304	GCJ_XRANDR_XRENDER_DEPEND="
		305	x11-libs/libXrandr
		306	x11-libs/libXrender
		307	multilib? ( amd64? (
		308	x11-libs/libXrandr[abi_x86_32]
		309	x11-libs/libXrender[abi_x86_32]
		310	) )"
		311	GCJ_XRANDR_XRENDER_RDEPEND="${GCJ_XRANDR_XRENDER_DEPEND}"
312	fi
313
314	GCJ_AWT_DEPEND="
315	awt? (
316	${GCJ_GTK_DEPEND}
317	${GCJ_LIBART_DEPEND}
318	${GCJ_CAIRO_PANGO_DEPEND}
319	${GCJ_XTST_DEPEND}
320	${GCJ_FREETYPE_DEPEND}
321	${GCJ_XRANDR_XRENDER_DEPEND}
322	)"
323	GCJ_AWT_RDEPEND="
324	awt? (
325	${GCJ_GTK_RDEPEND}
326	${GCJ_LIBART_RDEPEND}
327	${GCJ_CAIRO_PANGO_RDEPEND}
328	${GCJ_XTST_RDEPEND}
329	${GCJ_FREETYPE_RDEPEND}
330	${GCJ_XRANDR_XRENDER_RDEPEND}
331	)"
332	fi
333
334	if in_iuse alsa ; then
335	GCJ_ALSA_DEPEND="
336	alsa? (
337	media-libs/alsa-lib
338	virtual/pkgconfig
339	multilib? ( amd64? (
340	media-libs/alsa-lib[abi_x86_32]
341	virtual/pkgconfig[abi_x86_32]
342	) )
343	)"
344	GCJ_ALSA_RDEPEND="
345	alsa? (
346	media-libs/alsa-lib
347	multilib? ( amd64? (
348	media-libs/alsa-lib[abi_x86_32]
349	) )
350	)"
351	fi
352
353	if in_iuse dssi ; then
354	GCJ_DSSI_DEPEND="
355	dssi? (
356	media-libs/dssi
357	media-sound/jack-audio-connection-kit
358	multilib? ( amd64? (
359	media-sound/jack-audio-connection-kit[abi_x86_32]
360	) )
361	)"
362	GCJ_DSSI_RDEPEND="
363	dssi? (
364	media-sound/jack-audio-connection-kit
365	multilib? ( amd64? (
366	media-sound/jack-audio-connection-kit[abi_x86_32]
367	) )
368	)"
369	fi
370
371	DEPEND+="
372	gcj? (
373	${GCJ_ZLIB_DEPEND}
374	${GCJ_ZIP_DEPEND}
375	${GCJ_GMP_DEPEND}
376	${GCJ_AWT_DEPEND}
377	${GCJ_ALSA_DEPEND}
378	${GCJ_DSSI_DEPEND}
379	)"
380	RDEPEND+="
381	gcj? (
382	${GCJ_ZLIB_RDEPEND}
383	${GCJ_GMP_RDEPEND}
384	${GCJ_AWT_RDEPEND}
385	${GCJ_ALSA_RDEPEND}
386	${GCJ_DSSI_RDEPEND}
387	)"
224	fi	388	fi
225		389
226	PDEPEND=">=sys-devel/gcc-config-1.7"	390	PDEPEND=">=sys-devel/gcc-config-1.7"
Lines 1119-1128 Link Here
1119		1283
1120	### library options	1284	### library options
1121		1285
1122	if ! is_gcj ; then	1286	if is_gcj ; then
		1287	if use awt ; then
		1288	confgcc+=( --enable-java-awt=gtk )
		1289	fi
		1290	confgcc+=( $(use_enable alsa) )
		1291	confgcc+=( $(use_enable dssi) )
		1292	else
1123	confgcc+=( --disable-libgcj )	1293	confgcc+=( --disable-libgcj )
1124	elif use awt ; then
1125	confgcc+=( --enable-java-awt=gtk )
1126	fi	1294	fi
1127		1295
1128	if tc_version_is_at_least 4.2 ; then	1296	if tc_version_is_at_least 4.2 ; then