Remove old.

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

6 files changed, 14 insertions, 174 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/Manifest b/dev-util/apitrace/Manifest
index 4b4dd1fe7622..57a84a1a1201 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,29 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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 2605 RMD160 43b4c3a99a971bc01f79f133ed075c88dbf5aadd SHA1 97c2b6acdb497dbe2e32e1f390ac977d3c92932c SHA256 1ffb7f76a5f681bc83996ff967caaab1369d59d8ee6b6d7212c3889eaef824d4
 AUX apitrace-2.0-system-libs.patch 2057 RMD160 0da92249f954b95f5ea9b50796e4f312c7a430fb SHA1 8e122badac08154ea2a77378330fd644008faee6 SHA256 e37b5adddbfb6aac39f6f808ae548760e1cfaedc0ce6a877ce1a29a4159f9615
 AUX apitrace-3.0-glxtrace-only.patch 2419 RMD160 08fe99c52728e4cb7b7cb1dd267878fc825b832f SHA1 3214ec0bdf8fca17ed8af731ec5264843188d3e5 SHA256 f465b2d853b3e90300194fff73f7a2bf2a294756900ad3a6b7c4920ddaa36600
 AUX apitrace-3.0-system-libs.patch 2116 RMD160 05a89bd357d14e7cf2875b82deaa5c7bc908c41e SHA1 e46561813c236b94a509b87e3b1445dad97ee49e SHA256 064a4a1f484d77542b93caba7e6a22b0bba7adf61d9ba43d905e67b7ba31e0e8
-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
 DIST apitrace-3.0.tar.gz 1046543 RMD160 be7fb0bc925b4936b18c09038e4336d151a2ae80 SHA1 31d85fc1e3ba218b9529cbb9c978e012caa6d487 SHA256 96660d582c272534002a4909fe124a7dd81e31bb2145eef4beb352826922de3a
-EBUILD apitrace-1.0-r1.ebuild 2046 RMD160 eb80d351f80bdc44c46bbcf867867d08b3ccf0eb SHA1 b9fa737c187f34d78884203e3a134f5d3e35f975 SHA256 835af7520123aff049e5c2809fad0646c3ce756e6528514809eb2611e116e9c1
 EBUILD apitrace-2.0-r1.ebuild 2089 RMD160 48e509cedffc9ca242a128f3f63963dda20f7f50 SHA1 8a94a09cfb93ea25e104c3e10fec2cdd9aff46e3 SHA256 4375bac6d2e87cf3b32539aa5b72a0fd225a70ae28caa1ecbd76738c01960e5a
 EBUILD apitrace-3.0.ebuild 2513 RMD160 8565fe1fb5df18d1a5679109a79e68181986f898 SHA1 43b66b0ad3de2ea3ebd13a409febe76df95229e8 SHA256 a47604c909c72cf7b4436e30417b8bf2c8e4b89b08e5a1600a7538da99aa988e
-MISC ChangeLog 1548 RMD160 f19e6e8bc1588d7aaa7cf62b7d2db55b8fef87a6 SHA1 868eaef5dfd8f0dd81036f6d09fcf75f1dfce26d SHA256 7d9db7ae55a6205d43f153c55e8074d0c399979cb8a051ce3d2e30d9bd33e878
+MISC ChangeLog 1758 RMD160 58a3cc9a3741318da0134fdb4609797e0765783c SHA1 54b40f2b7e68ec9f1066b0f819e4d45c9ae71a0c SHA256 16bc05836873eb57296328f064734954eca0e28b1fab49501a4a9bc4bf150321
 MISC metadata.xml 292 RMD160 3be96a8d901993687d732e97857af05503eee229 SHA1 2a01be0e8c6ac0e07253639797ffd49cfe47ba94 SHA256 b34c57064dff43de341576048984ef58f8d0b0c927f29f1c578f029ca558ba44
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPY7+YAAoJEEqz6FtPBkyjERgH/0xswi045AjRuAKhPpJYt0JD
-hEKV5Z7O8xJhfYGbY1eAb8zTDUUm4Fuslxty30h3cvHYXAoFiEh/aW5bQd+cIFBK
-JOsLbae9UcIE3MN7pyWiihe5y5ioi5+TpX6XjOcaYUWJgv0pK+ips6doI3LaxEhq
-6IQznnEt9F9P26AGlt/EFL1Tl8HleZKXRopxiq5msqharn7uBWoKvhECgH7rQTIx
-yU5PFdXdUPSou+rGYjBMmTBjP4ECLN6wfRLxP56ngIuzrobA8H8paCA9VoFAzBAj
-1KXc7TRWR5F348sER22giAxn6lbtduEUobaXpKxUvOt4TRZvgyzpcu8V+mUtUIk=
-=Ip7j
+iQEcBAEBCgAGBQJPY8ABAAoJEEqz6FtPBkyjBIkIALavENT4bkCCh/YRVqI2tA6t
+VbhNBqGT+5i7LpRA1CO9VcoTtIg1YlepduJfYrKj/ccdoKw6Y1wc/Ii7jZIEPDcs
+KmrS80UlG4lg8uspJVt3OTuIcZ3YG3cwcsvkh2Wdzx0ACq2OkC4YJeffbkZvU7xl
+hmyqIMuz5KqMDNkUJwBzDCVCHQ7RG8XJu/J5yPAOePEqrdXWQT+lYRhisVCLfpsX
+FqolkS82LRQaseghc0R29wjsIozYRifuwJXcNZpRKU/XXyQxc7sQKBmBHv+MA0HB
+49W25yafR9gyV+myVDZnWQmmxWoA0aEzIS2sUSPhDu9tLYWdXVMKWRyW6U9znz4=
+=62aT
 -----END PGP SIGNATURE-----
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 */