Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 107 insertions, 9 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index acdf3b912aa7..ed13808d2e77 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/apitrace
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.25 2015/01/11 19:14:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.26 2015/01/17 01:36:26 radhermit Exp $
+
+*apitrace-6.1 (17 Jan 2015)
+
+  17 Jan 2015; Tim Harder <radhermit@gentoo.org> +apitrace-6.1.ebuild:
+  Version bump.
 
 *apitrace-6.0 (11 Jan 2015)
 
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 008fdae6b399..13bb7acc5144 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -14,19 +14,21 @@ AUX apitrace-6.0-disable-multiarch.patch 1252 SHA256 424a0f54dfffd0f57d9598cbd21
 DIST apitrace-4.0.tar.gz 1736912 SHA256 078cfe09a5a021559326e8ee92ce863dd99d48c36433ac37140233616bb6cbd3 SHA512 063e1dfc7993b6d014a8e62e5d038318b22a7cfdaac1970714cf6bcb7e31079f552ad198f2992f042b05a027322f86e58d77a0e3aa2e0b266b278c8d0708200c WHIRLPOOL a1b251929ffade5f5b498428d942a01fd6c141494e3de09520e7bcd5aa5b4e15e50144ccf6ef979650e75ddb03373a3f5c198a3554448161623c3e33d8a9160a
 DIST apitrace-5.0.tar.gz 1868044 SHA256 c11e97452b3b74533b82af28951382c77e3d639bd434cbc4e1dc43bc799c8ea6 SHA512 af83860c8bfd49a2a2b1483fe13a83f2e1aa93ca474f1efb12cb311a99f2ca29ce4c39831a941efdde80fe2ae76b11cdfc6fde3349d325c71fc2a3ecae6b1424 WHIRLPOOL ba6fe7c354db3e6ba8edd46675631ef6d2edfc01c9201ffd951fc48110d0120463d52b4778984b01ae766d662edfc386a1965240377bcd2b2bae71936e94d42a
 DIST apitrace-6.0.tar.gz 1738830 SHA256 4ac99fbd5076c9e4db9d09ef22fb1958f28115f162b6ee40a23130aacc1e2acb SHA512 e937ca8ddece11d180ed306083788fc7e5fa5d4ceeef0ae69ab5a8140e4169c583b281f6f4806b5c4d71c72fb79ac8399e2f0f49fa1052b90f14306247a4091c WHIRLPOOL 1d5f43f5576a4f258f249f3d2777ad221dce3d7dc9489db924568c5c26af3542d016d722ef9c9be7ae50e380684c597840cc869c4d11cf3f3dcb96f952cc4ee0
+DIST apitrace-6.1.tar.gz 1741041 SHA256 0285610a6afbe9fbc47c0ecb80cafabb34dc1998c1c8308bacb7fdd15817930b SHA512 218fc8e59bc6cff6733c98f53c57b0e793d2f7aa530560f8da0dff83c4fa255c5fd5db97a9a43c364490c355ddb1ea6557ced64eae3e6c5e0c6f4504b9299bcd WHIRLPOOL 6334a96a0d70fce927faed0923efe1e320d4a52909ab01223f0486774a13e3cef53d2920933bc3167d9d766d647da6ab36b95ccbbcf78a0af55d16775000f2ea
 EBUILD apitrace-4.0.ebuild 2509 SHA256 45ef16a1d36275803642213879bdd0359a02e7f1f503a03d92325317eab9930c SHA512 389bf7ab198d150bc3be3d0e265a66058fb605c852102d3498725ae4afafbe99f41a13a8a94087614bba60bb43835d3f1652ff6d346af4a0771fd63720e54a2c WHIRLPOOL 13a5fd18788bebec4b70ec275ce9fc7c50908b2a01a56b36586ded769d48e3217c3fa607a8fa465c5ab6291a536715b71146e8d642eabf326930870cb3ecc561
 EBUILD apitrace-5.0.ebuild 2353 SHA256 b587771d59f44572f9b2eccbd1800a72b2d27534e2d850064e9d42fee40adf18 SHA512 fbadb517b76a09a6e06bc8d92d5ea62611398e1992436e301cbedd24af7b35ac178929e03fb59a1fdfa93298c121738b7061187cbdf72c722fa1ead50241e811 WHIRLPOOL 9c46920930737fa7292f9cfdc4e3f6841cd0284633ba8a037b4af9c22886113b963d55b0fa678232ee58070ecc2bbfcb91667d6c089178a56351a946da80e19c
 EBUILD apitrace-6.0.ebuild 2363 SHA256 15838deb4650912a3a29824fd57ddf9bcb2b85d742b9c5d818f26aaf463012c6 SHA512 05b60c5caebf4f9bcafb0bbb430c67ce2d37444b6747338ed5a26ae0f9265aa8be0ecc30767f69e0ff0597cbafe8916ea52efa8df434aaea5933a20984c34cf0 WHIRLPOOL c03989caec33d20bd952214b9195423fda2a1a3f06232ada84fbcb213bca48be590c0d9123dafb64e5d9c44d34b66fa4f59f96edf0c36a48f02b0f4971c08511
