[patch] cairo-1.12.16.ebuild.patch

cairo-1.12.16.ebuild.patch (text/plain), 2.56 KB, created by Andrew Church on 2013-10-20 06:31:05 UTC

--- cairo-1.12.16.ebuild.orig	2013-08-27 21:16:55 +0900
+++ cairo-1.12.16.ebuild	2013-10-20 15:11:14 +0900
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools multilib-minimal
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
@@ -25,29 +25,29 @@
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
 
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-libs/zlib
-	>=x11-libs/pixman-0.28.0
-	directfb? ( dev-libs/DirectFB )
-	gles2? ( media-libs/mesa[gles2] )
-	glib? ( >=dev-libs/glib-2.28.6:2 )
-	opengl? ( || ( media-libs/mesa[egl] media-libs/opengl-apple ) )
-	openvg? ( media-libs/mesa[openvg] )
-	qt4? ( >=dev-qt/qtgui-4.8:4 )
+RDEPEND="media-libs/fontconfig[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.28.0[${MULTILIB_USEDEP}]
+	directfb? ( dev-libs/DirectFB[${MULTILIB_USEDEP}] )
+	gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.28.6:2[${MULTILIB_USEDEP}] )
+	opengl? ( || ( media-libs/mesa[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+	openvg? ( media-libs/mesa[openvg,${MULTILIB_USEDEP}] )
+	qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
 	X? (
-		>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
+		>=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
 		drm? (
-			>=virtual/udev-136
-			gallium? ( media-libs/mesa[gallium] )
+			>=virtual/udev-136[${MULTILIB_USEDEP}]
+			gallium? ( media-libs/mesa[gallium,${MULTILIB_USEDEP}] )
 		)
 	)
 	xcb? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
+		x11-libs/libxcb[${MULTILIB_USEDEP}]
+		x11-libs/xcb-util[${MULTILIB_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -92,13 +92,14 @@
 	eautoreconf
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myopts
 
 	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
 
 	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
 
+	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-dependency-tracking \
 		$(use_with X x) \
@@ -130,11 +131,13 @@
 		${myopts}
 }
 
-src_install() {
+multilib_src_install() {
 	# parallel make install fails
 	emake -j1 DESTDIR="${D}" install
 	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README
+	if multilib_is_native_abi; then
+		dodoc "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/NEWS "${S}"/README
+	fi
 }
 
 pkg_postinst() {