gentoo resync : 02.08.2019

5 files changed, 2 insertions, 145 deletions

diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 4e9c559ed5e0..c2ed88e1dbe6 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,7 +1,3 @@
-AUX cmocka-1.1.3-examples.patch 1323 BLAKE2B 1e500f2b7d3f767f3a2dcd64c6eaa07906c6e47e670e91d9f7bd1472f7b0da824abcbf5e565bdfd78503ec0db91471883a35d42836def8541c44d72624db710f SHA512 2e8cffb329c5a20b96e104b810773051f5b17ed447543989da01ea43ea5fa4935bc8a978f929fbabeb5f2d12fa5d58859896939e24e33b569ed0ec608e8d793d
-AUX cmocka-1.1.3-fix-doxygen.patch 1138 BLAKE2B 44ded90b04bcc9eae14f7332a840713767106039d6916479c8d0cfe502ccff60c08011be1c711dcdb827a391deb7976706d37c2ed3d3b3941370fa6b6481cc24 SHA512 63c00e774c3078ba784685887cd46790375b37bb957800951ecd1a82f5d2f29ec7c0fe77da8f4c7e9ff0a7860e801598b9dd231d43adcd460ca1d1c68a7a3f05
-DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.3.ebuild 1215 BLAKE2B 0993757ee364fb894a6c505cd6d03138bafcda15ac74671879880eaec2207abf5aa181cdb2ab9170239529d98d9cc5bad48f1cabfe5dd8b9124d0c2d9422fee6 SHA512 7db546da812952a9adf0efc5f90de762a6fca4b594532062c6540efd31883b67b6123e8999c593c9701bd44501714d42cab15119dd4234bfe96089f190225469
-EBUILD cmocka-1.1.5.ebuild 1078 BLAKE2B 0f7ff8e03038b24f2251b61b77d6979179bfe17cc39e9461200c8ca1db974c413bc4c82ddb2d54dd041ce345d4a5830e704267e80295d1a88103aeb37e0b0e13 SHA512 cbe2eb812839c7007d0f9a75204029b135a2a9e41ca922070ae5ade48967c6b927a977bbc2d0515cfc7250395f89f4a9a1b64d8df34702516d096fbb6e724df8
+EBUILD cmocka-1.1.5.ebuild 1077 BLAKE2B a4652b1e7ed6b908c56f7f1a294d6727252461474cc0386bcc06724b0f06b0f28855cb701009ded4219e53cca33e77a19f36c718f9619cba235094f6b58f62c2 SHA512 bd95ff6a720238bc68b74de56d12516b352c616c3e930e2c814a70bd4857d06ae281dd2568b002da863b4a5832e4fc66fc83b40dc509ca8d3d4e6c1523261b0d
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
deleted file mode 100644
index 59978fb7fdf0..000000000000
--- a/dev-util/cmocka/cmocka-1.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Unit testing framework for C"
-HOMEPAGE="https://cmocka.org/"
-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"
-IUSE="doc examples static-libs test"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-doxygen.patch" # bug 671404
-	"${FILESDIR}/${P}-examples.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_STATIC_LIB=$(usex static-libs)
-		-DUNIT_TESTING=$(usex test)
-		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
-			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use doc; then
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 0e7a9f96a010..d547545d0bc9 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.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 examples static-libs test"
 
 BDEPEND="
diff --git a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch b/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
deleted file mode 100644
index 3d5fcc8098f0..000000000000
--- a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ee264da1aa222b354cee36184ab48c2072f62243 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 23 Jan 2019 11:20:31 +0100
-Subject: [PATCH] cmake: Add WITH_EXAMPLES options
-
-This is turned on by default, but you can disable it, if you just
-package cmocka for an opterating system.
-
-Fixes #14
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- CMakeLists.txt      | 4 +++-
- DefineOptions.cmake | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7778039..702be97 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,7 +60,9 @@ if (UNIT_TESTING)
-     add_subdirectory(tests)
- endif (UNIT_TESTING)
- 
--add_subdirectory(example)
-+if (WITH_EXAMPLES)
-+    add_subdirectory(example)
-+endif ()
- 
- # pkg-config file
- configure_file(cmocka.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc)
-diff --git a/DefineOptions.cmake b/DefineOptions.cmake
-index 5bc1ef3..911ff1d 100644
---- a/DefineOptions.cmake
-+++ b/DefineOptions.cmake
-@@ -1,5 +1,6 @@
- option(WITH_STATIC_LIB "Build with a static library" OFF)
- option(WITH_CMOCKERY_SUPPORT "Install a cmockery header" OFF)
-+option(WITH_EXAMPLES "Build examples" ON)
- option(UNIT_TESTING "Build with unit testing" OFF)
- option(PICKY_DEVELOPER "Build with picky developer flags" OFF)
- 
--- 
-2.18.1
-
diff --git a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch b/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
deleted file mode 100644
index c093021aa824..000000000000
--- a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1abfea55df24e83c2ea321b5f2b75e1a58963bc6 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 24 Oct 2018 16:33:39 +0200
-Subject: cmake: Fix doxygen generation
-
-Fixes #12
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- CMakeLists.txt     | 2 +-
- doc/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88408a9..7778039 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,9 +51,9 @@ if (MINGW)
- endif (MINGW)
- 
- # check subdirectories
--add_subdirectory(doc)
- add_subdirectory(include)
- add_subdirectory(src)
-+add_subdirectory(doc)
- 
- include(AddCMockaTest)
- if (UNIT_TESTING)
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index a7bc65e..6ac7494 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -38,7 +38,7 @@ if (DOXYGEN_FOUND)
- 
-     doxygen_add_docs(docs
-                      ${cmocka-library_SOURCE_DIR}
--                     ${cmocka-headers_SOURCE_DIR}
-+                     ${cmocka-header_SOURCE_DIR}
-                      ${CMAKE_CURRENT_SOURCE_DIR})
- endif(DOXYGEN_FOUND)
- 
--- 
-cgit v1.2.1