Version bump.

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

5 files changed, 253 insertions, 8 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index c3fec2466e1f..e465e56f68dc 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2011/09/13 13:15:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.5 2011/10/01 23:44:02 radhermit Exp $
+
+*apitrace-2.0 (01 Oct 2011)
+
+  01 Oct 2011; Tim Harder <radhermit@gentoo.org> +apitrace-2.0.ebuild,
+  +files/apitrace-2.0-glxtrace-only.patch,
+  +files/apitrace-2.0-system-libs.patch:
+  Version bump.
 
   13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> apitrace-1.0-r1.ebuild,
   +files/apitrace-1.0-libpng15.patch:
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 6eb7c1f11712..4cb126dfd7a3 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,19 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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
 AUX apitrace-1.0-libpng15.patch 592 RMD160 bf8190344f9aa8864615a4fa069d166246a42ab2 SHA1 ed148176b9357d9dd289b41821702cc35f7b136a SHA256 9567682a6e558301e5e1f6f35b3ab54bdcd32be7d182eef881954d47b41200ba
+AUX apitrace-2.0-glxtrace-only.patch 2174 RMD160 8e5c50a363adeced2cf78355cf09e69a9241ab0f SHA1 f645467cb739510a505b31d8dd2773adf73555b6 SHA256 f66b9fcd53230af0196007435691deef93d0cb0016bf8163b6936419ca729f2b
+AUX apitrace-2.0-system-libs.patch 2057 RMD160 0da92249f954b95f5ea9b50796e4f312c7a430fb SHA1 8e122badac08154ea2a77378330fd644008faee6 SHA256 e37b5adddbfb6aac39f6f808ae548760e1cfaedc0ce6a877ce1a29a4159f9615
 DIST apitrace-1.0.tar.gz 770989 RMD160 202d9e215779204fd5d7b69b231293cc16864e57 SHA1 289b7b66e9daf7d25aebd9b7ed1d28a0e6f8a79a SHA256 5747e9b9cc39854d32e6100212c55f228ab41577b18f61e70f21b7a410c8e0fc
+DIST apitrace-2.0.tar.gz 943001 RMD160 ca378b2a45cb8873d19bbfe549879f256e4acc48 SHA1 9233520a2a8d91ccae826fccc0c1f3038518a5ec SHA256 a037d24a4bb01c67a7ac517b22b0d3a1b303ccfff0f1249f143e529aaa98f705
 EBUILD apitrace-1.0-r1.ebuild 2046 RMD160 eb80d351f80bdc44c46bbcf867867d08b3ccf0eb SHA1 b9fa737c187f34d78884203e3a134f5d3e35f975 SHA256 835af7520123aff049e5c2809fad0646c3ce756e6528514809eb2611e116e9c1
-MISC ChangeLog 858 RMD160 b41c1001f2a494db6e0c0b1a549fc1e3ac1de32d SHA1 d68a2af8b7507f01256c2e17b5e02d51589a1b5f SHA256 7d7ed089ec658e405faabb88279725cf9391c729fb3a0e8d8f9cfe106d13ada7
+EBUILD apitrace-2.0.ebuild 2018 RMD160 e99650e47d80db394d8ff8ae6cdcff478fd031b4 SHA1 9c7c8d5eec0e6553b32d36a621b969af31f10d20 SHA256 95d151def3affd42579809ccca9d3cb9698af8ba65730cf3cbf1d537a5524dc3
+MISC ChangeLog 1059 RMD160 4b175e42ff600a37895dc224ad17bff7f521c360 SHA1 9e6b98444ccec93f5db3acdef15d46ab0a1bc535 SHA256 07e3dd5925f5b2ab146b732f97f2f4ad0be7af5176538c1052182bfd8230a9c3
 MISC metadata.xml 232 RMD160 9725fc18735b1d8d4079f25759ee0823a0c6795d SHA1 ec75efe30e67f74a4f315324afc75ed2a8d30bb4 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59m4oACgkQfXuS5UK5QB3rGgP/dKIuAMiCMAhKP8EyCJah682M
-AraaxwOHyrcArQ4CupoYuD1wOm4TN6vuOO8izebo6YeFfLHaZKj6J5Xx0ZMnjMbM
-esYfWXBmYcGzKj7oQV0+AN0a9lct+VtipjExtDOH9aABdNbECp+RxYj0TDRKabtZ
-TN2iopCVeuY0HO+8r/k=
-=Pt36
+iQEcBAEBCgAGBQJOh6XOAAoJEEqz6FtPBkyjlwsH/imXiNVMw6yRgpL0FEFeG9se
+4AzL1Bz6W18l9ezZWTz26ave+15D+b46fYELYwhCFHa9eeNjyG7QazoLd+xkBBDE
+Hecu6qTL9AtD64MmJ8S/XHUEkLEyaUEndL2ajSeGLjHOGdNP+6yIGxEGR7Pobmbb
+5C+q1RxGL1YejwjQDBjZ++NbKC34C5kJ+dG+jmsgQmEizzXATd5X+pZWe6V+OGcT
+tvcZZhtz8G5HRfQFLJX2gfeShkAP9ZuNI+kLcZOekwq76LP2Syyz4vmDdgHTGQ1k
+tthlRUMbSe+Up1C+wHKfPlxpbOPqeXiH0SyvwlXmrGyZzMslMJV8+GDFTGTXey4=
+=SMz7
 -----END PGP SIGNATURE-----
