Version bump.

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

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index 4ac2299c173649486b5f9b49d83a9996f0f8071e..acdf3b912aa778f6eefc00b7c62090013bc03261 100644 (file)
--- 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.24 2014/12/07 19:26:06 mattst88 Exp $
+# 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 $
+
+*apitrace-6.0 (11 Jan 2015)
+
+  11 Jan 2015; Tim Harder <radhermit@gentoo.org> +apitrace-6.0.ebuild,
+  +files/apitrace-6.0-disable-multiarch.patch:
+  Version bump.
 
 *apitrace-5.0 (07 Dec 2014)
 

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index 8f74c3e261139afae2908b881b2b21986e2d7248..008fdae6b399c0f474fd58a4185dd5d53ed53a70 100644 (file)
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -10,26 +10,23 @@ AUX apitrace-4.0-multilib.patch 1457 SHA256 d6ab2a72fe9c696788a1cbb996006ff9a0a0
 AUX apitrace-4.0-system-libs.patch 2049 SHA256 ebeb2c56565f696836863f2bc5882ded3bd6132d85837ecf91a1c9ccec8ecae8 SHA512 6831349d462a8abb5a660d5478c0a2ddd523d8af6347a0ed8da4eed2ae85d1fdd74b9b5f5d507a09b7b703b9b6e099743879a093cbd8b04fe2d99b034f011cc1 WHIRLPOOL c5a1f8e55b667f2b98fe95e71e8ceb6594063df076f5ad8c5168a71d3db35fcc619f624dd00292ba250b0f6c5990f0e50776c586541d1a440603c7380b75a9ee
 AUX apitrace-5.0-disable-multiarch.patch 1340 SHA256 c372309ea37a4f45d98a1f27cb6ec15d5711e99a908da4bea5b32a2292d773b2 SHA512 bea98c8060893d6fb69a59b0287503311f7fb8f3015a91c9a6121e578b71195ca04d88fc1f2da7c88502a8034c594f3f325a4ea7f513f91d8149bbc36999db4f WHIRLPOOL 645b288fbf4af16aef70e6f4e85704c530f111996bff06a1ab09c2ca90a9dd8041849b8b4c30d4d584ffd53d4e9c1f748961038b08a89fb62969db0fd4d64997
 AUX apitrace-5.0-glxtrace-only.patch 1798 SHA256 1c748e9cfa96ca26c73524a94c8311efffb642bd62ab12d4b3fac23e09eb9caa SHA512 f725b4ce98cf07ae3d2619cb49aa5f3634bd987a8523d95e8e6aae449efb490efe6be488236191a763440173e81c83be37d577b803df960f28f2bb36e1ae03c4 WHIRLPOOL c50cb7e633b7904599ac1cd989696789a38223237692d7c60d1020c94a28ba778045444657c72dc787c57e24ec2a315ddce7697d5d3cf1dedceefa465d7b35f1
+AUX apitrace-6.0-disable-multiarch.patch 1252 SHA256 424a0f54dfffd0f57d9598cbd21e79a9b165d4062020ed29c16c2528a7c98fe2 SHA512 fb88abd703bc48464d04aced4f8509e741f9cfd62d44d54b40771c8f45b42ab9512e4aab90949be751ab236e5e1a05d18df659c9d8d636d1137744387513a97e WHIRLPOOL be5f8ba58b013c06a9387c96f1fc47d733aace4e2e0b95a8db0e02d9d4deaf579074dcb91dca85328298aa8219dd6867f6c3cab9452a8f3c6e1650e50e280a36
 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
 EBUILD apitrace-4.0.ebuild 2509 SHA256 45ef16a1d36275803642213879bdd0359a02e7f1f503a03d92325317eab9930c SHA512 389bf7ab198d150bc3be3d0e265a66058fb605c852102d3498725ae4afafbe99f41a13a8a94087614bba60bb43835d3f1652ff6d346af4a0771fd63720e54a2c WHIRLPOOL 13a5fd18788bebec4b70ec275ce9fc7c50908b2a01a56b36586ded769d48e3217c3fa607a8fa465c5ab6291a536715b71146e8d642eabf326930870cb3ecc561
 EBUILD apitrace-5.0.ebuild 2353 SHA256 b587771d59f44572f9b2eccbd1800a72b2d27534e2d850064e9d42fee40adf18 SHA512 fbadb517b76a09a6e06bc8d92d5ea62611398e1992436e301cbedd24af7b35ac178929e03fb59a1fdfa93298c121738b7061187cbdf72c722fa1ead50241e811 WHIRLPOOL 9c46920930737fa7292f9cfdc4e3f6841cd0284633ba8a037b4af9c22886113b963d55b0fa678232ee58070ecc2bbfcb91667d6c089178a56351a946da80e19c
