[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: bff5197bd75feb0aa5155bdc79ed29de5c7c5a91 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Mar 12 21:44:15 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Mar 12 21:44:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff5197b dev-libs/criterion: Stabilize 2.4.1 x86, #926622 Signed-off-by: Arthur Zamarin gentoo.org> dev-libs/criterion/criterion-2.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild index 79697de13754..02a9df728b50 100644 --- a/dev-libs/criterion/criterion-2.4.1.ebuild +++ b/dev-libs/criterion/criterion-2.4.1.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: a64c06e48051b343892531c89d15095c3ee9d8f8 Author: Eli Schwartz gmail com> AuthorDate: Sun Mar 10 21:00:26 2024 + Commit: Sam James gentoo org> CommitDate: Mon Mar 11 14:22:42 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64c06e4 dev-libs/criterion: mark as LTO-unsafe Closes: https://bugs.gentoo.org/855674 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> dev-libs/criterion/criterion-2.4.1.ebuild | 5 + 1 file changed, 5 insertions(+) diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild index dd6573f7cc78..79697de13754 100644 --- a/dev-libs/criterion/criterion-2.4.1.ebuild +++ b/dev-libs/criterion/criterion-2.4.1.ebuild @@ -55,6 +55,11 @@ src_prepare() { } src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/855674 + # https://github.com/Snaipe/Criterion/issues/524 + filter-lto + # bug 906379 use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 639e9ab54188c10c107feb7fe08b319e6929356e Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Mar 7 17:23:02 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Mar 7 17:23:30 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639e9ab5 dev-libs/criterion: Implement musl-1.2.4 largefile workaround Bug: https://bugs.gentoo.org/906379 Signed-off-by: Andreas K. Hüttel gentoo.org> dev-libs/criterion/criterion-2.4.1.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild index d23e55dd8cb0..dd6573f7cc78 100644 --- a/dev-libs/criterion/criterion-2.4.1.ebuild +++ b/dev-libs/criterion/criterion-2.4.1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -inherit meson python-any-r1 +inherit flag-o-matic meson python-any-r1 DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" @@ -55,6 +55,9 @@ src_prepare() { } src_configure() { + # bug 906379 + use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE + local emesonargs=( -Dsamples=$(usex test true false) -Dtests=$(usex test true false)
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: d2ae1232ab16543d05317e5cab522972a09758f7 Author: Sam James gentoo org> AuthorDate: Fri Feb 17 07:23:04 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 17 07:23:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ae1232 dev-libs/criterion: enable py3.11 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/criterion-2.4.0.ebuild | 2 +- dev-libs/criterion/criterion-2.4.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/criterion/criterion-2.4.0.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild index d150bad6f79d..49faed7a545b 100644 --- a/dev-libs/criterion/criterion-2.4.0.ebuild +++ b/dev-libs/criterion/criterion-2.4.0.ebuild @@ -3,7 +3,7 @@ EAPI="8" -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-any-r1 diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild index 981964ff1a85..f3384d089938 100644 --- a/dev-libs/criterion/criterion-2.4.1.ebuild +++ b/dev-libs/criterion/criterion-2.4.1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit meson python-any-r1
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: c903a8e970fa348a6049a32e32c2cf9360c29cf5 Author: Sam James gentoo org> AuthorDate: Wed Jul 20 16:20:58 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jul 20 16:20:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c903a8e9 dev-libs/criterion: Stabilize 2.4.1 amd64, #859526 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/criterion-2.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild index dbcf92534260..302f8af25ab5 100644 --- a/dev-libs/criterion/criterion-2.4.1.ebuild +++ b/dev-libs/criterion/criterion-2.4.1.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 2a4f3b4b5a113c888f301ea1bfc78a79f3eb71e7 Author: Tomáš Mózes gmail com> AuthorDate: Fri Apr 29 11:25:16 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed May 18 15:14:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a4f3b4b dev-libs/criterion: bump to 2.4.1 Signed-off-by: Tomáš Mózes gmail.com> Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/Manifest | 1 + dev-libs/criterion/criterion-2.4.1.ebuild | 64 +++ 2 files changed, 65 insertions(+) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index b1b938ce0f4d..5a1fcf4cd7c3 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,4 +1,5 @@ DIST criterion-2.4.0.tar.gz 870099 BLAKE2B 06d81344f6e9110cbb4313c847e0fb1d596ddfad7ab57d4a0c9df2140c5506450f702082d6fc893d819b74252b20193720ca44a903b43c43e940122529da88ad SHA512 4a7cd9cd26f64bfeb95683a0479a59b29676ffc5110041757417ab152dced7a360a94fd721b31e45e1b91d0ca08fec0327d7a7d56a2cf9d2f3e9e25e2b95f446 +DIST criterion-2.4.1.tar.gz 870842 BLAKE2B 8b7db80d5e943d4380072106eb32ffe95896e4e588986588fd8b0ebfe1078657e2a9231090355563fd8bd8588cacbaa5839e269a0a9c4e56b882789c97379f9b SHA512 22f1ae5152db93736282fac098ad510d497aa804589df8070fb6cf36a3063868f2a9ed3c5771bfde8a0352355d81178816870d68b83ca6d6582fd17cdd9332d9 DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d diff --git a/dev-libs/criterion/criterion-2.4.1.ebuild b/dev-libs/criterion/criterion-2.4.1.ebuild new file mode 100644 index ..dbcf92534260 --- /dev/null +++ b/dev-libs/criterion/criterion-2.4.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit meson python-any-r1 + +DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" +KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" +NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818" + +DESCRIPTION="Cross platform unit testing framework for C and C++" +HOMEPAGE="https://github.com/Snaipe/Criterion; +SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz + https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz + https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" + +LICENSE="BSD-2 MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/nanomsg:= + dev-libs/libgit2:= + dev-libs/libffi:=" +DEPEND="${RDEPEND} + >=dev-libs/boxfort-0.1.4 + test? ( + $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') + )" +BDEPEND="dev-util/cmake + virtual/pkgconfig" + +S="${WORKDIR}/Criterion-${PV}" + +python_check_deps() { + has_version "dev-util/cram[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + rm -r dependencies/{debugbreak,klib} || die + mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die + mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die + mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die +} + +src_configure() { + local emesonargs=( + -Dsamples=$(usex test true false) + -Dtests=$(usex test true false) + ) + + meson_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: c1b307d886ecfb045e3076eeae206490ed7f53a9 Author: Tomáš Mózes gmail com> AuthorDate: Sun May 1 19:20:40 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Wed May 18 15:14:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1b307d8 dev-libs/criterion: drop old Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/25255 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/Manifest| 1 - .../criterion/criterion-2.4_pre20211218.ebuild | 64 -- 2 files changed, 65 deletions(-) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 5a1fcf4cd7c3..1d6bfd0290c2 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,6 +1,5 @@ DIST criterion-2.4.0.tar.gz 870099 BLAKE2B 06d81344f6e9110cbb4313c847e0fb1d596ddfad7ab57d4a0c9df2140c5506450f702082d6fc893d819b74252b20193720ca44a903b43c43e940122529da88ad SHA512 4a7cd9cd26f64bfeb95683a0479a59b29676ffc5110041757417ab152dced7a360a94fd721b31e45e1b91d0ca08fec0327d7a7d56a2cf9d2f3e9e25e2b95f446 DIST criterion-2.4.1.tar.gz 870842 BLAKE2B 8b7db80d5e943d4380072106eb32ffe95896e4e588986588fd8b0ebfe1078657e2a9231090355563fd8bd8588cacbaa5839e269a0a9c4e56b882789c97379f9b SHA512 22f1ae5152db93736282fac098ad510d497aa804589df8070fb6cf36a3063868f2a9ed3c5771bfde8a0352355d81178816870d68b83ca6d6582fd17cdd9332d9 -DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbb34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62 diff --git a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild b/dev-libs/criterion/criterion-2.4_pre20211218.ebuild deleted file mode 100644 index 3125df752cce.. --- a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit meson python-any-r1 - -CRITERION_COMMIT="a91a69f65006c057812fdd850b100ff28790ea73" -DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" -KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" -NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818" - -DESCRIPTION="Cross platform unit testing framework for C and C++" -HOMEPAGE="https://github.com/Snaipe/Criterion; -SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz - https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz - https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz - https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" - -LICENSE="BSD-2 MIT ZLIB" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/nanomsg:= - dev-libs/libgit2:= - dev-libs/libffi:=" -DEPEND="${RDEPEND} - dev-libs/boxfort - test? ( - $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') - )" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/Criterion-${CRITERION_COMMIT}" - -python_check_deps() { - has_version "dev-util/cram[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - rm -r dependencies/{debugbreak,klib} || die - mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die - mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die - mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die -} -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 1cffc152b27149a3ad49065550f83a1b769b154d Author: Joonas Niilola gentoo org> AuthorDate: Fri Apr 29 15:17:40 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Apr 29 15:17:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cffc152 dev-libs/criterion: add missing bdep for cmake Bug: https://bugs.gentoo.org/show_bug.cgi?id=841686 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/criterion-2.4.0.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4.0.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild index 4d316898cd5f..729ed674cd10 100644 --- a/dev-libs/criterion/criterion-2.4.0.ebuild +++ b/dev-libs/criterion/criterion-2.4.0.ebuild @@ -32,7 +32,8 @@ DEPEND="${RDEPEND} test? ( $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') )" -BDEPEND="virtual/pkgconfig" +BDEPEND="dev-util/cmake + virtual/pkgconfig" S="${WORKDIR}/Criterion-${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 10be462ee7e583507b953e065fe64e9e09d53ef6 Author: Joonas Niilola gentoo org> AuthorDate: Fri Apr 29 15:13:45 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Apr 29 15:16:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10be462e dev-libs/criterion: Stabilize 2.4.0 amd64, #841686 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/criterion-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4.0.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild index f43eea0b2b1c..e3537f9088a4 100644 --- a/dev-libs/criterion/criterion-2.4.0.ebuild +++ b/dev-libs/criterion/criterion-2.4.0.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: ae25c595480432cc821977719225ed9888d96cbd Author: Joonas Niilola gentoo org> AuthorDate: Fri Apr 29 15:15:10 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Apr 29 15:16:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae25c595 dev-libs/criterion: match the version requirement for dev-libs/boxfort Closes: https://bugs.gentoo.org/841692 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/criterion-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4.0.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild index e3537f9088a4..4d316898cd5f 100644 --- a/dev-libs/criterion/criterion-2.4.0.ebuild +++ b/dev-libs/criterion/criterion-2.4.0.ebuild @@ -28,7 +28,7 @@ RDEPEND="dev-libs/nanomsg:= dev-libs/libgit2:= dev-libs/libffi:=" DEPEND="${RDEPEND} - dev-libs/boxfort + >=dev-libs/boxfort-0.1.4 test? ( $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/files/
commit: e9ebd547be72f450f980b3b178e2dc26d8e884ca Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Mar 18 06:20:08 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Mar 18 14:00:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ebd547 dev-libs/criterion: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/24632 Signed-off-by: Joonas Niilola gentoo.org> .../criterion/files/criterion-2.4_pre20200110-gcc11.patch| 12 1 file changed, 12 deletions(-) diff --git a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch deleted file mode 100644 index c99e03af6f19.. --- a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/criterion/internal/assert/ieee.h b/include/criterion/internal/assert/ieee.h -index 3b6de3b..2063d87 100644 a/include/criterion/internal/assert/ieee.h -+++ b/include/criterion/internal/assert/ieee.h -@@ -29,6 +29,7 @@ - #ifdef __cplusplus - - # include -+# include - - namespace criterion { namespace internal { namespace operators { -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: fa94be2ca8398a8ed8b16bdb33465509a7847d4c Author: Tomáš Mózes gmail com> AuthorDate: Tue Mar 15 19:13:42 2022 + Commit: Sam James gentoo org> CommitDate: Wed Mar 16 17:32:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa94be2c dev-libs/criterion: bump to 2.4.0 Signed-off-by: Tomáš Mózes gmail.com> Signed-off-by: Sam James gentoo.org> dev-libs/criterion/Manifest | 1 + dev-libs/criterion/criterion-2.4.0.ebuild | 63 +++ 2 files changed, 64 insertions(+) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 1bf9998f83ee..f82c774a661e 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,3 +1,4 @@ +DIST criterion-2.4.0.tar.gz 870099 BLAKE2B 06d81344f6e9110cbb4313c847e0fb1d596ddfad7ab57d4a0c9df2140c5506450f702082d6fc893d819b74252b20193720ca44a903b43c43e940122529da88ad SHA512 4a7cd9cd26f64bfeb95683a0479a59b29676ffc5110041757417ab152dced7a360a94fd721b31e45e1b91d0ca08fec0327d7a7d56a2cf9d2f3e9e25e2b95f446 DIST criterion-2.4.0_rc.tar.gz 867378 BLAKE2B 302d10b093272f6576d733e3c4d6fd063c01a2ebc30aecfe96f4d92febf629a1a8524dd6db608aa179487936aa21b266be44f69cf21621905b823186497a2b7a SHA512 73f432a77c8c271f92dfec2f111a8f074c37324ec68864ef686c1a158e184d5930c18a1bc90584bbdb6235450a33f984ab45aabe85c3e2aa8c769aaad62cb1f7 DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21 DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821 diff --git a/dev-libs/criterion/criterion-2.4.0.ebuild b/dev-libs/criterion/criterion-2.4.0.ebuild new file mode 100644 index ..f43eea0b2b1c --- /dev/null +++ b/dev-libs/criterion/criterion-2.4.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit meson python-any-r1 + +DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" +KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" +NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818" + +DESCRIPTION="Cross platform unit testing framework for C and C++" +HOMEPAGE="https://github.com/Snaipe/Criterion; +SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz + https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz + https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" + +LICENSE="BSD-2 MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/nanomsg:= + dev-libs/libgit2:= + dev-libs/libffi:=" +DEPEND="${RDEPEND} + dev-libs/boxfort + test? ( + $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') + )" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/Criterion-${PV}" + +python_check_deps() { + has_version "dev-util/cram[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + rm -r dependencies/{debugbreak,klib} || die + mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die + mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die + mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die +} + +src_configure() { + local emesonargs=( + -Dsamples=$(usex test true false) + -Dtests=$(usex test true false) + ) + + meson_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: c6f026ae4fe366a64a76e69742dd4fa279ec0a44 Author: Tomáš Mózes gmail com> AuthorDate: Tue Mar 15 19:14:20 2022 + Commit: Sam James gentoo org> CommitDate: Wed Mar 16 17:32:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f026ae dev-libs/criterion: drop old Signed-off-by: Tomáš Mózes gmail.com> Signed-off-by: Sam James gentoo.org> dev-libs/criterion/Manifest| 3 - dev-libs/criterion/criterion-2.4.0_rc.ebuild | 65 - .../criterion/criterion-2.4_pre20210114.ebuild | 68 -- 3 files changed, 136 deletions(-) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index f82c774a661e..b1b938ce0f4d 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,8 +1,5 @@ DIST criterion-2.4.0.tar.gz 870099 BLAKE2B 06d81344f6e9110cbb4313c847e0fb1d596ddfad7ab57d4a0c9df2140c5506450f702082d6fc893d819b74252b20193720ca44a903b43c43e940122529da88ad SHA512 4a7cd9cd26f64bfeb95683a0479a59b29676ffc5110041757417ab152dced7a360a94fd721b31e45e1b91d0ca08fec0327d7a7d56a2cf9d2f3e9e25e2b95f446 -DIST criterion-2.4.0_rc.tar.gz 867378 BLAKE2B 302d10b093272f6576d733e3c4d6fd063c01a2ebc30aecfe96f4d92febf629a1a8524dd6db608aa179487936aa21b266be44f69cf21621905b823186497a2b7a SHA512 73f432a77c8c271f92dfec2f111a8f074c37324ec68864ef686c1a158e184d5930c18a1bc90584bbdb6235450a33f984ab45aabe85c3e2aa8c769aaad62cb1f7 -DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21 DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d -DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbb34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62 diff --git a/dev-libs/criterion/criterion-2.4.0_rc.ebuild b/dev-libs/criterion/criterion-2.4.0_rc.ebuild deleted file mode 100644 index 40ecb5549ade.. --- a/dev-libs/criterion/criterion-2.4.0_rc.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit meson python-any-r1 - -DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" -KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" -NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818" - -MY_PV="$(ver_rs 3 -)" - -DESCRIPTION="Cross platform unit testing framework for C and C++" -HOMEPAGE="https://github.com/Snaipe/Criterion; -SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz - https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz - https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz - https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" - -LICENSE="BSD-2 MIT ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/nanomsg:= - dev-libs/libgit2:= - dev-libs/libffi:=" -DEPEND="${RDEPEND} - dev-libs/boxfort - test? ( -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 2695ca552f4622c292570bc6e29c6464d7d40f9f Author: Sam James gentoo org> AuthorDate: Thu Feb 3 02:25:06 2022 + Commit: Sam James gentoo org> CommitDate: Thu Feb 3 02:25:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2695ca55 dev-libs/criterion: drop obsolete python3.7 Eclass ignores this anyway. Signed-off-by: Sam James gentoo.org> dev-libs/criterion/criterion-2.4.0_rc.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4.0_rc.ebuild b/dev-libs/criterion/criterion-2.4.0_rc.ebuild index 29e861aa2fd0..40ecb5549ade 100644 --- a/dev-libs/criterion/criterion-2.4.0_rc.ebuild +++ b/dev-libs/criterion/criterion-2.4.0_rc.ebuild @@ -3,7 +3,7 @@ EAPI="8" -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit meson python-any-r1
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 7fccf9348535c609d630f3d0a09a8380445e9456 Author: Tomáš Mózes gmail com> AuthorDate: Sat Jan 29 07:23:01 2022 + Commit: Sam James gentoo org> CommitDate: Thu Feb 3 02:24:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fccf934 dev-libs/criterion: bump to 2.4.0_rc Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24012 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/Manifest | 1 + dev-libs/criterion/criterion-2.4.0_rc.ebuild | 65 2 files changed, 66 insertions(+) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 474af3cfd92a..1bf9998f83ee 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,3 +1,4 @@ +DIST criterion-2.4.0_rc.tar.gz 867378 BLAKE2B 302d10b093272f6576d733e3c4d6fd063c01a2ebc30aecfe96f4d92febf629a1a8524dd6db608aa179487936aa21b266be44f69cf21621905b823186497a2b7a SHA512 73f432a77c8c271f92dfec2f111a8f074c37324ec68864ef686c1a158e184d5930c18a1bc90584bbdb6235450a33f984ab45aabe85c3e2aa8c769aaad62cb1f7 DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21 DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb diff --git a/dev-libs/criterion/criterion-2.4.0_rc.ebuild b/dev-libs/criterion/criterion-2.4.0_rc.ebuild new file mode 100644 index ..29e861aa2fd0 --- /dev/null +++ b/dev-libs/criterion/criterion-2.4.0_rc.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit meson python-any-r1 + +DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" +KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" +NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818" + +MY_PV="$(ver_rs 3 -)" + +DESCRIPTION="Cross platform unit testing framework for C and C++" +HOMEPAGE="https://github.com/Snaipe/Criterion; +SRC_URI="https://github.com/Snaipe/Criterion/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz + https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz + https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz + https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" + +LICENSE="BSD-2 MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/nanomsg:= + dev-libs/libgit2:= + dev-libs/libffi:=" +DEPEND="${RDEPEND} + dev-libs/boxfort + test? ( + $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') + )" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/Criterion-${MY_PV}" + +python_check_deps() { + has_version "dev-util/cram[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + rm -r dependencies/{debugbreak,klib} || die + mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die + mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die + mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" subprojects/nanopb || die +} + +src_configure() { + local emesonargs=( + -Dsamples=$(usex test true false) + -Dtests=$(usex test true false) + ) + + meson_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 495d1513056ec71cad231a6b03dfc95f002ba528 Author: Jakov Smolić gentoo org> AuthorDate: Sat Jan 29 10:04:02 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sat Jan 29 10:04:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=495d1513 dev-libs/criterion: Stabilize 2.4_pre20211218 amd64, #832294 Signed-off-by: Jakov Smolić gentoo.org> dev-libs/criterion/criterion-2.4_pre20211218.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild b/dev-libs/criterion/criterion-2.4_pre20211218.ebuild index 5140accac9bd..3125df752cce 100644 --- a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20211218.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 1c58c0bb3934509d9dcab17418b437e2fcf507e4 Author: Tomáš Mózes gmail com> AuthorDate: Sat Dec 18 00:24:40 2021 + Commit: Sam James gentoo org> CommitDate: Tue Dec 21 01:50:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c58c0bb dev-libs/criterion: add snapshot version Signed-off-by: Tomáš Mózes gmail.com> Signed-off-by: Sam James gentoo.org> dev-libs/criterion/Manifest| 2 + .../criterion/criterion-2.4_pre20211218.ebuild | 64 ++ 2 files changed, 66 insertions(+) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 6a80c070470f..3d79ac59d187 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,6 +1,8 @@ DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21 +DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362 DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a +DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbb34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62 diff --git a/dev-libs/criterion/criterion-2.4_pre20211218.ebuild b/dev-libs/criterion/criterion-2.4_pre20211218.ebuild new file mode 100644 index ..5140accac9bd --- /dev/null +++ b/dev-libs/criterion/criterion-2.4_pre20211218.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit meson python-any-r1 + +CRITERION_COMMIT="a91a69f65006c057812fdd850b100ff28790ea73" +DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" +KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" +NANOPB_COMMIT="c9124132a604047d0ef97a09c0e99cd9bed2c818" + +DESCRIPTION="Cross platform unit testing framework for C and C++" +HOMEPAGE="https://github.com/Snaipe/Criterion; +SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz + https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz + https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz + https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" + +LICENSE="BSD-2 MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/nanomsg:= + dev-libs/libgit2:= +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: a0b6a07c8a96d17d1f7efa0847a39faeaa310e45 Author: Tomáš Mózes gmail com> AuthorDate: Sat Dec 18 00:26:34 2021 + Commit: Sam James gentoo org> CommitDate: Tue Dec 21 01:50:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0b6a07c dev-libs/criterion: drop old Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23399 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/Manifest| 2 - .../criterion/criterion-2.4_pre20200110.ebuild | 68 -- 2 files changed, 70 deletions(-) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 3d79ac59d187..474af3cfd92a 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,8 +1,6 @@ -DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21 DIST criterion-a91a69f65006c057812fdd850b100ff28790ea73.tar.gz 864681 BLAKE2B 7fe19c8d316f965d8b6214252ac262d3a67ed43857902e17af0505a5c7afe7cc22f84052ef7c8d1ac8283286c833952615a0aae13f6e5efa05c03b8717fd1048 SHA512 4e9cd278154873bc781f320fd14b6adc82caeae16e4daa2aaa5be93290f43a93478db068f82f1afbd3788a51cb791c69c2abeaa25a6b9f282b303495fbc09821 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d -DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362 DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a DIST nanopb-c9124132a604047d0ef97a09c0e99cd9bed2c818.tar.gz 1124211 BLAKE2B b8dfe6916decef6b6e32315989050a8ed3e72191fe8365c36652906631a9a2cbb34f8927223d866749dde58d85a8e264ef6d5daac614327db0977d05d693 SHA512 3914fe37399cf99512fbd45e496ac95490b74a2c259f96138123a3399fa2b7258e5d99ebd5293b8ad87069e1bb4ea71d13c54366382904c9607d8545afd90b62 diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild deleted file mode 100644 index 54b81b96c9dc.. --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit meson python-any-r1 - -CRITERION_COMMIT="4b5174ebda04ab76fe65eec25b5b6ea0809055e7" -DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" -KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" -NANOPB_COMMIT="6a6903be6084bb3f5a98a3341acef2aa05c61df9" - -DESCRIPTION="Cross platform unit testing framework for C and C++" -HOMEPAGE="https://github.com/Snaipe/Criterion; -SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz - https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz - https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz - https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" - -LICENSE="BSD-2 MIT ZLIB" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/nanomsg:= -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 2901ded1c82825ac3e59b3a367a3535462739042 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Dec 9 16:21:53 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Dec 9 16:21:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2901ded1 dev-libs/criterion: amd64 stable wrt bug #828342 Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/criterion/criterion-2.4_pre20210114.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild index 2a210335a427..220b6acc2d46 100644 --- a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: d60a25deee23c424382955bf9b015415447fe092 Author: Tomáš Mózes gmail com> AuthorDate: Tue Jun 15 14:07:55 2021 + Commit: Sam James gentoo org> CommitDate: Tue Jun 15 14:39:32 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60a25de dev-libs/criterion: add snapshot version Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21253 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/Manifest| 2 + .../criterion/criterion-2.4_pre20210114.ebuild | 68 ++ 2 files changed, 70 insertions(+) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 514c207130c..6a80c070470 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,4 +1,6 @@ DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a +DIST criterion-4cf886a2d96ada425e8c88d3c4d935e510c7c712.tar.gz 863335 BLAKE2B 5e86709f4b7d500f3a2d4e61dbffd17f50d5ab593bfe48c8b8d5d6019436e203cd0b7a818933733377fa2dd98b9a94a46f3980b0bc52a8b3ca54c9d60406bace SHA512 34a6acc6fc0c74dcab572c9f6a56c4490935df442b1ea95169143a50193e752fc361c66d007f875c319285eb81b533139f25c5b421903e7cc1ec89c546b94a21 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362 +DIST nanopb-70f0de9877b1ce12abc0229d5df84db6349fcbfc.tar.gz 301605 BLAKE2B 24ddb83b3bd220be57c82761159f2b138ec646bec53d02632e96f6cf9dd6fa39e24039a908ac9687c183612703e6973095f94aba55fab5dd5559f243c5d412b2 SHA512 ab535c57a000c5df267352fcab8dcf0560a3a0d9b92634699508c8504840510e4f9f4a21005d57baf0af2e31718eda2ebe41763c7f82ac37ef9b6342c27e2e2a diff --git a/dev-libs/criterion/criterion-2.4_pre20210114.ebuild b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild new file mode 100644 index 000..2a210335a42 --- /dev/null +++ b/dev-libs/criterion/criterion-2.4_pre20210114.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit meson python-any-r1 + +CRITERION_COMMIT="4cf886a2d96ada425e8c88d3c4d935e510c7c712" +DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" +KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" +NANOPB_COMMIT="70f0de9877b1ce12abc0229d5df84db6349fcbfc" + +DESCRIPTION="Cross platform unit testing framework for C and C++" +HOMEPAGE="https://github.com/Snaipe/Criterion; +SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz + https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz + https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz + https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" + +LICENSE="BSD-2 MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/nanomsg:= + dev-libs/libgit2:= + dev-libs/libffi:=" +DEPEND="${RDEPEND} + dev-libs/boxfort + test? ( + $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') + )" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/Criterion-${CRITERION_COMMIT}" + +PATCHES=( + "${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch +) + +python_check_deps() { + has_version "dev-util/cram[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + rm -r dependencies/{debugbreak,klib} || die + mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die + mv
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/files/, dev-libs/criterion/
commit: ba7438a633bd36de2923db9f48d66b8b452817ee Author: Sam James gentoo org> AuthorDate: Tue Jun 1 11:32:53 2021 + Commit: Sam James gentoo org> CommitDate: Tue Jun 1 11:32:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7438a6 dev-libs/criterion: add GCC 11 patch Closes: https://bugs.gentoo.org/791706 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 4 .../criterion/files/criterion-2.4_pre20200110-gcc11.patch| 12 2 files changed, 16 insertions(+) diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild index e4a1dfa78f3..54b81b96c9d 100644 --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -37,6 +37,10 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/Criterion-${CRITERION_COMMIT}" +PATCHES=( + "${FILESDIR}"/${PN}-2.4_pre20200110-gcc11.patch +) + python_check_deps() { has_version "dev-util/cram[${PYTHON_USEDEP}]" } diff --git a/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch new file mode 100644 index 000..c99e03af6f1 --- /dev/null +++ b/dev-libs/criterion/files/criterion-2.4_pre20200110-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/include/criterion/internal/assert/ieee.h b/include/criterion/internal/assert/ieee.h +index 3b6de3b..2063d87 100644 +--- a/include/criterion/internal/assert/ieee.h b/include/criterion/internal/assert/ieee.h +@@ -29,6 +29,7 @@ + #ifdef __cplusplus + + # include ++# include + + namespace criterion { namespace internal { namespace operators { +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 27fe58925215c2df32baa7af68bc9eb007cbbab9 Author: Sam James gentoo org> AuthorDate: Tue Jun 1 11:30:55 2021 + Commit: Sam James gentoo org> CommitDate: Tue Jun 1 11:30:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27fe5892 dev-libs/criterion: add Python 3.9 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild index 169702c042f..e4a1dfa78f3 100644 --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) inherit meson python-any-r1
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/files/, dev-libs/criterion/
commit: dfd6cd5bbfc1b699cb35bdb40b028c3389c81252 Author: Michał Górny gentoo org> AuthorDate: Mon May 31 20:21:12 2021 + Commit: Michał Górny gentoo org> CommitDate: Mon May 31 20:21:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd6cd5b dev-libs/criterion: Remove old Signed-off-by: Michał Górny gentoo.org> dev-libs/criterion/Manifest | 1 - dev-libs/criterion/criterion-2.3.3.ebuild | 55 - dev-libs/criterion/files/criterion-libdir.patch | 30 -- 3 files changed, 86 deletions(-) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 68937b71692..514c207130c 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1,5 +1,4 @@ DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a -DIST criterion-v2.3.3.tar.bz2 1821413 BLAKE2B 7972bf03870ae07da57252f7d62f3f5818755ad9ea2a0bed7b73d42649fbf5069c1a9af16bd8da9366d0506bbc86ec93a12904809bf91e36618d53f5d8674c18 SHA512 bf53716ff90421a42dd4d1bbd61451a4183aa6436af901c222e43e9e9b3e008008a891157a1c982b80c04e7e68aadc287392503094a3c4ad9c2066432d548e16 DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362 diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild deleted file mode 100644 index 808455b3876..000 --- a/dev-libs/criterion/criterion-2.3.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_7 ) - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake python-any-r1 - -DESCRIPTION="Cross platform unit testing framework for C and C++" -HOMEPAGE="https://github.com/Snaipe/Criterion; -SRC_URI="https://github.com/Snaipe/Criterion/releases/download/v${PV}/${PN}-v${PV}.tar.bz2; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/nanomsg:=" -DEPEND="${RDEPEND} - test? ( - $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') - )" -BDEPEND="virtual/pkgconfig" - -PATCHES="${FILESDIR}/${PN}-libdir.patch" -S="${WORKDIR}/${PN}-v${PV}" - -QA_EXECSTACK="usr/lib*/libcriterion.so*" - -python_check_deps() { - has_version "dev-util/cram[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DCTESTS="$(usex test ON OFF)" - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use test; then - cmake_build criterion_tests - fi -} diff --git a/dev-libs/criterion/files/criterion-libdir.patch b/dev-libs/criterion/files/criterion-libdir.patch deleted file mode 100644 index 91b28b06b94..000 --- a/dev-libs/criterion/files/criterion-libdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/.cmake/Modules/PackageUtils.cmake b/.cmake/Modules/PackageUtils.cmake -index 593f2d1..a771fd5 100644 a/.cmake/Modules/PackageUtils.cmake -+++ b/.cmake/Modules/PackageUtils.cmake -@@ -50,9 +50,9 @@ function (cr_add_library _LIB) - endforeach () - - install(TARGETS ${_LIB} --RUNTIME DESTINATION bin --LIBRARY DESTINATION lib --ARCHIVE DESTINATION lib ${install_flags} -+RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${install_flags} - ) - endfunction () - -diff --git a/src/criterion.pc.in b/src/criterion.pc.in -index 18ac3d6..23737a4 100644 a/src/criterion.pc.in -+++ b/src/criterion.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 9e3600a5e57bdbee08abb53892cfe48f2f1b761e Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Apr 1 12:15:41 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 1 12:15:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e3600a5 dev-libs/criterion: x86 keyworded (bug #729802) Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild index 44e8faa084b..169702c042f 100644 --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: fac5f47d61e3152456c686daf53442bd18c37d22 Author: Sam James gentoo org> AuthorDate: Mon Mar 15 06:38:44 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 15 06:38:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac5f47d dev-libs/criterion: Keyword 2.4_pre20200110 arm, #729802 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild index a9b8966ef75..44e8faa084b 100644 --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="amd64 ~arm64" +KEYWORDS="amd64 ~arm ~arm64" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: c4f8edf39150857189c192df7b629370830aac99 Author: Sam James gentoo org> AuthorDate: Mon Mar 15 06:35:54 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 15 06:36:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f8edf3 dev-libs/criterion: Keyword 2.4_pre20200110 arm64, #729802 Signed-off-by: Sam James gentoo.org> dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild index 5613158c2bc..a9b8966ef75 100644 --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm64" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: e622a434b313ac72d7f4676e484f8a2f47b01175 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Nov 16 22:49:11 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Nov 16 22:53:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e622a434 dev-libs/criterion: use dev-libs/libffi instead of virtual/libffi Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich gentoo.org> dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild index c96a9344ef5..e00741d0b9b 100644 --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -27,7 +27,7 @@ RESTRICT="!test? ( test )" RDEPEND="dev-libs/nanomsg:= dev-libs/libgit2:= - virtual/libffi:=" + dev-libs/libffi:=" DEPEND="${RDEPEND} dev-libs/boxfort test? (
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: cddb87754c2bd0adb623e234d0fc34237267093a Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jun 26 17:41:28 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jun 26 17:41:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cddb8775 dev-libs/criterion: amd64 stable wrt bug #702032 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild index f335a5c5df2..c96a9344ef5 100644 --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -21,7 +21,7 @@ SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz LICENSE="BSD-2 MIT ZLIB" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 7cc73b50d5144fc22d9a9f48fe7df44d38216048 Author: Tomáš Mózes gmail com> AuthorDate: Wed Jun 10 11:33:46 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Jun 25 11:18:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc73b50 dev-libs/criterion: add python 3.8 support Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16161 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/criterion-2.4_pre20200110.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild index d26ebb1a956..f335a5c5df2 100644 --- a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit meson python-any-r1
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 1011d001c3b3efbc47d405340ee029f396047a97 Author: Tomáš Mózes gmail com> AuthorDate: Fri Jan 10 11:18:20 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Mon Jan 13 12:53:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1011d001 dev-libs/criterion: add snapshot Switch to meson, unbundle boxfort dependency Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14299 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/Manifest| 4 ++ .../criterion/criterion-2.4_pre20200110.ebuild | 64 ++ 2 files changed, 68 insertions(+) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest index 4b651b0aa21..68937b71692 100644 --- a/dev-libs/criterion/Manifest +++ b/dev-libs/criterion/Manifest @@ -1 +1,5 @@ +DIST criterion-4b5174ebda04ab76fe65eec25b5b6ea0809055e7.tar.gz 862951 BLAKE2B c01f95cd573a5f8cb92fb7e6a38b2b27a8066d8a690d51374f38adab92d41d4d408316c0195767445d8bd417191f4c5914c5855d7f0012ec0d91e32398373f8f SHA512 58560ec81eb6017afa0491db5f1f3e16961b4c4f3eddae3d2d04c5bcd4e9cf13df515745531e512a6463ec5ab98bcd8936a8c23e5382535cb6f8b8bfb8cb2c9a DIST criterion-v2.3.3.tar.bz2 1821413 BLAKE2B 7972bf03870ae07da57252f7d62f3f5818755ad9ea2a0bed7b73d42649fbf5069c1a9af16bd8da9366d0506bbc86ec93a12904809bf91e36618d53f5d8674c18 SHA512 bf53716ff90421a42dd4d1bbd61451a4183aa6436af901c222e43e9e9b3e008008a891157a1c982b80c04e7e68aadc287392503094a3c4ad9c2066432d548e16 +DIST debugbreak-6b79ec8d8f8d4603111f580a0537f8f31c484c32.tar.gz 5613 BLAKE2B 78711c3c46d567fb7110a70dfddc2fb5e413eb5c6b9f67d5d8b5f8a663af854cb50f3b9d9947a2c14909dcd2b34f762192a4fbe8b32dcde7c9894f0560ccf769 SHA512 f4bb95b3f931545800abbb86aa787939cc1c30f464e465689aff3fff3d753766bafe4de9065b762d9db882608b2df250514ab38fc9c476cbd6d7d95d516c75cb +DIST klib-cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502.tar.gz 99303 BLAKE2B 7804c030106ffab44afcbc1ac77d644e7dfef7c107d4f9679a3a4b7506e41ada65e87113831f94fc5c6f70073356c38a317153e01f1985522029990e9af40544 SHA512 fe4f0cd9b5ff2d5605d388f8a67d6c7211320d0fea6fb9b2df0c9b1e67a1f683b80b86cac007b0cfbd264b75bc0e4849e772506c2ee66b86967e5ee24cc89e1d +DIST nanopb-6a6903be6084bb3f5a98a3341acef2aa05c61df9.tar.gz 248884 BLAKE2B 5ab65dbee87686ac8fb4985c3a8c71cdc946580248318a4f566550e5f7dab492c00cf3be471e04313a15c4ad3659f71744bbb30686506d2950588aa3c26a37fb SHA512 14ddc420e8a38116d0f7fbf01623728f14048ddb41b3ac6024d7610532071ecb8ce88b25e3440f9f4bfe9ee7d376071e2eb9e0c166f3e2982f35cc155dcf0362 diff --git a/dev-libs/criterion/criterion-2.4_pre20200110.ebuild b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild new file mode 100644 index 000..d26ebb1a956 --- /dev/null +++ b/dev-libs/criterion/criterion-2.4_pre20200110.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit meson python-any-r1 + +CRITERION_COMMIT="4b5174ebda04ab76fe65eec25b5b6ea0809055e7" +DEBUGBREAK_COMMIT="6b79ec8d8f8d4603111f580a0537f8f31c484c32" +KLIB_COMMIT="cdb7e9236dc47abf8da7ebd702cc6f7f21f0c502" +NANOPB_COMMIT="6a6903be6084bb3f5a98a3341acef2aa05c61df9" + +DESCRIPTION="Cross platform unit testing framework for C and C++" +HOMEPAGE="https://github.com/Snaipe/Criterion; +SRC_URI="https://github.com/Snaipe/Criterion/archive/${CRITERION_COMMIT}.tar.gz -> criterion-${CRITERION_COMMIT}.tar.gz + https://github.com/scottt/debugbreak/archive/${DEBUGBREAK_COMMIT}.tar.gz -> debugbreak-${DEBUGBREAK_COMMIT}.tar.gz + https://github.com/attractivechaos/klib/archive/${KLIB_COMMIT}.tar.gz -> klib-${KLIB_COMMIT}.tar.gz + https://github.com/nanopb/nanopb/archive/${NANOPB_COMMIT}.tar.gz -> nanopb-${NANOPB_COMMIT}.tar.gz" + +LICENSE="BSD-2 MIT ZLIB" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/nanomsg:= + dev-libs/libgit2:= + virtual/libffi:=" +DEPEND="${RDEPEND} + dev-libs/boxfort + test? ( + $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') + )" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/Criterion-${CRITERION_COMMIT}" + +python_check_deps() { + has_version "dev-util/cram[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + rm -r dependencies/{debugbreak,klib,nanopb} || die + mv "${WORKDIR}/debugbreak-${DEBUGBREAK_COMMIT}" dependencies/debugbreak || die + mv "${WORKDIR}/klib-${KLIB_COMMIT}" dependencies/klib || die + mv "${WORKDIR}/nanopb-${NANOPB_COMMIT}" dependencies/nanopb || die +} + +src_configure() { + local emesonargs=( + -Dsamples=$(usex test true false) + -Dtests=$(usex test true false) + ) + + meson_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/files/, dev-libs/criterion/
commit: a9995983c28c1bb484ff695ed74c2a543b0f4299 Author: Tomáš Mózes gmail com> AuthorDate: Sun Jan 5 03:38:45 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Jan 5 20:18:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9995983 dev-libs/criterion: improve ebuild Signed-off-by: Tomáš Mózes gmail.com> Closes: https://bugs.gentoo.org/703530 Closes: https://github.com/gentoo/gentoo/pull/14093 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/criterion-2.3.3.ebuild | 31 + dev-libs/criterion/files/criterion-libdir.patch | 30 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild index e0b34016c62..1f2eda350a6 100644 --- a/dev-libs/criterion/criterion-2.3.3.ebuild +++ b/dev-libs/criterion/criterion-2.3.3.ebuild @@ -1,10 +1,12 @@ -# Copyright 2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) + CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake +inherit cmake python-any-r1 DESCRIPTION="Cross platform unit testing framework for C and C++" HOMEPAGE="https://github.com/Snaipe/Criterion; @@ -18,13 +20,24 @@ RESTRICT="!test? ( test )" RDEPEND="dev-libs/nanomsg:=" DEPEND="${RDEPEND} - test? ( dev-util/cram )" + test? ( + $(python_gen_any_dep 'dev-util/cram[${PYTHON_USEDEP}]') + )" BDEPEND="virtual/pkgconfig" +PATCHES="${FILESDIR}/${PN}-libdir.patch" S="${WORKDIR}/${PN}-v${PV}" QA_EXECSTACK="usr/lib*/libcriterion.so*" +python_check_deps() { + has_version "dev-util/cram[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_configure() { local mycmakeargs=( -DCTESTS="$(usex test ON OFF)" @@ -40,15 +53,3 @@ src_compile() { cmake_build criterion_tests fi } - -src_install() { - cmake_src_install - - if [[ "/usr/lib" != "/usr/$(get_libdir)" ]]; then - mkdir -p "${D}/usr/$(get_libdir)" || die - mv "${D}"/usr/lib/libcriterion.so* "${D}/usr/$(get_libdir)/" || die - fi - - sed -i "s@${prefix}/lib@${prefix}/$(get_libdir)@g" \ - "${D}/usr/share/pkgconfig/criterion.pc" || die -} diff --git a/dev-libs/criterion/files/criterion-libdir.patch b/dev-libs/criterion/files/criterion-libdir.patch new file mode 100644 index 000..91b28b06b94 --- /dev/null +++ b/dev-libs/criterion/files/criterion-libdir.patch @@ -0,0 +1,30 @@ +diff --git a/.cmake/Modules/PackageUtils.cmake b/.cmake/Modules/PackageUtils.cmake +index 593f2d1..a771fd5 100644 +--- a/.cmake/Modules/PackageUtils.cmake b/.cmake/Modules/PackageUtils.cmake +@@ -50,9 +50,9 @@ function (cr_add_library _LIB) + endforeach () + + install(TARGETS ${_LIB} +-RUNTIME DESTINATION bin +-LIBRARY DESTINATION lib +-ARCHIVE DESTINATION lib ${install_flags} ++RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${install_flags} + ) + endfunction () + +diff --git a/src/criterion.pc.in b/src/criterion.pc.in +index 18ac3d6..23737a4 100644 +--- a/src/criterion.pc.in b/src/criterion.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + includedir=${prefix}/include +-libdir=${prefix}/lib ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + + Name: @PROJECT_NAME@ + Description: A KISS, Cross platform unit testing framework for C and C++
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 9ec640b713b8c04da89c3f26ea79c881c9a598c0 Author: Tomas Mozes gmail com> AuthorDate: Fri Dec 20 07:09:13 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Dec 20 14:20:44 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec640b7 dev-libs/criterion: fix DEPEND/RDEPEND variable names Bug: https://bugs.gentoo.org/703388 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Tomáš Mózes gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14053 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/criterion-2.3.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild index ffb7d5c2202..27a2a9ae8b0 100644 --- a/dev-libs/criterion/criterion-2.3.3.ebuild +++ b/dev-libs/criterion/criterion-2.3.3.ebuild @@ -16,8 +16,8 @@ KEYWORDS="~amd64" IUSE="test" RESTRICT="!test? ( test )" -REPEND="dev-libs/nanomsg:=" -DDEPEND="${DEPEND} +RDEPEND="dev-libs/nanomsg:=" +DEPEND="${RDEPEND} test? ( dev-util/cram )" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/criterion/
commit: 0a97bed539cc8f61dbdbda86214a5f0d84cc84ff Author: Tomas Mozes gmail com> AuthorDate: Thu Dec 19 15:05:39 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Fri Dec 20 05:45:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a97bed5 dev-libs/criterion: add new package Needed for app-admin/syslog-ng tests Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Tomáš Mózes gmail.com> Signed-off-by: Joonas Niilola gentoo.org> dev-libs/criterion/Manifest | 1 + dev-libs/criterion/criterion-2.3.3.ebuild | 54 +++ dev-libs/criterion/metadata.xml | 15 + 3 files changed, 70 insertions(+) diff --git a/dev-libs/criterion/Manifest b/dev-libs/criterion/Manifest new file mode 100644 index 000..4b651b0aa21 --- /dev/null +++ b/dev-libs/criterion/Manifest @@ -0,0 +1 @@ +DIST criterion-v2.3.3.tar.bz2 1821413 BLAKE2B 7972bf03870ae07da57252f7d62f3f5818755ad9ea2a0bed7b73d42649fbf5069c1a9af16bd8da9366d0506bbc86ec93a12904809bf91e36618d53f5d8674c18 SHA512 bf53716ff90421a42dd4d1bbd61451a4183aa6436af901c222e43e9e9b3e008008a891157a1c982b80c04e7e68aadc287392503094a3c4ad9c2066432d548e16 diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild new file mode 100644 index 000..ffb7d5c2202 --- /dev/null +++ b/dev-libs/criterion/criterion-2.3.3.ebuild @@ -0,0 +1,54 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake-utils + +DESCRIPTION="Cross platform unit testing framework for C and C++" +HOMEPAGE="https://github.com/Snaipe/Criterion; +SRC_URI="https://github.com/Snaipe/Criterion/releases/download/v${PV}/${PN}-v${PV}.tar.bz2; + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +REPEND="dev-libs/nanomsg:=" +DDEPEND="${DEPEND} + test? ( dev-util/cram )" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${PN}-v${PV}" + +QA_EXECSTACK="usr/lib*/libcriterion.so*" + +src_configure() { + local mycmakeargs=( + -DCTESTS="$(usex test ON OFF)" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use test; then + cmake-utils_src_make criterion_tests + fi +} + +src_install() { + cmake-utils_src_install + + if [[ "/usr/lib" != "/usr/$(get_libdir)" ]]; then + mkdir -p "${D}/usr/$(get_libdir)" || die + mv "${D}"/usr/lib/libcriterion.so* "${D}/usr/$(get_libdir)/" || die + fi + + sed -i "s@${prefix}/lib@${prefix}/$(get_libdir)@g" \ + "${D}/usr/share/pkgconfig/criterion.pc" || die +} diff --git a/dev-libs/criterion/metadata.xml b/dev-libs/criterion/metadata.xml new file mode 100644 index 000..5df5b286363 --- /dev/null +++ b/dev-libs/criterion/metadata.xml @@ -0,0 +1,15 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +hydrapo...@gmail.com +Tomáš Mózes + + +proxy-ma...@gentoo.org +Proxy Maintainers + + +Snaipe/Criterion + +