Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/files/, dev-libs/criterion/
Date: Mon, 31 May 2021 20:22:19
Message-Id: 1622492472.dfd6cd5bbfc1b699cb35bdb40b028c3389c81252.mgorny@gentoo
1 commit: dfd6cd5bbfc1b699cb35bdb40b028c3389c81252
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 31 20:21:12 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 31 20:21:12 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd6cd5b
7
8 dev-libs/criterion: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-libs/criterion/Manifest | 1 -
13 dev-libs/criterion/criterion-2.3.3.ebuild | 55 -------------------------
14 dev-libs/criterion/files/criterion-libdir.patch | 30 --------------
15 3 files changed, 86 deletions(-)
16
17 diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest
18 index 68937b71692..514c207130c 100644
19 --- a/dev-libs/criterion/Manifest
20 +++ b/dev-libs/criterion/Manifest
21 @@ -1,5 +1,4 @@
22 DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a
23 -DIST criterion-v2.3.3.tar.bz2 1821413 BLAKE2B 7972bf03870ae07da57252f7d62f3f5818755ad9ea2a0bed7b73d42649fbf5069c1a9af16bd8da9366d0506bbc86ec93a12904809bf91e36618d53f5d8674c18 SHA512 bf53716ff90421a42dd4d1bbd61451a4183aa6436af901c222e43e9e9b3e008008a891157a1c982b80c04e7e68aadc287392503094a3c4ad9c2066432d548e16
24 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb
25 DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d
26 DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362
27
28 diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild
29 deleted file mode 100644
30 index 808455b3876..00000000000
31 --- a/dev-libs/criterion/criterion-2.3.3.ebuild
32 +++ /dev/null
33 @@ -1,55 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_7 )
40 -
41 -CMAKE_MAKEFILE_GENERATOR="emake"
42 -inherit cmake python-any-r1
43 -
44 -DESCRIPTION="Cross platform unit testing framework for C and C++"
45 -HOMEPAGE="https://github.com/Snaipe/Criterion"
46 -SRC_URI="https://github.com/Snaipe/Criterion/releases/download/v${PV}/${PN}-v${PV}.tar.bz2"
47 -
48 -LICENSE="MIT"
49 -SLOT="0"
50 -KEYWORDS="~amd64"
51 -IUSE="test"
52 -RESTRICT="!test? ( test )"
53 -
54 -RDEPEND="dev-libs/nanomsg:="
55 -DEPEND="${RDEPEND}
56 - test? (
57 - $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]')
58 - )"
59 -BDEPEND="virtual/pkgconfig"
60 -
61 -PATCHES="${FILESDIR}/${PN}-libdir.patch"
62 -S="${WORKDIR}/${PN}-v${PV}"
63 -
64 -QA_EXECSTACK="usr/lib*/libcriterion.so*"
65 -
66 -python_check_deps() {
67 - has_version "dev-util/cram[${PYTHON_USEDEP}]"
68 -}
69 -
70 -pkg_setup() {
71 - use test && python-any-r1_pkg_setup
72 -}
73 -
74 -src_configure() {
75 - local mycmakeargs=(
76 - -DCTESTS="$(usex test ON OFF)"
77 - )
78 -
79 - cmake_src_configure
80 -}
81 -
82 -src_compile() {
83 - cmake_src_compile
84 -
85 - if use test; then
86 - cmake_build criterion_tests
87 - fi
88 -}
89
90 diff --git a/dev-libs/criterion/files/criterion-libdir.patch b/dev-libs/criterion/files/criterion-libdir.patch
91 deleted file mode 100644
92 index 91b28b06b94..00000000000
93 --- a/dev-libs/criterion/files/criterion-libdir.patch
94 +++ /dev/null
95 @@ -1,30 +0,0 @@
96 -diff --git a/.cmake/Modules/PackageUtils.cmake b/.cmake/Modules/PackageUtils.cmake
97 -index 593f2d1..a771fd5 100644
98 ---- a/.cmake/Modules/PackageUtils.cmake
99 -+++ b/.cmake/Modules/PackageUtils.cmake
100 -@@ -50,9 +50,9 @@ function (cr_add_library _LIB)
101 - endforeach ()
102 -
103 - install(TARGETS ${_LIB}
104 -- RUNTIME DESTINATION bin
105 -- LIBRARY DESTINATION lib
106 -- ARCHIVE DESTINATION lib ${install_flags}
107 -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
108 -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
109 -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${install_flags}
110 - )
111 - endfunction ()
112 -
113 -diff --git a/src/criterion.pc.in b/src/criterion.pc.in
114 -index 18ac3d6..23737a4 100644
115 ---- a/src/criterion.pc.in
116 -+++ b/src/criterion.pc.in
117 -@@ -1,7 +1,7 @@
118 - prefix=@CMAKE_INSTALL_PREFIX@
119 - exec_prefix=${prefix}
120 - includedir=${prefix}/include
121 --libdir=${prefix}/lib
122 -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
123 -
124 - Name: @PROJECT_NAME@
125 - Description: A KISS, Cross platform unit testing framework for C and C++