commit: cbc310b44cb1cca7dd68f70bf16dff3478f3d387 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu Feb 6 21:06:46 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Feb 6 21:11:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc310b4
dev-util/strace: Removed old Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> dev-util/strace/Manifest | 1 - .../strace/files/strace-5.2-linux-5.3-compat.patch | 75 ----------------- dev-util/strace/strace-5.2.ebuild | 97 ---------------------- 3 files changed, 173 deletions(-) diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest index 920d075e810..1219d8b8409 100644 --- a/dev-util/strace/Manifest +++ b/dev-util/strace/Manifest @@ -1,5 +1,4 @@ DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290 -DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35 DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7 DIST strace-5.5.tar.xz 1628744 BLAKE2B ae2ab9b2c756858c3c23640ee19821b8720da84a5e15e4a674768d8f4b51d74b2b490cfa18a862bc3c9d129baeaf09212700bea98ac151db035d03a05afa055d SHA512 317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231 diff --git a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch b/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch deleted file mode 100644 index 254326f0457..00000000000 --- a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch +++ /dev/null @@ -1,75 +0,0 @@ -https://github.com/strace/strace/commit/60da39553ff92cf741bf7f54daff636bb28cbb3c -https://bugs.gentoo.org/695260 - ---- a/xlat/v4l2_pix_fmts.h -+++ b/xlat/v4l2_pix_fmts.h -@@ -269,19 +269,23 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else - # define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') - #endif --#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444) -+#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('B', 'A', '1', '2')"); -+static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') -+# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') - #endif --#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12) -+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 -+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 -+# undef V4L2_PIX_FMT_BGRA444 -+#endif -+#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE --static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')"); -+static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('G', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('G', 'A', '1', '2')"); - DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE - #else --# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') -+# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') - #endif - #if defined(V4L2_PIX_FMT_RGBA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_RGBA444) && HAVE_DECL_V4L2_PIX_FMT_RGBA444) - DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE -@@ -1343,8 +1347,17 @@ const struct xlat v4l2_pix_fmts[] = { - XLAT(V4L2_PIX_FMT_H264_NO_SC), - XLAT(V4L2_PIX_FMT_PWC1), - XLAT(V4L2_PIX_FMT_MPEG1), -- XLAT(V4L2_PIX_FMT_BGRA444), - XLAT(V4L2_PIX_FMT_SGRBG12), -+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 -+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 -+/* -+* V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with -+* the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit -+* v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12. -+*/ -+# undef V4L2_PIX_FMT_BGRA444 -+#endif -+ XLAT(V4L2_PIX_FMT_BGRA444), - XLAT(V4L2_PIX_FMT_RGBA444), - XLAT(V4L2_PIX_FMT_ABGR444), - XLAT(V4L2_PIX_FMT_SGBRG12), ---- a/xlat/v4l2_pix_fmts.in -+++ b/xlat/v4l2_pix_fmts.in -@@ -37,8 +37,17 @@ V4L2_PIX_FMT_RGB332 v4l2_fourcc('R', 'G', 'B', '1') /* 8 RGB-3-3-2 */ - V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */ - V4L2_PIX_FMT_PWC1 v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */ - V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */ --V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */ - V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12 GRGR.. BGBG.. */ -+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 -+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444 -+/* -+ * V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with -+ * the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit -+ * v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12. -+ */ -+# undef V4L2_PIX_FMT_BGRA444 -+#endif -+V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16 bbbbgggg rrrraaaa */ - V4L2_PIX_FMT_RGBA444 v4l2_fourcc('R', 'A', '1', '2') /* 16 rrrrgggg bbbbaaaa */ - V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16 aaaabbbb ggggrrrr */ - V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12 GBGB.. RGRG.. */ diff --git a/dev-util/strace/strace-5.2.ebuild b/dev-util/strace/strace-5.2.ebuild deleted file mode 100644 index 88a2db590c1..00000000000 --- a/dev-util/strace/strace-5.2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git"; - inherit git-r3 autotools -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -fi - -DESCRIPTION="A useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/"; - -LICENSE="BSD" -SLOT="0" -IUSE="aio perl static unwind elfutils" - -REQUIRED_USE="?? ( unwind elfutils )" - -LIB_DEPEND=" - unwind? ( sys-libs/libunwind[static-libs(+)] ) - elfutils? ( dev-libs/elfutils[static-libs(+)] ) -" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -PATCHES=( "${FILESDIR}"/${P}-linux-5.3-compat.patch ) - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - sed /autoreconf/d -i bootstrap || die - ./bootstrap || die - eautoreconf - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - filter-lfs-flags # configure handles this sanely - # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread. - use static && append-ldflags -static -pthread - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - # Stub out the -k test since it's known to be flaky. #545812 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - # Don't require mpers support on non-multilib systems. #649560 - local myeconfargs=( - --enable-mpers=check - $(use_with unwind libunwind) - $(use_with elfutils libdw) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - if has usersandbox ${FEATURES} ; then - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 - return 0 - fi - - default -} - -src_install() { - default - if ! use perl ; then - rm "${ED}"/usr/bin/strace-graph || die - fi - dodoc CREDITS -}
