summaryrefslogtreecommitdiff
path: root/dev-libs/caliper
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-libs/caliper
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-libs/caliper')
-rw-r--r--dev-libs/caliper/Manifest7
-rw-r--r--dev-libs/caliper/caliper-1.5.0.ebuild32
-rw-r--r--dev-libs/caliper/files/caliper-1.5.0-cmake.patch33
-rw-r--r--dev-libs/caliper/files/caliper-1.5.0-multilib.patch271
-rw-r--r--dev-libs/caliper/files/caliper-1.5.0-python2.patch22
-rw-r--r--dev-libs/caliper/metadata.xml11
6 files changed, 376 insertions, 0 deletions
diff --git a/dev-libs/caliper/Manifest b/dev-libs/caliper/Manifest
new file mode 100644
index 000000000000..e8fc40f82ed2
--- /dev/null
+++ b/dev-libs/caliper/Manifest
@@ -0,0 +1,7 @@
+AUX caliper-1.5.0-cmake.patch 1084 SHA256 ad010aadc82051e0dcdb34e189903df3773ad55a95b8d9614d31ef182feef125 SHA512 668499dd540cafdb6c8a3c7c08c4973ad3181f7c16f2c62db765e05cff7b82c1a59d849f669f7c9e9e48e9acb46437e76942e7e5fcd448eb386c14872d5fdb4c WHIRLPOOL dd6a6f6756cf0dbff66fe3de447b2202164b79ed470ef83cd9aa55fd60b31a3c821b088740308c47c1f53925b9531abe164e62513627a9ad9b1ed1f98f48e5d9
+AUX caliper-1.5.0-multilib.patch 10636 SHA256 542cac36e6edfd4a734e915af6f085e264bb54fc336188b0c0d740c43b5d38f7 SHA512 96c83c3cc67d6a3cb71b077ce7d18e664582670894b19cfbe6e097fe446865cbaaa5e55b6f61ea315a4ab18bcc43270c0e137246e7659f66ebc5b3c0c8695ccc WHIRLPOOL fe8a2d1ef5a265bbd1c26bd750d0f0d10d7e5d5a6736e391f3926adb72c03f05b743c7ad108e549d0a6d3e8c2190d3bf3f8bb44c838fe51b1cc3ccdc545f565c
+AUX caliper-1.5.0-python2.patch 765 SHA256 ca6c700c62f6e51cef9b36ed51d005b4511848e0efa569e93c2c68ae2f8b0c22 SHA512 58b6117e62f78e86fe95610b2e3fa3b7469790d1d635df3d7d8e861abbd875ccc6e8dc04eff2b3b2eae8d88e431b19aef49411b05758d3ea0ea73ae53dfce1d8 WHIRLPOOL c365ba8d8711e73f6d7566436c1e74b568d09e4f60e86b303f3d9cab2c32bb9de549d3041797ca734ed91891cb97600dd7b8cd747a1a63fdd7ccb2008729daea
+DIST caliper-1.5.0.tar.gz 167184 SHA256 f6580f88a2bc500590a3412ecc3e8fe245a03f111aef129cd1ac9d55a31fca93 SHA512 8f54d453efc4a1d3b6ef5cfd9c07726813850942c694378ebcf03dd9dfb390c67473ff621627cc78209b811e9591e6c8542697dbc23ee05ceef3a1fb8af2bb4e WHIRLPOOL 8a8d92cf1c4ff66a2b4181939ff9519227c3f8c4f92cc9ee395ff7d61bb224144efb94c2f3c88b74af495773dece3771e5b1295321ba48435721f545903c984c
+EBUILD caliper-1.5.0.ebuild 718 SHA256 1c6cbd40d7bc6d1fc991defe76cb1ccc96a894cbd23eb7c932e019f54babe390 SHA512 85d34f549b5c16880a9a4c237c89b5af9c038fe457d876b9f5a40fb1dea220fb99f624a2bb17870479c181ce34faa7cd27eeb520480335117c1d5286a7ea3c07 WHIRLPOOL 875ffe6e11da3e00af6327da721a30f5dbfb74becbe659ff484edb7270b9b3c7b74722c9b63f21c5f1251ad639a8a6ac479589c9285569e80eca8de408d080ff
+MISC ChangeLog 508 SHA256 fa5fbfa5fb7cd36aedaf003f261ff34e472ad669ff1c747c9bf79f135b27e2eb SHA512 c1f9844861c57af76013092e46de6c62b65ab4cf7c336e10d95ab334b20fac3784718a3f95489f776485a5241c959690f60524e43d580cc538b6ed13cb65b47c WHIRLPOOL 22129d7affbe370cd8322b26b879c9674e51b34122441284535cb6ae22eab3f713c719918438fa41ed856984b4fb405b7ff265afd0f209af8cc6f0150243f1c3
+MISC metadata.xml 330 SHA256 c259c21f7feab8f9bfc0a6472350bb6a99ce646aaf5a97ba0fb38a05cd2bbdab SHA512 c57e35d5483149031fe76ca273160e1912ad840b019ab2ea06bc5c9efa4c33c7d72c251af6a0b85b0f937a98f664b4400304b81d454ce9b9b58a026cfcbac9ee WHIRLPOOL 8d5c740069ab6cf7d8d5825344f6c834ce446c943f480dee6f91ea244166504405c6922deab1c4fbe0ecc8c196db78e1374c8765b1c85125fed2fbb931da0d7f
diff --git a/dev-libs/caliper/caliper-1.5.0.ebuild b/dev-libs/caliper/caliper-1.5.0.ebuild
new file mode 100644
index 000000000000..8ecd92169088
--- /dev/null
+++ b/dev-libs/caliper/caliper-1.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Application Introspection System"
+HOMEPAGE="http://computation.llnl.gov/projects/caliper"
+SRC_URI="https://github.com/LLNL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ net-misc/curl
+ sys-libs/libunwind
+ dev-libs/papi
+ "
+RDEPEND="${DEPEND}"
+
+#thttps://github.com/LLNL/Caliper/pull/23
+#thttps://github.com/LLNL/Caliper/pull/24
+#thttps://github.com/LLNL/Caliper/pull/25
+PATCHES=( "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-python2.patch"
+ "${FILESDIR}/${P}-multilib.patch"
+ )
+
+S="${WORKDIR}/${P^c}"
diff --git a/dev-libs/caliper/files/caliper-1.5.0-cmake.patch b/dev-libs/caliper/files/caliper-1.5.0-cmake.patch
new file mode 100644
index 000000000000..88a142738ced
--- /dev/null
+++ b/dev-libs/caliper/files/caliper-1.5.0-cmake.patch
@@ -0,0 +1,33 @@
+From f3f634a7e3eb76c8206739a362d3926e8a5ff1d7 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@lanl.gov>
+Date: Wed, 30 Nov 2016 10:12:31 -0700
+Subject: [PATCH] FindLibcurl.cmake: add path suffix
+
+Most linux distros put curl.h in a subdir curl
+---
+ cmake/FindLibcurl.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindLibcurl.cmake b/cmake/FindLibcurl.cmake
+index c3dcce1..ad0ac5b 100644
+--- a/cmake/FindLibcurl.cmake
++++ b/cmake/FindLibcurl.cmake
+@@ -1,7 +1,7 @@
+ #
+ # - Find libcurl
+ #
+-# LIBCURL_INCLUDE_DIR - Path to libcurl.h
++# LIBCURL_INCLUDE_DIR - Path to curl.h
+ # LIBCURL_LIBRARY - List of libraries for using libcurl
+ # LIBCURL_FOUND - True if libcurl was found
+
+@@ -9,8 +9,8 @@ if(LIBCURL_INCLUDE_DIR)
+ set(LIBCURL_FIND_QUIETLY true)
+ endif()
+
+-find_path(LIBCURL_INCLUDE_DIR curl.h)
+ find_library(LIBCURL_LIBRARY curl)
++find_path(LIBCURL_INCLUDE_DIR curl.h PATH_SUFFIXES curl)
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Libcurl DEFAULT_MSG LIBCURL_LIBRARY LIBCURL_INCLUDE_DIR)
diff --git a/dev-libs/caliper/files/caliper-1.5.0-multilib.patch b/dev-libs/caliper/files/caliper-1.5.0-multilib.patch
new file mode 100644
index 000000000000..4df5d841ef6c
--- /dev/null
+++ b/dev-libs/caliper/files/caliper-1.5.0-multilib.patch
@@ -0,0 +1,271 @@
+From b296fb1d9db532a14c815d6e90ec606a32f570be Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@lanl.gov>
+Date: Wed, 30 Nov 2016 11:01:58 -0700
+Subject: [PATCH] cmake: add multilib support
+
+---
+ CMakeLists.txt | 13 ++++++++-----
+ src/caliper-stub/CMakeLists.txt | 8 ++++----
+ src/caliper/CMakeLists.txt | 6 +++---
+ src/common/CMakeLists.txt | 8 ++++----
+ src/common/csv/CMakeLists.txt | 2 +-
+ src/fortran/CMakeLists.txt | 2 +-
+ src/reader/CMakeLists.txt | 6 +++---
+ src/services/callpath/CMakeLists.txt | 2 +-
+ src/services/mpiwrap/CMakeLists.txt | 4 ++--
+ src/services/ompt/CMakeLists.txt | 2 +-
+ src/services/papi/CMakeLists.txt | 2 +-
+ src/services/recorder/CMakeLists.txt | 2 +-
+ src/tools/cali-graph/CMakeLists.txt | 2 +-
+ src/tools/cali-query/CMakeLists.txt | 2 +-
+ src/tools/cali-stat/CMakeLists.txt | 2 +-
+ src/tools/util/CMakeLists.txt | 6 +++---
+ 16 files changed, 36 insertions(+), 33 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3088112..e3e2384 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,6 +16,9 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
+ include(FindLibunwind)
+ include(FindPAPI)
+ include(FindLibcurl)
++
++include(GNUInstallDirs)
++
+ # Optional Fortran
+ option(WITH_FORTRAN "Install Fortran interface and build test programs")
+
+@@ -131,15 +134,15 @@ configure_file(
+ @ONLY)
+
+ install(FILES ${PROJECT_BINARY_DIR}/caliper-config.cmake
+- DESTINATION share/cmake/caliper)
++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/caliper)
+ install(EXPORT caliper
+- DESTINATION share/cmake/caliper)
++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/caliper)
+
+ install(FILES ${PROJECT_BINARY_DIR}/caliper-config.h
+- DESTINATION include/caliper)
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper)
+
+ install(FILES ${PROJECT_BINARY_DIR}/caliper.pc
+- DESTINATION share/pkgconfig)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+ add_subdirectory(src)
+ if (WITH_TESTS)
+@@ -149,4 +152,4 @@ endif()
+ add_subdirectory(doc)
+
+ # Install exports
+-#install(EXPORT caliper DESTINATION lib/cmake)
++#install(EXPORT caliper DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+diff --git a/src/caliper-stub/CMakeLists.txt b/src/caliper-stub/CMakeLists.txt
+index b796f47..d168875 100644
+--- a/src/caliper-stub/CMakeLists.txt
++++ b/src/caliper-stub/CMakeLists.txt
+@@ -12,9 +12,9 @@ add_library(caliper-stub ${CALIPER_STUB_CXX_SOURCES})
+
+ install(TARGETS caliper-stub-c
+ EXPORT caliper-stub-c
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib)
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(TARGETS caliper-stub
+ EXPORT caliper-stub
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib)
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/caliper/CMakeLists.txt b/src/caliper/CMakeLists.txt
+index 4c25990..38b58ac 100644
+--- a/src/caliper/CMakeLists.txt
++++ b/src/caliper/CMakeLists.txt
+@@ -26,9 +26,9 @@ foreach (_extlib ${CALIPER_EXTERNAL_LIBS})
+ target_link_libraries(caliper ${_extlib})
+ endforeach()
+
+-install(FILES ${CALIPER_HEADERS} DESTINATION include/caliper)
++install(FILES ${CALIPER_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper)
+
+ install(TARGETS caliper
+ EXPORT caliper
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib)
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index 73666fb..0c0b441 100644
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -36,10 +36,10 @@ add_library(caliper-common
+ $<TARGET_OBJECTS:c-util>
+ ${CALIPER_COMMON_SOURCES})
+
+-install(FILES ${CALIPER_COMMON_HEADERS} DESTINATION include/caliper)
+-install(FILES ${CALIPER_UTIL_HEADERS} DESTINATION include/caliper/util)
++install(FILES ${CALIPER_COMMON_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper)
++install(FILES ${CALIPER_UTIL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper/util)
+
+ install(TARGETS caliper-common
+ EXPORT caliper
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib)
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/common/csv/CMakeLists.txt b/src/common/csv/CMakeLists.txt
+index ef4357a..1f6f506 100644
+--- a/src/common/csv/CMakeLists.txt
++++ b/src/common/csv/CMakeLists.txt
+@@ -13,5 +13,5 @@ if (${BUILD_SHARED_LIBS})
+ set_property(TARGET caliper-csv PROPERTY POSITION_INDEPENDENT_CODE TRUE)
+ endif()
+
+-install(FILES ${CALIPER_CSV_HEADERS} DESTINATION include/caliper/csv)
++install(FILES ${CALIPER_CSV_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper/csv)
+
+diff --git a/src/fortran/CMakeLists.txt b/src/fortran/CMakeLists.txt
+index c81323c..9c57f47 100644
+--- a/src/fortran/CMakeLists.txt
++++ b/src/fortran/CMakeLists.txt
+@@ -6,4 +6,4 @@ set_target_properties(testf03 PROPERTIES LINKER_LANGUAGE CXX)
+
+ target_link_libraries(testf03 caliper)
+
+-install(FILES caliper.f90 DESTINATION share/fortran)
++install(FILES caliper.f90 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/fortran)
+diff --git a/src/reader/CMakeLists.txt b/src/reader/CMakeLists.txt
+index 5d23d24..3ca79b9 100644
+--- a/src/reader/CMakeLists.txt
++++ b/src/reader/CMakeLists.txt
+@@ -21,9 +21,9 @@ add_library(caliper-reader ${CALIPER_READER_SOURCES})
+
+ target_link_libraries(caliper-reader caliper-common)
+
+-install(FILES ${CALIPER_READER_HEADERS} DESTINATION include/caliper)
++install(FILES ${CALIPER_READER_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper)
+
+ install(TARGETS caliper-reader
+ EXPORT caliper
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib)
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/services/callpath/CMakeLists.txt b/src/services/callpath/CMakeLists.txt
+index dd47570..1f49f36 100644
+--- a/src/services/callpath/CMakeLists.txt
++++ b/src/services/callpath/CMakeLists.txt
+@@ -3,7 +3,7 @@ include_directories(${LIBUNWIND_INCLUDE_DIR})
+ set(CALIPER_CALLPATH_SOURCES
+ Callpath.cpp)
+
+-# install(TARGETS caliper-callpath DESTINATION lib)
++# install(TARGETS caliper-callpath DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ add_library(caliper-callpath OBJECT ${CALIPER_CALLPATH_SOURCES})
+
+diff --git a/src/services/mpiwrap/CMakeLists.txt b/src/services/mpiwrap/CMakeLists.txt
+index 53a8377..c381347 100644
+--- a/src/services/mpiwrap/CMakeLists.txt
++++ b/src/services/mpiwrap/CMakeLists.txt
+@@ -27,6 +27,6 @@ target_link_libraries(caliper-mpiwrap ${MPI_C_LIBRARIES})
+
+ install(TARGETS caliper-mpiwrap
+ EXPORT caliper
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib)
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ add_caliper_service("mpi CALIPER_HAVE_MPI")
+diff --git a/src/services/ompt/CMakeLists.txt b/src/services/ompt/CMakeLists.txt
+index f0e4085..8563eb2 100644
+--- a/src/services/ompt/CMakeLists.txt
++++ b/src/services/ompt/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(CALIPER_OMPT_SOURCES
+ # target_link_libraries(caliper-ompt caliper-common)
+ # target_link_libraries(caliper-ompt caliper)
+
+-# install(TARGETS caliper-ompt DESTINATION lib)
++# install(TARGETS caliper-ompt DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ add_library(caliper-ompt OBJECT ${CALIPER_OMPT_SOURCES})
+
+diff --git a/src/services/papi/CMakeLists.txt b/src/services/papi/CMakeLists.txt
+index 70dab41..fa971cc 100644
+--- a/src/services/papi/CMakeLists.txt
++++ b/src/services/papi/CMakeLists.txt
+@@ -9,7 +9,7 @@ set(CALIPER_PAPI_SOURCES
+ # target_link_libraries(caliper-papi caliper)
+ # target_link_libraries(caliper-papi ${PAPI_LIBRARIES})
+
+-# install(TARGETS caliper-papi DESTINATION lib)
++# install(TARGETS caliper-papi DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ add_library(caliper-papi OBJECT ${CALIPER_PAPI_SOURCES})
+
+diff --git a/src/services/recorder/CMakeLists.txt b/src/services/recorder/CMakeLists.txt
+index c0543d4..c5c6ea8 100644
+--- a/src/services/recorder/CMakeLists.txt
++++ b/src/services/recorder/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(CALIPER_RECORDER_SOURCES
+ # target_link_libraries(caliper-recorder caliper-common)
+ # target_link_libraries(caliper-recorder caliper)
+
+-# install(TARGETS caliper-recorder DESTINATION lib)
++# install(TARGETS caliper-recorder DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+ add_service_sources(${CALIPER_RECORDER_SOURCES})
+ add_caliper_service("recorder")
+diff --git a/src/tools/cali-graph/CMakeLists.txt b/src/tools/cali-graph/CMakeLists.txt
+index 2b90f51..e3aa7c1 100644
+--- a/src/tools/cali-graph/CMakeLists.txt
++++ b/src/tools/cali-graph/CMakeLists.txt
+@@ -13,4 +13,4 @@ target_link_libraries(cali-graph caliper-common)
+ target_link_libraries(cali-graph caliper-tools-util)
+ target_link_libraries(cali-graph caliper)
+
+-install(TARGETS cali-graph DESTINATION bin)
++install(TARGETS cali-graph DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/tools/cali-query/CMakeLists.txt b/src/tools/cali-query/CMakeLists.txt
+index e013e96..72202be 100644
+--- a/src/tools/cali-query/CMakeLists.txt
++++ b/src/tools/cali-query/CMakeLists.txt
+@@ -13,4 +13,4 @@ target_link_libraries(cali-query caliper-common)
+ target_link_libraries(cali-query caliper-tools-util)
+ target_link_libraries(cali-query caliper)
+
+-install(TARGETS cali-query DESTINATION bin)
++install(TARGETS cali-query DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/tools/cali-stat/CMakeLists.txt b/src/tools/cali-stat/CMakeLists.txt
+index 35395d9..d337abb 100644
+--- a/src/tools/cali-stat/CMakeLists.txt
++++ b/src/tools/cali-stat/CMakeLists.txt
+@@ -13,4 +13,4 @@ target_link_libraries(cali-stat caliper-common)
+ target_link_libraries(cali-stat caliper-tools-util)
+ target_link_libraries(cali-stat caliper)
+
+-install(TARGETS cali-stat DESTINATION bin)
++install(TARGETS cali-stat DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/tools/util/CMakeLists.txt b/src/tools/util/CMakeLists.txt
+index be4e393..652194c 100644
+--- a/src/tools/util/CMakeLists.txt
++++ b/src/tools/util/CMakeLists.txt
+@@ -5,9 +5,9 @@ set(CALIPER_TOOLS_UTIL_HEADERS
+
+ add_library(caliper-tools-util ${CALIPER_TOOLS_UTIL_SOURCES})
+
+-install(FILES ${CALIPER_TOOLS_UTIL_HEADERS} DESTINATION include/caliper)
++install(FILES ${CALIPER_TOOLS_UTIL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper)
+
+ install(TARGETS caliper-tools-util
+ EXPORT caliper
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib)
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+--
+2.7.3
+
diff --git a/dev-libs/caliper/files/caliper-1.5.0-python2.patch b/dev-libs/caliper/files/caliper-1.5.0-python2.patch
new file mode 100644
index 000000000000..0fabbe213d92
--- /dev/null
+++ b/dev-libs/caliper/files/caliper-1.5.0-python2.patch
@@ -0,0 +1,22 @@
+From 916e2cc2d326575894c651947035afe06a6d936f Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@lanl.gov>
+Date: Wed, 30 Nov 2016 10:53:58 -0700
+Subject: [PATCH] wrap.py: is not python3 compliant
+
+---
+ src/services/mpiwrap/wrap.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/services/mpiwrap/wrap.py b/src/services/mpiwrap/wrap.py
+index 7a3122f..86bb2f3 100755
+--- a/src/services/mpiwrap/wrap.py
++++ b/src/services/mpiwrap/wrap.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #################################################################################################
+ # Copyright (c) 2010, Lawrence Livermore National Security, LLC.
+ # Produced at the Lawrence Livermore National Laboratory
+--
+2.7.3
+
diff --git a/dev-libs/caliper/metadata.xml b/dev-libs/caliper/metadata.xml
new file mode 100644
index 000000000000..c7fb0232d8fb
--- /dev/null
+++ b/dev-libs/caliper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>junghans@gentoo.org</email>
+ <name>Christoph Junghans</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">LLNL/Caliper</remote-id>
+ </upstream>
+</pkgmetadata>