[patch] apitrace-4.0-RFC.ebuild.patch

apitrace-4.0-RFC.ebuild.patch (text/plain), 3.14 KB, created by David Heidelberg (okias) on 2014-03-14 23:12:51 UTC

--- apitrace-3.0-r1.ebuild	2013-07-18 00:01:15.000000000 +0200
+++ apitrace-4.0.ebuild	2014-03-15 00:09:18.986266874 +0100
@@ -5,7 +5,7 @@
 EAPI="5"
 PYTHON_DEPEND="2:2.6"
 
-inherit cmake-utils eutils python multilib vcs-snapshot
+inherit cmake-multilib eutils python multilib vcs-snapshot
 
 DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
 HOMEPAGE="https://github.com/apitrace/apitrace"
@@ -14,7 +14,7 @@
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="egl multilib qt4"
+IUSE="cli egl qt4"
 
 RDEPEND="app-arch/snappy
 	media-libs/libpng:0=
@@ -25,7 +25,6 @@
 		<media-libs/mesa-8.0[gles]
 	) )
 	x11-libs/libX11
-	multilib? ( app-emulation/emul-linux-x86-baselibs )
 	qt4? (
 		>=dev-qt/qtcore-4.7:4
 		>=dev-qt/qtgui-4.7:4
@@ -36,13 +35,6 @@
 
 EMULTILIB_PKG="true"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-system-libs.patch
-	"${FILESDIR}"/${P}-glxtrace-only.patch
-	"${FILESDIR}"/${PN}-3.0-gcc47.patch
-	"${FILESDIR}"/${P}-memcpy.patch
-)
-
 pkg_setup() {
 	python_set_active_version 2
 }
@@ -54,52 +46,45 @@
 	sed -i -e "s/install (TARGETS/#\0/" gui/CMakeLists.txt || die
 }
 
-src_configure() {
-	for ABI in $(get_install_abis) ; do
-		mycmakeargs=(
+multilib_src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable egl EGL)
+	)
+		
+	if build_native_binaries; then
+		mycmakeargs+=(
+			$(cmake-utils_use_enable cli CLI)
 			$(cmake-utils_use_enable qt4 GUI)
-			$(cmake-utils_use_enable egl EGL)
 		)
+	else
+		mycmakeargs+=(
+			-DENABLE_CLI=OFF
+			-DENABLE_GUI=OFF
+		)
+	fi
 
-		if use multilib ; then
-			if [[ "${ABI}" != "${DEFAULT_ABI}" ]] ; then
-				mycmakeargs=(
-					-DBUILD_LIB_ONLY=ON
-					-DENABLE_GUI=OFF
-					$(cmake-utils_use_enable egl EGL)
-				)
-			fi
-			multilib_toolchain_setup ${ABI}
-		fi
-
-		BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
-		cmake-utils_src_configure
-	done
-}
-
-src_compile() {
-	for ABI in $(get_install_abis) ; do
-		use multilib && multilib_toolchain_setup ${ABI}
-		BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
-		cmake-utils_src_compile
-	done
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/{glretrace,apitrace}
-	use qt4 && dobin "${BUILD_DIR}"/qapitrace
-
-	for ABI in $(get_install_abis) ; do
-		BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
-		exeinto /usr/$(get_libdir)/${PN}/wrappers
-		doexe "${BUILD_DIR}"/wrappers/*.so
-		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-	done
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	dobin "${ED}"/{glretrace,apitrace}
+	use qt4 && dobin "${ED}"/qapitrace
+
+	exeinto /usr/$(get_libdir)/${PN}/wrappers
+	doexe "${ED}"/wrappers/*.so
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
 
-	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
 
 	exeinto /usr/$(get_libdir)/${PN}/scripts
 	doexe $(find scripts -type f -executable)
 }
+
+multilib_src_install_all() {
+	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
+}