Remove old.

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

5 files changed, 6 insertions, 161 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index f6f7a3fbc4c3..0a871dad8d70 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/apitrace
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.7 2012/03/16 22:32:50 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.8 2012/03/16 22:34:36 radhermit Exp $
+
+  16 Mar 2012; Tim Harder <radhermit@gentoo.org> -apitrace-1.0-r1.ebuild,
+  -files/apitrace-1.0-automagic-qt.patch,
+  -files/apitrace-1.0-glxtrace-only.patch, -files/apitrace-1.0-libpng15.patch:
+  Remove old.
 
 *apitrace-3.0 (16 Mar 2012)
 
diff --git a/dev-util/apitrace/apitrace-1.0-r1.ebuild b/dev-util/apitrace/apitrace-1.0-r1.ebuild
deleted file mode 100644
index 2e3518eac9d0..000000000000
--- a/dev-util/apitrace/apitrace-1.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.2 2011/09/13 13:15:33 ssuominen 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 \
-		"${FILESDIR}"/${P}-libpng15.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-automagic-qt.patch b/dev-util/apitrace/files/apitrace-1.0-automagic-qt.patch
deleted file mode 100644
index 038a2c0177be..000000000000
--- a/dev-util/apitrace/files/apitrace-1.0-automagic-qt.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- apitrace-apitrace-5f03103/CMakeLists.txt.orig
-+++ apitrace-apitrace-5f03103/CMakeLists.txt
-@@ -18,8 +18,12 @@
- 
- find_package (PythonInterp REQUIRED)
- find_package (OpenGL REQUIRED)
--find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit)
--find_package (QJSON)
-+
-+option (ENABLE_GUI "Build the QT-based GUI." ON)
-+if (ENABLE_GUI)
-+    find_package (Qt4 4.7 COMPONENTS QtCore QtGui QtWebKit)
-+    find_package (QJSON)
-+endif (ENABLE_GUI)
- 
- if (NOT WIN32)
-     # Always use the bundled zlib and libpng sources on Windows to make it easy
-@@ -283,6 +287,6 @@
-     target_link_libraries (glretrace ${X11_LIBRARIES})
- endif (NOT WIN32)
- 
--if (QT4_FOUND AND QJSON_FOUND)
-+if (ENABLE_GUI)
-     add_subdirectory(gui)
--endif (QT4_FOUND AND QJSON_FOUND)
-+endif (ENABLE_GUI)
diff --git a/dev-util/apitrace/files/apitrace-1.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-1.0-glxtrace-only.patch
deleted file mode 100644
index d94c3b6fe7f3..000000000000
--- a/dev-util/apitrace/files/apitrace-1.0-glxtrace-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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)
diff --git a/dev-util/apitrace/files/apitrace-1.0-libpng15.patch b/dev-util/apitrace/files/apitrace-1.0-libpng15.patch
deleted file mode 100644
index ade9bfa7b8d2..000000000000
--- a/dev-util/apitrace/files/apitrace-1.0-libpng15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-http://bugs.gentoo.org/378533
-
---- image.cpp
-+++ image.cpp
-@@ -24,6 +24,7 @@
-  **************************************************************************/
- 
- 
-+#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
- #include <png.h>
- 
- #include <math.h>
-@@ -319,7 +320,7 @@
- static void
- pngWriteCallback(png_structp png_ptr, png_bytep data, png_size_t length)
- {
--    struct png_tmp_buffer *buf = (struct png_tmp_buffer*) png_ptr->io_ptr;
-+    struct png_tmp_buffer *buf = (struct png_tmp_buffer*) png_get_io_ptr(png_ptr);
-     size_t nsize = buf->size + length;
- 
-     /* allocate or grow buffer */