-MISC ChangeLog 5191 SHA256 74e827fe7dda59267fb29d7cb64ff37a442a082f8a19e2f95b7283fdcc8c8e30 SHA512 8b662743df808261e3ccda879997d2444f3267cc16eafb35b4e7b278325019908da144fb6134f7daf4fada57caa63c99fef56637336da877aa88682f9bcefa0f WHIRLPOOL 7021664af1fd3ef24a0edc77e3e04d06ceec5933cb8be36cd5901ec349df893e524ada3fb040b22151254891355ee13ef8b660532a8c7ee8438465b0d01829be
+EBUILD apitrace-6.1.ebuild 2368 SHA256 1c6154f8ff72c880f32ffe196e9e1f6b8033bc16e654c1710416b3b2a0de9d68 SHA512 c59ada83c97a32a76eca68f81466f2b5d6b09e5cc61e8c8b6151cded44b7f0048bb66af0218ffc68bb2bb7fc4033ce7dd523814a05a9f1c2ebc60e833b9eda59 WHIRLPOOL b4767c687871db469a9d5fcb7f84a8fd9d377c94e0db527b37bd853fa2f2b079ce074e18333e64b3abd17759f3a27f9b836dab8aca09c7510c4cbcf4d0c24982
+MISC ChangeLog 5308 SHA256 bcbf64895b2d12c90e903793c83fc086db336c48986b08562c7cc8c67847fa44 SHA512 472955bdccbf250f2e75c5be1b7fbf3cb6b121c5ede7234dd0f35841f0adfe3d6a7b61e1642d0c0b88caf0240910f4f33aecdb6d716a9a7bc50d233355410967 WHIRLPOOL ef5f27e3925d40672d7bb62e72f02a8fcd8eab10061261023ff233aceb77e605ecb89bdd11f2dbf2497b9d0b018897e016b5a3c4ae3b9f85134616740824b94d
 MISC metadata.xml 348 SHA256 ce19f7038183b5d6501ace0504a0070a5837b995ea6816196aff55de0aeffd9a SHA512 a18d47af682e019609a65957a48632441fcc979f12277c625f5d0c23985bd44b511d0a351da30793ed7737544700cde8fd03131d24dbc1510ee705d0ec1c1867 WHIRLPOOL 80a5b6782ba959ade7ac688b984974f432403bc9e44e24649d4b3c9567b9a0a847033db8db09ad8f8689eb832b669951ff22df6439bebdbcef45cff9531c0230
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUssuYAAoJEEqz6FtPBkyjCCgIAKhEm5fJhSOm5DcBw15aYpsF
-6qL+9+rDOLZSgOPw3+YkrZL5NH+3ftz8i/1UrD8t5vc8DnE8ppJnM6sHCybdpZbU
-17CixUFVtpuyR/uiqbLXdYKYm9m8eC6XCAvJoYZj8S6mDkbuPoaMPNcZDNOnuAU+
-G+Yh1YN8TpzUxua5+yoG3rYk+hCcWwiyXxfErrpQe+zA3ygvVrSWNsHIx5z0z3qo
-zhFHfN5jJ2AUuKhpLLyK9tC7US8zY8j4npdw/DlDqodFuCKZuYSPM0kcw13PZNhQ
-8bBVoehug6rcgDUZUNbPSfgfjSGu91ydHXC8AN1DqsxB6LmQAtE1Xc4sjSq1IXk=
-=mxix
+iQEcBAEBCAAGBQJUubycAAoJEEqz6FtPBkyjnjQH/2ooACBSHe1yQolZ8+QwB3rV
+DH13zk9vadPzEpxTJULJKfjm+1rhCf2fHGYQFcIgVEwvMbsohKfBfDUAN1Nhfm3E
+g+QEuSPUwUaBLsM9k9D8fsF+lRM6zHnTicacDNab+SccirV84KjRHC29CEsHQDUT
+Qx4ApdH6GbiXA5tdHSWCm77MXUw8BLBLQBXK84nlT3zgXQOKV+riE0eqQPZ3Mi99
+Ua1wu3ZfiCnp/txdWbYa3iZoVeoxDG67C86fwGAuwRHlm9cUSuZ7dUZkIi5jyOMy
+2sbTQysZEqYsmW3BngjhdD1dPbuXV9uoHXMxkSGauQFle+lRHjtWrS0G2L0/RbE=
+=QMkt
 -----END PGP SIGNATURE-----
