4 files changed, 128 insertions, 9 deletions
diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index 58b973f02ca2..18dbfb2618f1 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/apitrace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.1 2011/06/09 05:47:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.2 2011/06/10 10:34:47 radhermit Exp $
+
+*apitrace-1.0-r1 (10 Jun 2011)
+
+  10 Jun 2011; Tim Harder <radhermit@gentoo.org> +apitrace-1.0-r1.ebuild,
+  +files/apitrace-1.0-glxtrace-only.patch:
+  Revision bump to add multilib support (bug #370795).
 
 *apitrace-1.0 (09 Jun 2011)
 
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 161576c9b350..1d71fa81b21e 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA1
 
 AUX apitrace-1.0-automagic-qt.patch 768 RMD160 a966656451f3cea08ecc87c431467cf645ca1ea8 SHA1 7f2ff25ff01edc0acb6477d05f2e8c01bee99359 SHA256 6e93134ba411fee185c27bf7bb84b3f15d403f3fd119d4d86b2ae86306c991f4
+AUX apitrace-1.0-glxtrace-only.patch 660 RMD160 5d9cd457ed13d8c72ac24eb779691c5637045cf5 SHA1 821b39e3689f6ef319f5230da67fa453f2032ef4 SHA256 a78a7a641f911f1b51a611c6ff15b77216dce7d0252ace77b59ab5df90ac5cd8
 DIST apitrace-1.0.tar.gz 770989 RMD160 202d9e215779204fd5d7b69b231293cc16864e57 SHA1 289b7b66e9daf7d25aebd9b7ed1d28a0e6f8a79a SHA256 5747e9b9cc39854d32e6100212c55f228ab41577b18f61e70f21b7a410c8e0fc
+EBUILD apitrace-1.0-r1.ebuild 2004 RMD160 121add3447b31173f7dc19985b550a1a0dc1c8d7 SHA1 d5b21e7e7ed37d94cebd75f72155c9d20976f425 SHA256 65e720abc8755ec825c6de43532586199ac429349975e455661906ceabb8ee5b
 EBUILD apitrace-1.0.ebuild 1316 RMD160 b1870727fa75fc134cbb7872ebea9702c6814d9f SHA1 1fcec0f977120aa38ad75679d150b0031d95f6a4 SHA256 790ac7c3551f7c7f9eb6e534ddafa8b28a3142255e560b336278c6db98860308
-MISC ChangeLog 386 RMD160 0fe2efe8120d2cbd08b726c9fad1a2585cc17a97 SHA1 444cbbf2db39b6597d998014d6e10a725a2dca78 SHA256 516268c76ba2f29a5c9da3b4cde1a04c3d1d8f0ff58c5ded1111704f8e7f39f0
+MISC ChangeLog 591 RMD160 01d2e92242d09224f4f561acab58f66be84fdab0 SHA1 7c4932fa9f74758c9a02b1ca865d6edf9b194ec9 SHA256 56f2ff939cf6837d6956b0ef8627b52f381a9406b6fd94d8c2c4ee0fc0a30eb6
 MISC metadata.xml 254 RMD160 161337e6910a0fd0b752294ab4aa7640c7c2aad6 SHA1 e1d817485dd8943fcb7bfefec4ccff1d56e5b2f7 SHA256 27ec031bea6f122f30a7a6ce887a0174396b7aa96aa28472472ac67b2b24078b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN8F55AAoJEEqz6FtPBkyjh+YH/RC6MrYHHGzJsBH438gT1CVc
-ARVy0RNW3iBBDJ5MkOLMfsFmexfqbEehBAkpJwczGxzE4/6iQu6sBUNanDZdukSV
-SVGIvaPq9lRH7Jh5iH6DcOgf4FqRakeSFF9c6KxTOeEhMZhoROeJGsOHOdWorms9
-N6uKEKP1WgD+caaUZbcZbIu+YB50hycJ4bPmqLxHoUq83QvdHA6kR+XLANS6Huc/
-WsDv85V6LHyYttVHeYgVKiLROjYUkGhclfRor8WveQptltPgakYAnNFAVdLtPBIN
-so3WIkXW4sdIyLZ2ahRwlIwfsbfNmjJXk8KrNAGPH7UEEeZu7hOTAc0q0x/J42M=
-=1dTx
+iQEcBAEBAgAGBQJN8fNTAAoJEEqz6FtPBkyjHIUH/Rsm+FOQKSlhx4x55UDiiyES
+8iHX0wRO4gHEfr4148snykpUuVOQ3GxkHlEb5ZcPBRzW2+Td5WQNdTnwe8nNFhSY
+3GdqAHcZtxUDw80PGwL3/VIjZ4VcLvetLzv4qHNKDrwwRh4hdVzn/K4TPfmrw0wp
+cA1F7HTBg5f1AGyOzL5tPkvmaHtGQck9bu0sIQPKOnREIiQWt12X3jChnLJuBsiK
+nP5/Cj1P0bw0w6kvIm8vg16BC8lksgz1Em9AfUmnL6T8KiZdxevyHqmauz2LtiCv
+1UxSTquHp5uHeFojUhY3Zk3s0ggskMBDfbl437Hd1DgXR8j3ME5d/v0IUT9OZUY=
+=ZGcM
 -----END PGP SIGNATURE-----
diff --git a/dev-util/apitrace/apitrace-1.0-r1.ebuild b/dev-util/apitrace/apitrace-1.0-r1.ebuild
new file mode 100644
index 000000000000..28567ee5fa9d
--- /dev/null
+++ b/dev-util/apitrace/apitrace-1.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-1.0-r1.ebuild,v 1.1 2011/06/10 10:34:46 radhermit Exp $
+
+EAPI=3
+
+inherit cmake-utils eutils python multilib
+
+DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="multilib qt4"
+
+RDEPEND="media-libs/libpng
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	multilib? ( app-emulation/emul-linux-x86-baselibs )
+	qt4? (
+		>=x11-libs/qt-core-4.7:4
+		>=x11-libs/qt-gui-4.7:4
+		>=x11-libs/qt-webkit-4.7:4
+		>=dev-libs/qjson-0.5
+	)"
+DEPEND="${RDEPEND}
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )"
+
+EMULTILIB_PKG="true"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-automagic-qt.patch \
+		"${FILESDIR}"/${P}-glxtrace-only.patch
+}
+
+src_configure() {
+	for ABI in $(get_install_abis) ; do
+		mycmakeargs=( $(cmake-utils_use_enable qt4 GUI) )
+
+		if use multilib ; then
+			if [[ "${ABI}" != "${DEFAULT_ABI}" ]] ; then
+				mycmakeargs=( -DBUILD_LIB_ONLY=ON -DENABLE_GUI=OFF )
+			fi
+			multilib_toolchain_setup ${ABI}
+		fi
+
+		CMAKE_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}
+		CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
+		cmake-utils_src_compile
+	done
+}
+
+src_install() {
+	dobin "${CMAKE_BUILD_DIR}"/{glretrace,tracedump} || die
+	use qt4 && { dobin "${CMAKE_BUILD_DIR}"/qapitrace || die ; }
+
+	for ABI in $(get_install_abis) ; do
+		CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
+		dolib.so "${CMAKE_BUILD_DIR}"/glxtrace.so || die
+	done
+
+	dodoc README TODO || die
+
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/* || die
+}
diff --git a/dev-util/apitrace/files/apitrace-1.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-1.0-glxtrace-only.patch
new file mode 100644
index 000000000000..d94c3b6fe7f3
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-1.0-glxtrace-only.patch
@@ -0,0 +1,26 @@
+--- apitrace-apitrace-5f03103/CMakeLists.txt.orig
++++ apitrace-apitrace-5f03103/CMakeLists.txt
+@@ -19,6 +19,8 @@
+ find_package (PythonInterp REQUIRED)
+ find_package (OpenGL REQUIRED)
+ 
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
++
+ option (ENABLE_GUI "Build the QT-based GUI." ON)
+ if (ENABLE_GUI)
+     find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit)
+@@ -232,6 +234,8 @@
+     target_link_libraries (glxtrace dl)
+ endif ()
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ if (WIN32)
+     set (os os_win32.cpp)
+     set (glws glws_wgl.cpp)
+@@ -290,3 +294,5 @@
+ if (ENABLE_GUI)
+     add_subdirectory(gui)
+ endif (ENABLE_GUI)
++
++endif (NOT BUILD_LIB_ONLY)