gentoo resync : 14.07.2018

4 files changed, 2 insertions, 108 deletions

diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index a7a980554d62..e2778de821af 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,6 +1,3 @@
-AUX cmocka-1.0.1-fix-librt-configure-issue.patch 1641 BLAKE2B 71214b9f0aec0bfbc353906fc1f68de732634eedce896a6661b318df7afb21d19e0e1bf6879755e9117e27ea753184eee5799be1e3fb8927caf7a212f98fdf28 SHA512 c50b09a00e8c3d834e78e52ffc257bd8e600a82bcaf060b7e821933bf6cf6f8b80a8500193761844c7ee06612ea276e1b7ecf08a9007532d63150b8b8662086f
-DIST cmocka-1.0.1.tar.xz 80240 BLAKE2B eb6baae44e75c3237038dfd32bb2844ed368eba7e2b7c8ddef82984d6b4b086b1667a5d021355d918be7ff63306629e7c6286c2f0ee4f5977362d96b6a9363d5 SHA512 142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
-EBUILD cmocka-1.0.1.ebuild 1150 BLAKE2B 3d184570ee233cd04095eba9d700798a15101fd01482acec0aa381185b34ffcf7e3c9023a9c9209fa673c8151bc3f7c48920032fa1304503f7681659195a17b6 SHA512 fe02af0cc7c5fef6b3655f07a7c23e7dedf9d973226391b0df31c7c3b62cd91b6f02ea0244faf76c0d3df0807704ad1ce39a2464becdd782b0130ed4b4c80a29
-EBUILD cmocka-1.1.1.ebuild 1100 BLAKE2B 28f873b40e9ecf4bfbf5090070c5e96a1ea382ce24d85af4ee223fb757427b50c639571eb7ebd4cbb541e9455ba563116db7d75b088746ce961d4ce862d8c14f SHA512 23fc89853501f10bf78827f433653ae4e9fc92f5cf0ca4d64d41b64a885b47a91869d3b513179de93aaeeca2f2aadff799d51d6064550cad421fd9febacdc96b
+EBUILD cmocka-1.1.1.ebuild 1099 BLAKE2B 52977ce6645176f20b7c1359e6f34f2cae15f815f4af86f520a4c6174e8e364f081fdbe3ec6f5bab78897bed97319df95d3ae7e5f922de19a6d3eb6a532b5e7d SHA512 367a29b47190f086a336a774450b59a18e762fa2090ce1bab742adc83e6f8e114a2b31ec89c75b12f6acb90d97d93cf80edd64c4cb6e32a05b8a5885ee63d8e6
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.0.1.ebuild b/dev-util/cmocka/cmocka-1.0.1.ebuild
deleted file mode 100644
index 2c38c69694b7..000000000000
--- a/dev-util/cmocka/cmocka-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A unit testing framework for C"
-HOMEPAGE="https://cmocka.org/"
-SRC_URI="https://cmocka.org/files/1.0/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc static-libs test"
-
-DEPEND="
-	doc? ( app-doc/doxygen[latex] )
-"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-fix-librt-configure-issue.patch" )
-
-DOCS=( AUTHORS ChangeLog README )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use test UNIT_TESTING)
-		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
-			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use doc; then
-		pushd doc || die
-		doxygen Doxyfile || die
-		rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die
-		dohtml html/*
-		dodoc latex/*
-		doman man/man3/*.3
-		popd || die
-	fi
-	cmake-utils_src_install
-}
diff --git a/dev-util/cmocka/cmocka-1.1.1.ebuild b/dev-util/cmocka/cmocka-1.1.1.ebuild
index 84edca5785ac..41a99bde71d1 100644
--- a/dev-util/cmocka/cmocka-1.1.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs test"
 
 DEPEND="
diff --git a/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch b/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch
deleted file mode 100644
index 2bafd9010767..000000000000
--- a/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b2732b52202ae48f866a024c633466efdbb8e85a Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Thu, 3 Mar 2016 09:12:21 +0100
-Subject: cmake: Fix possible issues with librt during configure
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- ConfigureChecks.cmake | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index c2064dd..31c5a94 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -100,11 +100,9 @@ else (WIN32)
- endif (WIN32)
- 
- find_library(RT_LIBRARY rt)
--if (RT_LIBRARY)
--    set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
--endif (RT_LIBRARY)
--
--set(CMOCKA_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "cmocka required system libraries")
-+if (RT_LIBRARY AND NOT LINUX)
-+    set(CMOCKA_REQUIRED_LIBRARIES ${RT_LIBRARY} CACHE INTERNAL "cmocka required system libraries")
-+endif ()
- 
- # OPTIONS
- check_c_source_compiles("
-@@ -124,9 +122,10 @@ int main(void) {
- endif(WIN32)
- 
- if (HAVE_TIME_H AND HAVE_STRUCT_TIMESPEC AND HAVE_CLOCK_GETTIME)
--    set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
-+    if (RT_LIBRARY)
-+        set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
-+    endif()
- 
--    message(STATUS "CMAKE_REQUIRED_INCLUDES=${CMAKE_REQUIRED_INCLUDES} CMAKE_REQUIRED_LIBRARIES=${CMAKE_REQUIRED_LIBRARIES}")
-     check_c_source_compiles("
- #include <time.h>
- 
-@@ -137,7 +136,10 @@ int main(void) {
- 
-     return 0;
- }" HAVE_CLOCK_GETTIME_REALTIME)
-+
-+    # reset cmake requirements
-     set(CMAKE_REQUIRED_INCLUDES)
-+    set(CMAKE_REQUIRED_LIBRARIES)
- endif ()
- 
- # ENDIAN
--- 
-cgit v0.12
-