Revbump and remove old. Update to EAPI 4 and fix multilib missing symbols issue.

(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

3 files changed, 53 insertions, 29 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index e465e56f68dc..3af008826236 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.5 2011/10/01 23:44:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.6 2011/12/15 07:28:36 radhermit Exp $
+
+*apitrace-2.0-r1 (15 Dec 2011)
+
+  15 Dec 2011; Tim Harder <radhermit@gentoo.org> -apitrace-2.0.ebuild,
+  +apitrace-2.0-r1.ebuild, files/apitrace-2.0-glxtrace-only.patch:
+  Revbump and remove old. Update to EAPI 4 and fix multilib missing symbols
+  issue.
 
 *apitrace-2.0 (01 Oct 2011)
 
diff --git a/dev-util/apitrace/apitrace-2.0.ebuild b/dev-util/apitrace/apitrace-2.0-r1.ebuild
index c1c384204a5e..48973cf8957a 100644
--- a/dev-util/apitrace/apitrace-2.0.ebuild
+++ b/dev-util/apitrace/apitrace-2.0-r1.ebuild
@@ -1,11 +1,11 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-2.0-r1.ebuild,v 1.1 2011/12/15 07:28:36 radhermit Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2:2.6"
 
-inherit cmake-utils eutils python multilib
+inherit cmake-utils python multilib
 
 DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
 HOMEPAGE="https://github.com/apitrace/apitrace"
@@ -32,6 +32,11 @@ DEPEND="${RDEPEND}"
 
 EMULTILIB_PKG="true"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-system-libs.patch
+	"${FILESDIR}"/${P}-glxtrace-only.patch
+)
+
 pkg_setup() {
 	python_set_active_version 2
 }
@@ -42,9 +47,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-system-libs.patch \
-		"${FILESDIR}"/${P}-glxtrace-only.patch
+	base_src_prepare
+
+	# Workaround NULL DT_RPATH issues
+	sed -i -e "s/install (TARGETS/#\0/" gui/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -72,16 +78,16 @@ src_compile() {
 }
 
 src_install() {
-	dobin "${CMAKE_BUILD_DIR}"/{glretrace,tracedump} || die
-	use qt4 && { dobin "${CMAKE_BUILD_DIR}"/qapitrace || die ; }
+	dobin "${CMAKE_BUILD_DIR}"/{glretrace,tracedump}
+	use qt4 && dobin "${CMAKE_BUILD_DIR}"/qapitrace
 
 	for ABI in $(get_install_abis) ; do
 		CMAKE_BUILD_DIR="${WORKDIR}/${P}_build-${ABI}"
-		dolib.so "${CMAKE_BUILD_DIR}"/glxtrace.so || die
+		dolib.so "${CMAKE_BUILD_DIR}"/glxtrace.so
 	done
 
-	dodoc {BUGS,NEWS,README,TODO}.markdown || die
+	dodoc {BUGS,NEWS,README,TODO}.markdown
 
 	exeinto /usr/share/${PN}/scripts
-	doexe scripts/* || die
+	doexe scripts/*
 }
diff --git a/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch
index d9499cf5fba1..b8d83b5120ca 100644
--- a/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch
+++ b/dev-util/apitrace/files/apitrace-2.0-glxtrace-only.patch
@@ -8,16 +8,31 @@
  
  ##############################################################################
  # Find dependencies
-@@ -137,6 +138,8 @@
- # - on unices to prevent symbol collisions when tracing applications that link
- # against other versions of these libraries
+@@ -141,7 +142,13 @@
+ include_directories (${ZLIB_INCLUDE_DIRS})
+ link_libraries (${ZLIB_LIBRARIES})
  
+-find_package (SNAPPY REQUIRED)
++if (BUILD_LIB_ONLY)
++	set (SNAPPY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/snappy)
++	set (SNAPPY_LIBRARIES snappy_bundled)
++	add_subdirectory (thirdparty/snappy EXCLUDE_FROM_ALL)
++else (BUILD_LIB_ONLY)
++	find_package (SNAPPY REQUIRED)
++endif (BUILD_LIB_ONLY)
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+ link_libraries (${SNAPPY_LIBRARIES})
+ 
+@@ -158,6 +165,8 @@
+ # By bundling the QJSON source, we make it much more easier to build the GUI on
+ # Windows and MacOSX.  But we only use the bundled sources when ENABLE_GUI is
+ # AUTO.
 +if (NOT BUILD_LIB_ONLY)
 +
- find_package (ZLIB REQUIRED)
- include_directories (${ZLIB_INCLUDE_DIRS})
- link_libraries (${ZLIB_LIBRARIES})
-@@ -166,6 +169,8 @@
+ if (QT4_FOUND AND NOT QJSON_FOUND AND (ENABLE_GUI STREQUAL "AUTO"))
+     add_subdirectory (thirdparty/qjson EXCLUDE_FROM_ALL)
+     set (QJSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/qjson)
+@@ -166,6 +175,8 @@
      set (QJSON_FOUND TRUE)
  endif ()
  
@@ -26,16 +41,12 @@
  # 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
- )
+@@ -215,9 +226,12 @@
+ 
+ link_libraries (common)
  
 +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) 
  
@@ -43,7 +54,7 @@
  
  ##############################################################################
  # API tracers
-@@ -374,6 +382,8 @@
+@@ -374,6 +388,8 @@
  ##############################################################################
  # API retracers
  
@@ -52,7 +63,7 @@
  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 @@
+@@ -386,11 +402,15 @@
      DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py
  )
  
@@ -68,7 +79,7 @@
  add_executable (glretrace
      glretrace_gl.cpp
      glretrace_cgl.cpp
-@@ -438,6 +452,7 @@
+@@ -438,6 +458,7 @@
      add_subdirectory(gui)
  endif ()