half of cogl/clutter is now multilib-friendly

2 files changed, 48 insertions, 33 deletions

diff --git a/media-libs/clutter/clutter-1.22.0.ebuild b/media-libs/clutter/clutter-1.22.0.ebuild
index b461f87..a207328 100644
--- a/media-libs/clutter/clutter-1.22.0.ebuild
+++ b/media-libs/clutter/clutter-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 virtualx
+inherit flag-o-matic gnome2 toolchain-funcs virtualx multilib-minimal
 
 HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
@@ -18,22 +18,22 @@ REQUIRED_USE="
 	|| ( aqua wayland X )
 	wayland? ( egl )
 "
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # XXX: uprof needed for profiling
 # >=libX11-1.3.1 needed for X Generic Event support
 # do not depend on tslib, it does not build and is disable by default upstream
 RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.20.0[introspection?,pango,wayland?]
-	>=x11-libs/cairo-1.14:=[aqua?,glib]
-	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/glib-2.37.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.5.3[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/json-glib-0.12[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14:=[aqua?,glib,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.30[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/cogl-1.20.0[introspection?,pango,wayland?,${MULTILIB_USEDEP}]
 
 	virtual/opengl
-	x11-libs/libdrm:=
+	x11-libs/libdrm:=[${MULTILIB_USEDEP}]
 
 	egl? (
 		>=dev-libs/libinput-0.8
@@ -41,29 +41,29 @@ RDEPEND="
 		>=virtual/libgudev-136
 		x11-libs/libxkbcommon
 	)
-	gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
+	gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?,${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 	X? (
-		media-libs/fontconfig
-		>=x11-libs/libX11-1.3.1
-		x11-libs/libXext
-		x11-libs/libXdamage
-		x11-proto/inputproto
-		>=x11-libs/libXi-1.3
-		>=x11-libs/libXcomposite-0.4 )
+		media-libs/fontconfig[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.3.1[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcomposite-0.4[${MULTILIB_USEDEP}] )
 	wayland? (
-		dev-libs/wayland
-		x11-libs/gdk-pixbuf:2 )
+		dev-libs/wayland[${MULTILIB_USEDEP}]
+		x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.20
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1
 	doc? (
 		>=dev-util/gtk-doc-1.20
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-	test? ( x11-libs/gdk-pixbuf )"
+		>=app-text/docbook-sgml-utils-0.6.14[jadetex,${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}] )
+	test? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )"
 
 # Tests fail with both swrast and llvmpipe
 # They pass under r600g or i965, so the bug is in mesa
@@ -79,11 +79,21 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
+	tc-export PKG_CONFIG
+	PKG_CONFIG_LIBDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+
+	local myopts
+
+	if ! multilib_is_native_abi; then
+		myopts+=" --disable-egl-backend --disable-evdev-input --disable-introspection"
+	fi
+
 	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
 	# (GLX error blabla)
 	# XXX: Profiling, coverage disabled for now
 	# XXX: What about cex100/win32 backends?
+	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
 		--disable-profile \
 		--disable-maintainer-flags \
@@ -102,9 +112,10 @@ src_configure() {
 		$(use_enable wayland wayland-backend) \
 		$(use_enable wayland wayland-compositor) \
 		$(use_enable X xinput) \
-		$(use_enable X x11-backend)
+		$(use_enable X x11-backend) \
+		${myopts}
 }
 
-src_test() {
+multilib_src_test() {
 	Xemake check -C tests/conform
 }
diff --git a/media-libs/cogl/cogl-1.20.0.ebuild b/media-libs/cogl/cogl-1.20.0.ebuild
index c25a22b..1c048e8 100644
--- a/media-libs/cogl/cogl-1.20.0.ebuild
+++ b/media-libs/cogl/cogl-1.20.0.ebuild
@@ -14,13 +14,14 @@ HOMEPAGE="http://www.cogl3d.org/"
 LICENSE="MIT BSD"
 SLOT="1.0/20" # subslot = .so version
 # doc and profile disable for now due bugs #484750 and #483332
-IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile
+IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland"
+# doc profile
 REQUIRED_USE="wayland? ( gles2 )"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.32:2
-	x11-libs/cairo:=
+	x11-libs/cairo:0=
 	>=x11-libs/gdk-pixbuf-2:2
 	x11-libs/libX11
 	>=x11-libs/libXcomposite-0.4
@@ -45,11 +46,12 @@ COMMON_DEPEND="
 "
 # before clutter-1.7, cogl was part of clutter
 RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7"
+	!<media-libs/clutter-1.7
+"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	sys-devel/gettext
-	virtual/pkgconfig
+	>=virtual/pkgconfig-0-r1
 	test? (
 		app-eselect/eselect-opengl
 		media-libs/mesa[classic] )
@@ -59,8 +61,9 @@ DEPEND="${COMMON_DEPEND}
 # For some reason GL3 conformance test all fails again...
 RESTRICT="test"
 
-# gst-cogl plugin relink fails with parallel make
-use gstreamer && MAKEOPTS+=" -j1"
+pkg_setup() {
+	use gstreamer && addpredict /dev/video0
+}
 
 src_prepare() {
 	# Do not build examples
@@ -89,6 +92,7 @@ src_configure() {
 	# Prefer gl over gles2 if both are selected
 	# Profiling needs uprof, which is not available in portage yet, bug #484750
 	# FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
+#	ECONF_SOURCE=${S} \
 	gnome2_src_configure \
 		--disable-examples-install \
 		--disable-maintainer-flags \
@@ -129,7 +133,7 @@ src_install() {
 	DOCS="NEWS README"
 	EXAMPLES="examples/{*.c,*.jpg}"
 
-	clutter_src_install
+	MAKEOPTS="${MAKEOPTS} -j1" clutter_src_install
 
 	# Remove silly examples-data directory
 	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die