From 434d713861b70f6c6563d6ee50a8e64f14c970d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 15 Feb 2018 16:58:00 +0000 Subject: gentoo resync : 15.02.2018 --- dev-util/strace/Manifest | 6 +-- dev-util/strace/strace-4.16.ebuild | 69 ------------------------------- dev-util/strace/strace-4.21.ebuild | 84 ++++++++++++++++++++++++++++++++++++++ dev-util/strace/strace-9999.ebuild | 10 ++--- 4 files changed, 92 insertions(+), 77 deletions(-) delete mode 100644 dev-util/strace/strace-4.16.ebuild create mode 100644 dev-util/strace/strace-4.21.ebuild (limited to 'dev-util/strace') diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest index 59c34b9090c7..d893022bd64f 100644 --- a/dev-util/strace/Manifest +++ b/dev-util/strace/Manifest @@ -1,6 +1,6 @@ -DIST strace-4.16.tar.xz 966668 BLAKE2B b3c593b2fc17d540ca04a05886fc0d37b3445a4e88f5e93035bc9dbeb6fe21678b9018f052ba8e356a51d0a5013ec8863a50f8fcd5dcfd1d8b9ac4a6363f2d71 SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c -EBUILD strace-4.16.ebuild 1804 BLAKE2B 3b572e70ba3f15553e3824eb39ed66cc21972ab0a9c98e2b58eb82de9639b8a14aea7506013256fb5c08f58cab143e33715dd21bede0aff9173b0196a66f28c4 SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf +DIST strace-4.21.tar.xz 1185908 BLAKE2B 00d8c7e296dd3b2a004b4f7ae062a3813219351bb4a5aabbc2e04784c35760f271fc12fd0122dac276a9723079f63d7187239172c9379a056e55dab9606e2e4b SHA512 d3b0393f1f727530e2e5b4490c80a905d251223167a61f9a86884a4b8a4f25522c46c465961968ca25013f321e561e217cb6e8f15be31d4d371274030526187d EBUILD strace-4.20.ebuild 1960 BLAKE2B 65781937316df4e01de886b552b02834c37411a1c004de98b6e95e7dd2b6c9b11bfa27de5effc9661bbc341172d1cedae180e6488abca43c014e18949fccc3f3 SHA512 ca60303dcd6526df451f516dd519406e0c0160b92d400e1c44c1fac8e5df2874ae2dc8c9a2dc0297d6354246302e8bc7af20522d2422de2df858b3b1348da2fd -EBUILD strace-9999.ebuild 1973 BLAKE2B 412b8994c819e0e13e9e98f5b2e831046f77a48fff782deeb3f4715adcea979ffc1e51aa4fca4d8d34bd29ced21c7a729cb2c3281ba6e968d1c130e50a276e0b SHA512 0329814e518cab45d476d6fe4244b5b3a2bb9449f5cc4a33fa1a17e6af39624c6481b114ffebe5264c9e34bf78f32918a1e9070d37d36329fec96b95d8a29012 +EBUILD strace-4.21.ebuild 2109 BLAKE2B ab88781b7c02413b1c458a92bc424159e8302c2407d8d4c281ebb259e5e3ec5fa59df9c0ee6e69f6d639106b82f3af7c5f1d5282038433a8e4f401818bc10092 SHA512 5d5a2e17d23a2705e0011ab5ad1c5635f6548d81c7ff0f5592880794e711305a6af05a0f10797bbabc16d2b28edcf9326df513cc1b485fb62aad965c2fa46eb9 +EBUILD strace-9999.ebuild 2038 BLAKE2B 61c00720bd641dfb3f9fae3772c0c6313e904d07a8e635b1a5b3dfa263f0c810f237f34b87b6bba055e2876d10ddf793a4ca74aae40897a2beb4581be182623e SHA512 23e56bf7661d29d8331d51f68c732ceb2db55ff2a88927f4f9281beca96c0d30d39c3aa1e19f5509f22c3c2b40bfef6668e4cec0b95bdde53b9f9ac7fe1c3ba9 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4 diff --git a/dev-util/strace/strace-4.16.ebuild b/dev-util/strace/strace-4.16.ebuild deleted file mode 100644 index ad9e35e242c1..000000000000 --- a/dev-util/strace/strace-4.16.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit flag-o-matic eutils toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.code.sf.net/p/strace/code" - EGIT_PROJECT="${PN}" - inherit git-2 autotools -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -DESCRIPTION="A useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://sourceforge.net/projects/strace/" - -LICENSE="BSD" -SLOT="0" -IUSE="aio perl static unwind" - -LIB_DEPEND="unwind? ( sys-libs/libunwind[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 )" - -src_prepare() { - epatch_user - - if [[ ! -e configure ]] ; then - # git generation - ./xlat/gen.sh || die - ./generate_mpers_am.sh || die - eautoreconf - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - filter-lfs-flags # configure handles this sanely - use static && append-ldflags -static - - 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 - - econf $(use_with unwind libunwind) -} - -src_install() { - default - use perl || rm "${ED}"/usr/bin/strace-graph - dodoc CREDITS -} diff --git a/dev-util/strace/strace-4.21.ebuild b/dev-util/strace/strace-4.21.ebuild new file mode 100644 index 000000000000..0a2a04c8fabb --- /dev/null +++ b/dev-util/strace/strace-4.21.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + #EGIT_REPO_URI="git://git.code.sf.net/p/strace/code" + #EGIT_PROJECT="${PN}" + EGIT_REPO_URI="https://github.com/strace/strace.git" + inherit git-r3 autotools +else + #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +fi + +DESCRIPTION="A useful diagnostic, instructional, and debugging tool" +HOMEPAGE="https://sourceforge.net/projects/strace/" + +LICENSE="BSD" +SLOT="0" +IUSE="aio perl static unwind" + +LIB_DEPEND="unwind? ( sys-libs/libunwind[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 ) +" + +src_prepare() { + default + + if [[ ! -e configure ]] ; then + # git generation + ./xlat/gen.sh || die + ./generate_mpers_am.sh || die + eautoreconf + [[ ! -e CREDITS ]] && cp CREDITS{.in,} + fi + + filter-lfs-flags # configure handles this sanely + use static && append-ldflags -static + + 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 + + econf $(use_with unwind libunwind) +} + +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 + use perl || rm "${ED}"/usr/bin/strace-graph + dodoc CREDITS +} diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild index e445febc7869..8e7cd87aff5f 100644 --- a/dev-util/strace/strace-9999.ebuild +++ b/dev-util/strace/strace-9999.ebuild @@ -6,11 +6,11 @@ EAPI=6 inherit flag-o-matic toolchain-funcs if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.code.sf.net/p/strace/code" - EGIT_PROJECT="${PN}" + EGIT_REPO_URI="https://github.com/strace/strace.git" inherit git-r3 autotools else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + 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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" fi @@ -38,8 +38,8 @@ src_prepare() { if [[ ! -e configure ]] ; then # git generation - ./xlat/gen.sh || die - ./generate_mpers_am.sh || die + sed /autoreconf/d -i bootstrap || die + ./bootstrap || die eautoreconf [[ ! -e CREDITS ]] && cp CREDITS{.in,} fi -- cgit v1.2.3