diff --git a/dev-util/apitrace/apitrace-6.1.ebuild b/dev-util/apitrace/apitrace-6.1.ebuild
new file mode 100644
index 000000000000..1405e650a5c9
--- /dev/null
+++ b/dev-util/apitrace/apitrace-6.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-6.1.ebuild,v 1.1 2015/01/17 01:36:26 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib eutils python-single-r1
+
+DESCRIPTION="A tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cli egl qt4"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=media-libs/mesa-9.1.6[egl?,${MULTILIB_USEDEP}]
+	egl? ( || (
+		>=media-libs/mesa-8.0[gles1,gles2]
+		<media-libs/mesa-8.0[gles]
+	) )
+	media-libs/libpng:0=
+	sys-process/procps
+	x11-libs/libX11
+	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}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-system-libs.patch
+	"${FILESDIR}"/${PN}-5.0-glxtrace-only.patch
+	"${FILESDIR}"/${PN}-6.0-disable-multiarch.patch
+)
+
+src_prepare() {
+	enable_cmake-utils_src_prepare
+
+	# The apitrace code grubs around in the internal zlib structures.
+	# We have to extract this header and clean it up to keep that working.
+	# Do not be surprised if a zlib upgrade breaks things ...
+	sed -r \
+		-e 's:OF[(]([^)]*)[)]:\1:' \
+		thirdparty/zlib/gzguts.h > gzguts.h
+	rm -rf "${S}"/thirdparty/{getopt,less,libpng,snappy,zlib}
+}
+
+src_configure() {
+	my_configure() {
+		mycmakeargs=(
+			-DARCH_SUBDIR=
+			$(cmake-utils_use_enable egl EGL)
+		)
+		if multilib_is_native_abi ; then
+			mycmakeargs+=(
+				$(cmake-utils_use_enable cli CLI)
+				$(cmake-utils_use_enable qt4 GUI)
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_LIB_ONLY=ON
+				-DENABLE_CLI=OFF
+				-DENABLE_GUI=OFF
+			)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	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
+
+	dodoc {BUGS,Dalvik,FORMAT,HACKING,NEWS,README,TODO}.markdown
+
+	exeinto /usr/$(get_libdir)/${PN}/scripts
+	doexe $(find scripts -type f -executable)
+}