diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2018-06-02 11:10:14 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2018-06-02 11:10:14 +0000 |
| commit | 18566674617d46a9ce94aa06ef46261745aac89d (patch) | |
| tree | a1cb216c1987658e4e637999d1473bf431452522 | |
| parent | 2018-06-02 10:44:18 UTC (diff) | |
| parent | media-libs/vulkan-tools: Renamed to dev-util/vulkan-tools (diff) | |
| download | gentoo-18566674617d46a9ce94aa06ef46261745aac89d.tar.gz gentoo-18566674617d46a9ce94aa06ef46261745aac89d.tar.bz2 gentoo-18566674617d46a9ce94aa06ef46261745aac89d.zip | |
Merge updates from master
| -rw-r--r-- | dev-util/vulkan-tools/Manifest (renamed from media-libs/vulkan-tools/Manifest) | 0 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch (renamed from media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch) | 0 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/metadata.xml (renamed from media-libs/vulkan-tools/metadata.xml) | 0 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-0_p20180526.ebuild (renamed from media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild) | 0 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-9999.ebuild (renamed from media-libs/vulkan-tools/vulkan-tools-9999.ebuild) | 0 | ||||
| -rw-r--r-- | eclass/cmake-utils.eclass | 6 | ||||
| -rw-r--r-- | media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 2 | ||||
| -rw-r--r-- | profiles/updates/2Q-2018 | 1 |
8 files changed, 8 insertions, 1 deletions
diff --git a/media-libs/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index c0732f87ba35..c0732f87ba35 100644 --- a/media-libs/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest diff --git a/media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch b/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch index b9797e19ad2f..b9797e19ad2f 100644 --- a/media-libs/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch +++ b/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch diff --git a/media-libs/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml index a670686d9eb6..a670686d9eb6 100644 --- a/media-libs/vulkan-tools/metadata.xml +++ b/dev-util/vulkan-tools/metadata.xml diff --git a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild b/dev-util/vulkan-tools/vulkan-tools-0_p20180526.ebuild index 143583c65a59..143583c65a59 100644 --- a/media-libs/vulkan-tools/vulkan-tools-0_p20180526.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-0_p20180526.ebuild diff --git a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 143583c65a59..143583c65a59 100644 --- a/media-libs/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 558ff3a1ef9b..e64502b3b9b0 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -614,6 +614,12 @@ cmake-utils_src_configure() { _EOF_ [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" + if [[ ${EAPI} != [56] ]]; then + cat >> "${common_config}" <<- _EOF_ || die + SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") + _EOF_ + fi + # Wipe the default optimization flags out of CMake if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then cat >> ${common_config} <<- _EOF_ || die diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index e265bfcef23c..5f573a4c1ce0 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild @@ -57,5 +57,5 @@ multilib_src_install() { pkg_postinst() { einfo "USE=demos has been dropped as per upstream packaging" - einfo "vulkaninfo is now available in the media-libs/vulkan-tools package" + einfo "vulkaninfo is now available in the dev-util/vulkan-tools package" } diff --git a/profiles/updates/2Q-2018 b/profiles/updates/2Q-2018 index e966642c9cea..b6003491e016 100644 --- a/profiles/updates/2Q-2018 +++ b/profiles/updates/2Q-2018 @@ -9,3 +9,4 @@ move dev-db/xtrabackup-bin dev-db/percona-xtrabackup-bin move ros-meta/geometry_experimental ros-meta/geometry2 slotmove =dev-ruby/websocket-driver-0.7.0 0 0.7 move kde-plasma/oxygen-fonts media-fonts/oxygen-fonts +move media-libs/vulkan-tools dev-util/vulkan-tools |