Remove old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

7 files changed, 7 insertions, 391 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index 9e467c147925..c6ead4c571a9 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/apitrace
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.22 2014/06/18 19:19:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.23 2014/11/30 17:20:09 radhermit Exp $
+
+  30 Nov 2014; Tim Harder <radhermit@gentoo.org> -apitrace-3.0-r1.ebuild,
+  -apitrace-3.0-r2.ebuild, -files/apitrace-3.0-gcc47.patch,
+  -files/apitrace-3.0-glxtrace-only.patch, -files/apitrace-3.0-memcpy.patch,
+  -files/apitrace-3.0-system-libs.patch:
+  Remove old.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> apitrace-4.0.ebuild:
   Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/dev-util/apitrace/apitrace-3.0-r1.ebuild b/dev-util/apitrace/apitrace-3.0-r1.ebuild
deleted file mode 100644
index 4482ebb8b029..000000000000
--- a/dev-util/apitrace/apitrace-3.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r1.ebuild,v 1.6 2013/07/17 21:55:34 radhermit Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2:2.6"
-
-inherit cmake-utils eutils python multilib vcs-snapshot
-
-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="egl multilib qt4"
-
-RDEPEND="app-arch/snappy
-	media-libs/libpng:0=
-	sys-libs/zlib
-	media-libs/mesa[egl?]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<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
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}"
-
-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
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Workaround NULL DT_RPATH issues
-	sed -i -e "s/install (TARGETS/#\0/" gui/CMakeLists.txt || die
-}
-
-src_configure() {
-	for ABI in $(get_install_abis) ; do
-		mycmakeargs=(
-			$(cmake-utils_use_enable qt4 GUI)
-			$(cmake-utils_use_enable egl EGL)
-		)
-
-		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
-
-	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/apitrace-3.0-r2.ebuild b/dev-util/apitrace/apitrace-3.0-r2.ebuild
deleted file mode 100644
index 4858b4189a13..000000000000
--- a/dev-util/apitrace/apitrace-3.0-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-3.0-r2.ebuild,v 1.1 2014/03/21 22:15:40 vapier Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit cmake-utils eutils python-any-r1 multilib vcs-snapshot
-
-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 ~arm ~x86"
-IUSE="egl multilib qt4"
-
-RDEPEND="app-arch/snappy
-	media-libs/libpng:0=
-	sys-libs/zlib
-	media-libs/mesa[egl?]
-	egl? ( || (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		<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
-		>=dev-qt/qtwebkit-4.7:4
-		>=dev-libs/qjson-0.5
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-EMULTILIB_PKG="true"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-libs.patch
-	"${FILESDIR}"/${P}-glxtrace-only.patch
-	"${FILESDIR}"/${PN}-3.0-gcc47.patch
-	"${FILESDIR}"/${P}-memcpy.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Workaround NULL DT_RPATH issues
-	sed -i -e "s/install (TARGETS/#\0/" gui/CMakeLists.txt || die
-}
-
-src_configure() {
-	for ABI in $(get_install_abis) ; do
-		mycmakeargs=(
-			$(cmake-utils_use_enable qt4 GUI)
-			$(cmake-utils_use_enable egl EGL)
-		)
-
-		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
-
-	dodoc {BUGS,DEVELOPMENT,NEWS,README,TODO}.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/files/apitrace-3.0-gcc47.patch b/dev-util/apitrace/files/apitrace-3.0-gcc47.patch
deleted file mode 100644
index 37e87fc93500..000000000000
--- a/dev-util/apitrace/files/apitrace-3.0-gcc47.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bdd9281dd964c36ac94ef3a9fd5d4f7dd24a3d06 Mon Sep 17 00:00:00 2001
-From: Martin Olsson <martin@minimum.se>
-Date: Mon, 26 Mar 2012 10:40:45 +0200
-Subject: [PATCH] Fix compile error "isatty was not declared"; missing
- unistd.h include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When I built apitrace on Fedora 16, using the usual:
-
-	cmake -H. -Bbuild
-	make -C build
-
-...then I got this compile error:
-
-	apitrace/cli/cli_dump.cpp: In function ‘int command(int, char**)’:
-	apitrace/cli/cli_dump.cpp:176:25: error: ‘isatty’ was not declared in this scope
----
- cli/cli_dump.cpp |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp
-index 28c91af..f52b83c 100644
---- a/cli/cli_dump.cpp
-+++ b/cli/cli_dump.cpp
-@@ -28,6 +28,9 @@
- #include <string.h>
- #include <limits.h> // for CHAR_MAX
- #include <getopt.h>
-+#ifndef _WIN32
-+#include <unistd.h> // for isatty()
-+#endif
- 
- #include "cli.hpp"
- #include "cli_pager.hpp"
--- 
-1.7.8.6
-
diff --git a/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch
deleted file mode 100644
index 0f4388b7a357..000000000000
--- a/dev-util/apitrace/files/apitrace-3.0-glxtrace-only.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- apitrace-apitrace-de9f3e5/CMakeLists.txt
-+++ apitrace-apitrace-de9f3e5/CMakeLists.txt
-@@ -19,6 +19,8 @@
- 
- set (ENABLE_EGL "AUTO" CACHE STRING "Enable EGL support.")
- 
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
-+
- 
- ##############################################################################
- # Find dependencies
-@@ -159,7 +161,13 @@
- include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
- 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})
- 
-@@ -182,6 +190,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)
-+
- 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)
-@@ -190,6 +200,8 @@
-     set (QJSON_FOUND TRUE)
- endif ()
- 
-+endif (NOT BUILD_LIB_ONLY)
-+
- # For glext headers.  Needs to be before system includes as often system's GL
- # headers bundle and include glext.h and glxext.h
- include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glext)
-@@ -497,6 +513,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
-@@ -624,6 +642,8 @@
-     add_subdirectory(gui)
- endif ()
- 
-+endif (NOT BUILD_LIB_ONLY)
-+
- 
- ##############################################################################
- # Packaging
diff --git a/dev-util/apitrace/files/apitrace-3.0-memcpy.patch b/dev-util/apitrace/files/apitrace-3.0-memcpy.patch
deleted file mode 100644
index 7ae8b3d89add..000000000000
--- a/dev-util/apitrace/files/apitrace-3.0-memcpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/465504
-http://github.com/apitrace/apitrace/issues/118
-
---- common/image_png.cpp
-+++ common/image_png.cpp
-@@ -31,6 +31,7 @@
- #include <assert.h>
- #include <stdint.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include <fstream>
- 
diff --git a/dev-util/apitrace/files/apitrace-3.0-system-libs.patch b/dev-util/apitrace/files/apitrace-3.0-system-libs.patch
deleted file mode 100644
index 39513540925a..000000000000
--- a/dev-util/apitrace/files/apitrace-3.0-system-libs.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- apitrace-apitrace-de9f3e5/cmake/FindSNAPPY.cmake
-+++ apitrace-apitrace-de9f3e5/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-de9f3e5/CMakeLists.txt
-+++ apitrace-apitrace-de9f3e5/CMakeLists.txt
-@@ -155,27 +155,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)
--
--include_directories (${ZLIB_INCLUDE_DIRS})
-+find_package (ZLIB REQUIRED)
-+include_directories (${ZLIB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
- 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_DIRS})
--include_directories (${PNG_INCLUDE_DIR})
--add_definitions (${PNG_DEFINITIONS})
- link_libraries (${PNG_LIBRARIES})
- 
- if (MSVC)