From 273ff756ad46386dee3ab2391d35b43d112ade82 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 16 Jan 2014 09:35:37 +0000 Subject: Added upstream patch to fix user filter in top (bug #497438). Committed straight to stable Package-Manager: portage-2.2.8/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x981CA6FC --- sys-process/procps/ChangeLog | 9 +++++- sys-process/procps/Manifest | 31 +++++++++--------- sys-process/procps/procps-3.3.8-r1.ebuild | 52 ----------------------------- sys-process/procps/procps-3.3.8-r2.ebuild | 54 +++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 68 deletions(-) delete mode 100644 sys-process/procps/procps-3.3.8-r1.ebuild create mode 100644 sys-process/procps/procps-3.3.8-r2.ebuild (limited to 'sys-process/procps') diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog index a7d773d3bf1b..a73b8f103991 100644 --- a/sys-process/procps/ChangeLog +++ b/sys-process/procps/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-process/procps # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.111 2014/01/15 09:31:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.112 2014/01/16 09:35:36 polynomial-c Exp $ + +*procps-3.3.8-r2 (16 Jan 2014) + + 16 Jan 2014; Lars Wendler -procps-3.3.8-r1.ebuild, + +procps-3.3.8-r2.ebuild: + Added upstream patch to fix user filter in top (bug #497438). Committed + straight to stable. 15 Jan 2014; Agostino Sarubbo procps-3.3.8-r1.ebuild: Stable for ia64, wrt bug #494822 diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest index c139dbecb414..7db5dad49248 100644 --- a/sys-process/procps/Manifest +++ b/sys-process/procps/Manifest @@ -4,28 +4,29 @@ Hash: SHA256 AUX procps-3.3.6-error_at_line.patch 325 SHA256 642eb70e9165f3cf18b7ca3afe370f93991b32bc0271c9e1064c774dd2fadbb3 SHA512 fd0fd437deb7c1ac683ca90f3e94d14b35f3e9d19422e84f59b74d7530f204a04a289e5397d986536adffb2a30611ec5a8486bc9f01a32708d9025d3fb7c98b9 WHIRLPOOL f0f2da5452a8a1817a48a76723f6d02eddb856e8e69bac8ec8d87891a7f94f10c8945dba5c501cdc0d3f52fe690940524d0ae2c32868a3aa48155e54ffd2c3af AUX procps-3.3.8-kill-neg-pid.patch 1446 SHA256 847c21f6619c7aa0f2847726a17595f986ec2fe0f361d95e17812639abe32a79 SHA512 3ed4e83d81f7dd574ff68bbcae9ad9f8649a39d46a17de5fd4297f215d8f70cd28e415b1d3c7b5142e7719343af28f4b393061a60eb012caece81dfe5ff6c271 WHIRLPOOL cf452118312e60a0bab7a4ec87bed9a9d2f5fb8bb563769a0430f11c72348e5be79bdfc031f67f4e97e0bf9b32f6ccd1ac590f392c95ee935b77b857ce1b1739 DIST procps-3.3.8-respect_epipe_in_fileutils.patch 1412 SHA256 4a56c88697fa6099a62a4169838c9c04df2c2c2bbc08e9ad9953e5b00df16d68 SHA512 317fc8e7c3fbd280182f55b399a30b2cfbc72268590825ea323537361cd761776afe1486509cb04ae937287ccf11578def5aac2eaa0fe660d04f0357282d9c14 WHIRLPOOL f8fdac8a172037edf51e1e777374293848afaa2180adc35adce5bf8ebefceb37df30082b27f6d6f1f5a571ba0f84bdfff9fc6c2343f120ce5c80b2f52e1804ac +DIST procps-3.3.8-top_user_filter.patch 2355 SHA256 089d7d0a0a497d88d34f3d05da245198b97353d11768453f5c57b7a346d72d0d SHA512 dc9af2ef6a9f1e5b8434069226c4739cdb914f4b84c366596e8a4fb853e4d61715814a0888938cd4c96f2f5bd9adaa573e4fb37be659424e615298e65980bca2 WHIRLPOOL 7e7a52917567013f425dc631dbdcafd3c4978893caf9c3e0e2979c7825332d1296e8026c43c1ac4915787226b53949d6264860b549cd0ac79bb0e8c63f264231 DIST procps-ng-3.3.6.tar.xz 535796 SHA256 d09ac4df3793f632d481f6547c39c6d835a7aa7bd5a302fcb0885ff7691c124c SHA512 8d55e040a223fa8dec056571fcdec4d5415afe1374915d2ebf1af44da9b9a411e03560090cf0f08c8aec0fbedc55a85f75af397f53f7e6d30d320c438854049b WHIRLPOOL b560ce1ac0228aea9067970826cf07b2bf238e5f85bf4e9263127e67b6441d62f1b176526de307bbb3c3e26b4a39de4ee515051b8f79b2eea0414d57f883dabe DIST procps-ng-3.3.8.tar.xz 553056 SHA256 a4109cfb6fe3bcfb5a0efb37efe04d0c8ce858bff3820d48cc258bad41bed46b SHA512 63ba13f9ef0f4558748c6b2d1b0719a1173bd87e38279e3b052a10e207e1b808626d031f16dd65b05c55708366df7350cb0a64da8dc20e7f9f1fdc1cd2417c71 WHIRLPOOL 671860af1f028c9c8c7bb0c035db86e3e13d9d754801e7a3f19105710bb9720bbfa627e4e748b823192286319fe4e7e736c1af5a3fb34116cbe93386b0d2bed6 DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663 SHA512 62c7270aa48b4346a3198f306d1cb8474f64650bfb67e8cc6c4d41923e50c31c95b3a0367a464823fb50a6137ec0c6352006292ac85b50caf730ec8ec35eb553 WHIRLPOOL dac97433a87badd40b46e3155bf0e30652ed2961a41bc8fca074357431301d250632215512ad752634c9c4f3273a1c75caba1ecf4f5a3c510bee155660dde166 EBUILD procps-3.3.6.ebuild 1484 SHA256 e9cd041b4db4f57b88719c3c3caf89ba8aed88cbba29118d154ce6d48fe270dc SHA512 8029d6526fd035e2eee96839d3ca4372a3431a734f1a307f2a3893a6d6abc3da5897827caf29216347f33874d39c9ed79ce354eea967589b14c7d76749fe22f3 WHIRLPOOL 48f5ddd0feb00e3ec6a099a8d273c3de87489d824fb6cd34460a502b236180f78c825db52ae1b5bfec9d5a3b0a127f86f6d589a611fe869aadf3e79ce2cd3270 -EBUILD procps-3.3.8-r1.ebuild 1694 SHA256 9ad26d0fa656bb80c85f5acaa6cea73cc0f42a7cc006e250868fdbfa578bb516 SHA512 f073aef4d647021325b0c1c54bb593e28735d16c2fd78feb04431e4ed60d5b0f898a10a1c4a0faeb3ac77a89e9bd07448fbd3d9221c2e40eb5ba375e48670948 WHIRLPOOL 1770cbf2fec371cec33ebb34ee4fbbd07d5309a705c57581bade568fbf87b905c2fcb67ff467bf27e3a2a1f1ed90dc4251f517cae122f47f9180800d75174609 +EBUILD procps-3.3.8-r2.ebuild 1883 SHA256 6aedb911cf315248d4959ef8255f4cdf5151303ac52bdcfef2196bf8a179fe44 SHA512 5e393f84db60ba64f12cb598543c18f3522671de422e1dc2de6e2c4a55b316e2f48c964bcad0c6524ce84e1e523a94d5dadf3e71d3d3c7593c3fb1e9480baeba WHIRLPOOL 652b69996be1c797b37a675e2fa62c231c8fc956b3d45a608b4ec5b82c9bf94d368e462db60a73fde75e4264369a9f5939069499e1ffdc0c794da36e5b0d77d6 EBUILD procps-3.3.9.ebuild 1600 SHA256 3251c51ccca98c2b3518d1ef8bec6a5a8cc0784350ff1c19857f0ad279538286 SHA512 21e26dedac919328d23a6453c1ea2c83d50b9316881d1c923ab58716ff9cf158d88644408fff1c39916cd8e0b7238c7e45b030eeb6b5b2a8272c447364f27f2e WHIRLPOOL a163817252bfed1488d0717c5250403df5a42dc8e0bc298ed5001ba5717720a5e684716f3410b26e583d1bb1d5de6890a6f41ce4a128e6e11f31565d53482c27 -MISC ChangeLog 31478 SHA256 2eaaf6644a4b94ab49aa7d849ed92acaccefb45ed7bced54a34f37bd334d2779 SHA512 c40b69144b407a72b240266ec79a523c35de2c0b51f4b2f84e85832ac0e2d51655230efec80fcc19e94444d3ba4ba60d9a3cd0510f3c2f43b89c347f1d5b7909 WHIRLPOOL ad304bc77982404bcacd5852dd0df27d517ab10157186b33f7c74b3b6b3a278dc14e62463fd934efbd411249cdbfdff15e0f72efd9a582ff94316bee7e14983d +MISC ChangeLog 31722 SHA256 3f41a2efd0215457c2cb9cc2741c70d9c7cb00bafb408c6f6fac11916e4d7ab7 SHA512 6605a274a827b9f968d4cef17e281b7bd9cb58c7bf0c4a0e1d4bcb9a62d7271d4bd8d11d5d8d781765026a746f57bc8a1eefa0d480200a876cd308c2aaa0feea WHIRLPOOL 99cc6017c862646eaa92aaa27ec2f3d82d77ddee2ed9b20b624a1c960e94b2806d5f687c9be096eb6ba460c6393d641ecf8d44fd40a1fd7b43a56c0b411097e5 MISC metadata.xml 259 SHA256 0bb63eb156063b66b45ac343be2ccf262f08ea0a9d247e8b1428d2f413c978c2 SHA512 b3ffc0288a73615eb2a24f7af77fa63781c3b6d713a2ba47d4bf83accf7d82bcb029e24cea7600b1ecc94de723f51b20fda082cf22d5b48dc05e98bd6eea6017 WHIRLPOOL 5339d46eb28ba6d6e413e6c79ea8c4c174379b0a99baa990c9f5e18c199113b96e5028437e3d175087d19730869cad704b34c10fc0714a88cea00517ce85dc92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJS1lVYAAoJELp701BxlEWfKNEQAKhV9UmDbN1V5z2eXVbBPxSK -c5YCxnODT43jEJgmneBPU4ueVt0+14Ag4oi5kzNt3Dd4p5htUymR/DyoHpvNsYcJ -83sgpW9pEK3ZwuGWHiOWPSTDvI1NWEeKUK9nCS3YWEMl/FB/F8Mi+DtJbdDC6NxL -Qr4DlbNmSX0abzzhYj4idGeHkzuO4xwB2wH5fX7ui/C3/siYn/IM8PvEsvoWgi/d -42eeQK7DthZv5CZQQCX7G/yhOJOhknijTKXj+IRlrdkG7oKGZ86GyvzECixIEFzF -O7MgqrVgoShAGmhXiYsKc4ppqLv6Own1Oj+oe5b0iKX/SL9thf9mh5MPFqJiliCF -DEquh+lRBgPi3fMDm5vf0d6HHLwCKA3totj1zse4G1u1V8AMekijCNb1GiHH6qXs -4yHw25V5Jr+g/T/8kmbcLpL9+6HxlGEFr8sNYEsRb97zOA36cXcvOBWGGRJ1Z7il -7EuCb+lN5Hp5ME2wUygVHtPwnV0zk4ffN1Z45xWyIanhwrPQEhV4rfKjMGAicOAm -nXigeVL297bLy26RkJvEIHlJoF/dXgUkMC+6aWw1R6oCZiDCDd3SoInaO6uX0cN5 -HU+D1b0UaCAadTdsFNUju5KBxd/Gf2PFAIQpBHBajK1G2m6W08FO/GoqnefLKHja -OyPhBMB5qjuv1k4NQEgJ -=iSli +iQIcBAEBCAAGBQJS16fpAAoJEPiazRVxLXTF4XYP/1AGtcCN4kIck8P7vciVm3DV +yAFO1eWOa92AsjqzlTwQKAvhBFkflu50tLkaAIELv6fB5J87PU2N9fCxiRtGE9Ry +Q311RjF54O9O9nK1nha4AYB8muC71cL1hHHs2YR9X5khxdiNyLK9xaULfooC69ja +lTEbNmhE32WP1mcG2fbAGfhSlMb7Pg/MyBs5KYnWdXsKGO0D7OuMKC/QgPWhOBYU +z90Aqco++lXhvLsq19kiVTcMqkRrcYIA4Fbf6iZE2K3IMOj3MmTl39bHv5j6wDeF +NSNluyWHvV+0KuAD7TVvgTtTzWJf5LWRpkUrTNFZA7Xmjj3F+B5v9r7/drr0zCJL +wx3Djj3DFYjUVTtuot2V/csWvNxJZDDPf6qNGqolvYKr8/qaXfzCwJ+fX32pBqbZ +2XLnznaaEwOVyS3lxzJgVkI0igJRc5Eypu/1DUauuXPQvYsw37QP6nbVahCkDspI +UBl+/XtDKG2/QTgwkC3jNrU2yB8dZm4xoUg8zyRmjh5caFvo4eRXZAMwi6KZzPju +qHiaVaH55YMJFovaHvyfrAB2ApHOS0TWMkGOuyYXTRP7P3IBEHAtSDoJxqWBj+0A +SQDZTcQybdQCeyNE2avc8OzjvToQu4VsOA2bIpiXxJX26MF9Jr7KzjIADHe1DYZT +MEaEFyYuF8n3Jq5Glsc0 +=RSgh -----END PGP SIGNATURE----- diff --git a/sys-process/procps/procps-3.3.8-r1.ebuild b/sys-process/procps/procps-3.3.8-r1.ebuild deleted file mode 100644 index ad8994b7bfda..000000000000 --- a/sys-process/procps/procps-3.3.8-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.8-r1.ebuild,v 1.11 2014/01/15 09:31:03 ago Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="standard informational utilities and process-handling tools" -# http://packages.debian.org/sid/procps -HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps" -# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz" -FEDORA_HASH="aecbeeda2ab308f8d09dddcb4cb9a572" -SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz - https://gitorious.org/${PN}/${PN}/commit/ce5e995921e770bfcda25e42fe090aeccdbf1291.patch -> ${P}-respect_epipe_in_fileutils.patch" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="+ncurses nls static-libs unicode" - -RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )" -DEPEND="${RDEPEND} - ncurses? ( virtual/pkgconfig ) - test? ( dev-util/dejagnu )" - -S=${WORKDIR}/${PN}-ng-${PV} - -src_prepare() { - epatch "${FILESDIR}"/${P}-kill-neg-pid.patch \ - "${DISTDIR}"/${P}-respect_epipe_in_fileutils.patch -} - -src_configure() { - econf \ - --exec-prefix="${EPREFIX}" \ - --docdir='$(datarootdir)'/doc/${PF} \ - $(use_with ncurses) \ - $(use_enable nls) \ - $(use_enable static-libs static) \ - $(use_enable unicode watch8bit) -} - -src_install() { - default -# dodoc sysctl.conf - - # The configure script is completely whacked in the head - mv "${ED}"/lib* "${ED}"/usr/ || die - gen_usr_ldscript -a procps - prune_libtool_files -} diff --git a/sys-process/procps/procps-3.3.8-r2.ebuild b/sys-process/procps/procps-3.3.8-r2.ebuild new file mode 100644 index 000000000000..dda140bd25f8 --- /dev/null +++ b/sys-process/procps/procps-3.3.8-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.8-r2.ebuild,v 1.1 2014/01/16 09:35:36 polynomial-c Exp $ + +EAPI="4" + +inherit eutils toolchain-funcs + +DESCRIPTION="standard informational utilities and process-handling tools" +# http://packages.debian.org/sid/procps +HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps" +# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz" +FEDORA_HASH="aecbeeda2ab308f8d09dddcb4cb9a572" +SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz + https://gitorious.org/procps/procps/commit/ce5e995921e770bfcda25e42fe090aeccdbf1291.patch -> ${PN}-3.3.8-respect_epipe_in_fileutils.patch + https://gitorious.org/procps/procps/commit/e6a78f2745ca6c7ceed4406d3ce5397e77518b11.patch -> ${PN}-3.3.8-top_user_filter.patch" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux" +IUSE="+ncurses nls static-libs unicode" + +RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )" +DEPEND="${RDEPEND} + ncurses? ( virtual/pkgconfig ) + test? ( dev-util/dejagnu )" + +S=${WORKDIR}/${PN}-ng-${PV} + +src_prepare() { + epatch "${FILESDIR}"/${P}-kill-neg-pid.patch \ + "${DISTDIR}"/${P}-respect_epipe_in_fileutils.patch \ + "${DISTDIR}"/${P}-top_user_filter.patch +} + +src_configure() { + econf \ + --exec-prefix="${EPREFIX}" \ + --docdir='$(datarootdir)'/doc/${PF} \ + $(use_with ncurses) \ + $(use_enable nls) \ + $(use_enable static-libs static) \ + $(use_enable unicode watch8bit) +} + +src_install() { + default +# dodoc sysctl.conf + + # The configure script is completely whacked in the head + mv "${ED}"/lib* "${ED}"/usr/ || die + gen_usr_ldscript -a procps + prune_libtool_files +} -- cgit v1.2.3-65-gdbad