-MISC ChangeLog 5026 SHA256 84eef03421f531a4ce3222ea991196f4383b0280761bd2494401d19ca1a59db3 SHA512 7b8222234dd10f68d5066deb7cc6478db86f9d62e1a09cdae09dcba34fb3b1c42398687317fb23419532f02f0c4e59318046062c9712fc099b940f78d5900baf WHIRLPOOL 1fbd87157ab3fa1cef5fe7a4ee74ef35a4b74b9f37464389b0644e8d8666a94ccd69a3c7b4d3608aef3f288d305712cfd387ae3c206dad63f1a8c63247cf1761
+EBUILD apitrace-6.0.ebuild 2363 SHA256 15838deb4650912a3a29824fd57ddf9bcb2b85d742b9c5d818f26aaf463012c6 SHA512 05b60c5caebf4f9bcafb0bbb430c67ce2d37444b6747338ed5a26ae0f9265aa8be0ecc30767f69e0ff0597cbafe8916ea52efa8df434aaea5933a20984c34cf0 WHIRLPOOL c03989caec33d20bd952214b9195423fda2a1a3f06232ada84fbcb213bca48be590c0d9123dafb64e5d9c44d34b66fa4f59f96edf0c36a48f02b0f4971c08511
+MISC ChangeLog 5191 SHA256 74e827fe7dda59267fb29d7cb64ff37a442a082f8a19e2f95b7283fdcc8c8e30 SHA512 8b662743df808261e3ccda879997d2444f3267cc16eafb35b4e7b278325019908da144fb6134f7daf4fada57caa63c99fef56637336da877aa88682f9bcefa0f WHIRLPOOL 7021664af1fd3ef24a0edc77e3e04d06ceec5933cb8be36cd5901ec349df893e524ada3fb040b22151254891355ee13ef8b660532a8c7ee8438465b0d01829be
 MISC metadata.xml 348 SHA256 ce19f7038183b5d6501ace0504a0070a5837b995ea6816196aff55de0aeffd9a SHA512 a18d47af682e019609a65957a48632441fcc979f12277c625f5d0c23985bd44b511d0a351da30793ed7737544700cde8fd03131d24dbc1510ee705d0ec1c1867 WHIRLPOOL 80a5b6782ba959ade7ac688b984974f432403bc9e44e24649d4b3c9567b9a0a847033db8db09ad8f8689eb832b669951ff22df6439bebdbcef45cff9531c0230
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUhKngAAoJEA/daC2XTKcqUFgQAL0o2v+Z4XoUcreseKgjnJUl
-apx9Un4V+yGKMMu4QAQMk5eQqujSCk9zU55sqrtTVb6K9y43taM3hgx9EbLx337H
-RhUPu0vdojO7TMsUxJifrD//cs4RyZiMFoaTHBJJyxEKKLL7l66gNUC/AFc9f86M
-QJEp3H1Zy1TPMcSr9a0hGya7IniXhkyxWk2MEl+ELkEbYiVTiai8rGYY7wjsy5pq
-t8lpeq1yVKZVs1OLK0Zrzai+OkCUVIo+59PJW2I3TOGJsc2Pr4zm2/q969AFKrEg
-hzvAIWn0JsG3P5ekZJKU6vhYnH2bUoJJKqjvDjkXgaIc54ehTiCgFJ9TM5kp/hkJ
-oVPfRNtBD0HDZxunxQ278as1MGH1b+W7p30fnvAeFMpLHsaCezEZHXuFfO7UWZIK
-nJK/LQJXbKynb6I0bp4paz+ueb9V1TkYaDqKTerR3w2J5dsuab/O6SRD91jztjLh
-ufDvvUIaiWhekRJydfp/jawKFrRgdD+/6sPKFHduRxlhms5DqR9y5IpijZoRH068
-ysXcvka7fxf1fYPGqUm8+uYy89rMHX6BjSgdflq7DfQHuebQYo9T0E7M7IvDt7VN
-fAUG+WDZtYQD2iEJgdZYGdeGCOTBKy7/MsxBajPoTRZc4hx1cuY4vdpZENkWuNQT
-NuDp/w/vnnY2oE1sHI1u
-=kHPh
+iQEcBAEBCAAGBQJUssuYAAoJEEqz6FtPBkyjCCgIAKhEm5fJhSOm5DcBw15aYpsF
+6qL+9+rDOLZSgOPw3+YkrZL5NH+3ftz8i/1UrD8t5vc8DnE8ppJnM6sHCybdpZbU
+17CixUFVtpuyR/uiqbLXdYKYm9m8eC6XCAvJoYZj8S6mDkbuPoaMPNcZDNOnuAU+
+G+Yh1YN8TpzUxua5+yoG3rYk+hCcWwiyXxfErrpQe+zA3ygvVrSWNsHIx5z0z3qo
+zhFHfN5jJ2AUuKhpLLyK9tC7US8zY8j4npdw/DlDqodFuCKZuYSPM0kcw13PZNhQ
+8bBVoehug6rcgDUZUNbPSfgfjSGu91ydHXC8AN1DqsxB6LmQAtE1Xc4sjSq1IXk=
+=mxix
 -----END PGP SIGNATURE-----

diff --git a/dev-util/apitrace/apitrace-6.0.ebuild b/dev-util/apitrace/apitrace-6.0.ebuild
new file mode 100644 (file)
index 0000000..cab1f54
--- /dev/null
+++ b/dev-util/apitrace/apitrace-6.0.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.0.ebuild,v 1.1 2015/01/11 19:14:30 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}"/${P}-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)
+}

diff --git a/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
new file mode 100644 (file)
index 0000000..bc6ba03
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-6.0-disable-multiarch.patch
@@ -0,0 +1,35 @@
+respect the libdir cmake already set up for us instead of using debian-specific multiarch paths
+
+--- apitrace-6.0/CMakeLists.txt
++++ apitrace-6.0/CMakeLists.txt
+@@ -280,15 +280,6 @@
+ ##############################################################################
+ # Installation directories
+ 
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+-    # Debian multiarch support
+-    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+-        OUTPUT_VARIABLE ARCH_SUBDIR
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+-endif()
+-
+ if (WIN32 OR APPLE)
+     # On Windows/MacOSX, applications are usually installed on a directory of
+     # their own
+@@ -297,12 +288,8 @@
+     set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+     set (DOC_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+-    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+-    if (ARCH_SUBDIR)
+-        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+-    else ()
+-        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+-    endif ()
++    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
++    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+ endif ()
+ 
+ set (SCRIPTS_INSTALL_DIR ${LIB_INSTALL_DIR}/scripts)