diff --git a/dev-util/apitrace/apitrace-2.0.ebuild b/dev-util/apitrace/apitrace-2.0.ebuild
new file mode 100644
index 000000000000..c1c384204a5e
--- /dev/null
+++ b/dev-util/apitrace/apitrace-2.0.ebuild
@@ -0,0 +1,87 @@
+# 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-2.0.ebuild,v 1.1 2011/10/01 23:44:02 radhermit Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+
+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="app-arch/snappy
+	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}"
+
+EMULTILIB_PKG="true"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-system-libs.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 {BUGS,NEWS,README,TODO}.markdown || die
+
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/* || die
+}
diff --git a/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch
new file mode 100644
index 000000000000..d9499cf5fba1
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch
@@ -0,0 +1,78 @@
+--- apitrace-apitrace-e2c4320/CMakeLists.txt.orig
++++ apitrace-apitrace-e2c4320/CMakeLists.txt
+@@ -17,6 +17,7 @@
+ # prescribed in http://www.gentoo.org/proj/en/qa/automagic.xml
+ set (ENABLE_GUI "AUTO" CACHE STRING "Enable Qt GUI.")
+ 
++option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
+ 
+ ##############################################################################
+ # Find dependencies
+@@ -137,6 +138,8 @@
+ # - on unices to prevent symbol collisions when tracing applications that link
+ # against other versions of these libraries
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ find_package (ZLIB REQUIRED)
+ include_directories (${ZLIB_INCLUDE_DIRS})
+ link_libraries (${ZLIB_LIBRARIES})
+@@ -166,6 +169,8 @@
+     set (QJSON_FOUND TRUE)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ # For glext headers
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
+ 
+@@ -184,6 +189,8 @@
+     DEPENDS glproc.py dispatch.py specs/wglapi.py specs/glxapi.py specs/cglapi.py specs/glapi.py specs/gltypes.py specs/stdapi.py
+ )
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ if (WIN32)
+     set (os os_win32.cpp)
+     set (glws glws_wgl.cpp)
+@@ -218,6 +225,7 @@
+ add_executable (tracedump tracedump.cpp)
+ install (TARGETS tracedump RUNTIME DESTINATION bin) 
+ 
++endif (NOT BUILD_LIB_ONLY)
+ 
+ ##############################################################################
+ # API tracers
+@@ -374,6 +382,8 @@
+ ##############################################################################
+ # API retracers
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ add_custom_command (
+     OUTPUT glretrace_gl.cpp
+     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
+@@ -386,11 +396,15 @@
+     DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py
+ )
+ 
++endif (NOT BUILD_LIB_ONLY)
++
+ include_directories (
+     ${CMAKE_CURRENT_BINARY_DIR}
+     ${OPENGL_INCLUDE_PATH}
+ )
+ 
++if (NOT BUILD_LIB_ONLY)
++
+ add_executable (glretrace
+     glretrace_gl.cpp
+     glretrace_cgl.cpp
+@@ -438,6 +452,7 @@
+     add_subdirectory(gui)
+ endif ()
+ 
++endif (NOT BUILD_LIB_ONLY)
+ 
+ ##############################################################################
+ # Packaging
diff --git a/dev-util/apitrace/files/apitrace-2.0-system-libs.patch b/dev-util/apitrace/files/apitrace-2.0-system-libs.patch
new file mode 100644
index 000000000000..9984e3c9e468
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-2.0-system-libs.patch
@@ -0,0 +1,67 @@
+--- apitrace-apitrace-e2c4320.orig/cmake/FindSNAPPY.cmake
++++ apitrace-apitrace-e2c4320/cmake/FindSNAPPY.cmake
+@@ -0,0 +1,31 @@
++# Find SNAPPY - A fast compressor/decompressor
++#
++# This module defines
++#  SNAPPY_FOUND - whether the qsjon library was found
++#  SNAPPY_LIBRARIES - the snappy library
++#  SNAPPY_INCLUDE_DIR - the include path of the snappy library
++#
++
++if (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
++
++  # Already in cache
++  set (SNAPPY_FOUND TRUE)
++
++else (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
++
++  find_library (SNAPPY_LIBRARIES
++    NAMES
++    snappy
++    PATHS
++  )
++
++  find_path (SNAPPY_INCLUDE_DIR
++    NAMES
++    snappy.h
++    PATHS
++  )
++
++  include(FindPackageHandleStandardArgs)
++  find_package_handle_standard_args(SNAPPY DEFAULT_MSG SNAPPY_LIBRARIES SNAPPY_INCLUDE_DIR)
++
++endif (SNAPPY_INCLUDE_DIR AND SNAPPY_LIBRARIES)
+--- apitrace-apitrace-e2c4320.orig/CMakeLists.txt
++++ apitrace-apitrace-e2c4320/CMakeLists.txt
+@@ -137,27 +137,16 @@
+ # - on unices to prevent symbol collisions when tracing applications that link
+ # against other versions of these libraries
+ 
+-set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
+-set (ZLIB_LIBRARIES z_bundled)
+-add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL)
+-
++find_package (ZLIB REQUIRED)
+ include_directories (${ZLIB_INCLUDE_DIRS})
+ link_libraries (${ZLIB_LIBRARIES})
+ 
+-set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
+-set (SNAPPY_LIBRARIES snappy_bundled)
+-add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL)
+-
++find_package (SNAPPY REQUIRED)
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+ link_libraries (${SNAPPY_LIBRARIES})
+ 
+-set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
+-set (PNG_DEFINITIONS "")
+-set (PNG_LIBRARIES png_bundled)
+-
+-add_subdirectory (thirdparty/libpng EXCLUDE_FROM_ALL)
++find_package (PNG REQUIRED)
+ include_directories (${PNG_INCLUDE_DIR})
+-add_definitions (${PNG_DEFINITIONS})
+ link_libraries (${PNG_LIBRARIES})
+ 
+ # The Qt website provides binaries for Windows and MacOSX, and they are