commit:     59b9341632d8e4c944577be4f040f4c3fcb053c9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 13:23:26 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 13:27:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b93416

dev-util/cmocka: Drop old

Closes: https://bugs.gentoo.org/657262
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/cmocka/Manifest                           |  1 -
 dev-util/cmocka/cmocka-1.0.1.ebuild                | 47 ------------------
 .../cmocka-1.0.1-fix-librt-configure-issue.patch   | 56 ----------------------
 3 files changed, 104 deletions(-)

diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index dd6645e1f76..075e38d43da 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,2 +1 @@
-DIST cmocka-1.0.1.tar.xz 80240 BLAKE2B 
eb6baae44e75c3237038dfd32bb2844ed368eba7e2b7c8ddef82984d6b4b086b1667a5d021355d918be7ff63306629e7c6286c2f0ee4f5977362d96b6a9363d5
 SHA512 
142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B 
de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff
 SHA512 
801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577

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 2c38c69694b..00000000000
--- 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/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 2bafd901076..00000000000
--- 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 <a...@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 <a...@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
-

Reply via email to