[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/
commit: 7cf1448c7deb05644662b05046b84733b539487f Author: Jan Psota gmail com> AuthorDate: Wed Aug 1 15:47:57 2018 + Commit: Jan Psota gmail com> CommitDate: Wed Aug 1 15:47:57 2018 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=7cf1448c portage-utils-0.73 app-portage/portage-utils/Manifest | 2 +- .../{portage-utils-0.72-r1.ebuild => portage-utils-0.73-r1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index c3fb659..d546cec 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.72.tar.xz 1585068 BLAKE2B 33aae0b59cd6f6b7a5503f0282d009c6516f00d14228461359e5124fa104b2ce89019ae5113bac2ed2c975c891d9d5371632ad3dd66572bd6e3ce890895e9ba7 SHA512 9248a1f0d7103f5a26cc01bb8abc5890a0b02b746e06312cd25f0223faa0b59ba7cc0708f272ce327c956086f9a4fcc994bf30b948131da0e63164bba35cf1f2 +DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105 diff --git a/app-portage/portage-utils/portage-utils-0.72-r1.ebuild b/app-portage/portage-utils/portage-utils-0.73-r1.ebuild similarity index 100% rename from app-portage/portage-utils/portage-utils-0.72-r1.ebuild rename to app-portage/portage-utils/portage-utils-0.73-r1.ebuild
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/
commit: 21b9789758ca9a5c0f66a8ce666c6e97e646b046 Author: Jan Psota gmail com> AuthorDate: Mon Jul 16 00:38:06 2018 + Commit: Jan Psota gmail com> CommitDate: Mon Jul 16 00:38:06 2018 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=21b97897 app-portage/portage-utils-0.72-r1 app-portage/portage-utils/Manifest | 2 +- .../{portage-utils-0.71-r1.ebuild => portage-utils-0.72-r1.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index a6b8d26..c3fb659 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.71.tar.xz 555156 BLAKE2B 504973b242f54824ae1f4b135dc1e1021ed0ca6a59d04ef39161255dbebdb7f8870455954ba02987c04c50f6963e7f6c460c4440b2c5ce456b9c489296979e48 SHA512 b9bf4156a1060fec56f9b6348d2d8e83b507a8bff2c507e07bc1c84075082b184d270ca0f89e0f4abf738ce9e8cb8b1f45a211d2dc52cadbdb0ee5d658bf678f +DIST portage-utils-0.72.tar.xz 1585068 BLAKE2B 33aae0b59cd6f6b7a5503f0282d009c6516f00d14228461359e5124fa104b2ce89019ae5113bac2ed2c975c891d9d5371632ad3dd66572bd6e3ce890895e9ba7 SHA512 9248a1f0d7103f5a26cc01bb8abc5890a0b02b746e06312cd25f0223faa0b59ba7cc0708f272ce327c956086f9a4fcc994bf30b948131da0e63164bba35cf1f2 diff --git a/app-portage/portage-utils/portage-utils-0.71-r1.ebuild b/app-portage/portage-utils/portage-utils-0.72-r1.ebuild similarity index 94% rename from app-portage/portage-utils/portage-utils-0.71-r1.ebuild rename to app-portage/portage-utils/portage-utils-0.72-r1.ebuild index 2797439..c88bc50 100644 --- a/app-portage/portage-utils/portage-utils-0.71-r1.ebuild +++ b/app-portage/portage-utils/portage-utils-0.72-r1.ebuild @@ -5,7 +5,7 @@ EAPI="6" inherit toolchain-funcs eutils -DESCRIPTION="small and fast portage helper tools written in C" +DESCRIPTION="Small and fast Portage helper tools written in C" HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils; SRC_URI="mirror://gentoo/${P}.tar.xz https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz;
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/
commit: c241f8e961e2addcdf02301514ca73bbddfa1c70 Author: Jan Psota gmail com> AuthorDate: Fri May 18 18:57:24 2018 + Commit: Jan Psota gmail com> CommitDate: Fri May 18 18:57:24 2018 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=c241f8e9 app-portage/portage-utils/Manifest update to 0.71 app-portage/portage-utils/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 11158db..a6b8d26 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.70.tar.xz 551192 BLAKE2B ca15637ee6532eebd3a064559bb933aad3042c19994e5dcb8234249312dac139288e4ed38f9c2b46ce1921d97398485bb7276ccf285b2f97df3889a2c91f4d9f SHA512 de3d0813a2e71ca93722828b9b8ee8211e7d5383b81a8ae343624e98618522c0d56945422ae6fadbe0694c4b0f381aa0047eb28bfa7e63e0d95c468e3e2934ab +DIST portage-utils-0.71.tar.xz 555156 BLAKE2B 504973b242f54824ae1f4b135dc1e1021ed0ca6a59d04ef39161255dbebdb7f8870455954ba02987c04c50f6963e7f6c460c4440b2c5ce456b9c489296979e48 SHA512 b9bf4156a1060fec56f9b6348d2d8e83b507a8bff2c507e07bc1c84075082b184d270ca0f89e0f4abf738ce9e8cb8b1f45a211d2dc52cadbdb0ee5d658bf678f
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/
commit: b82b99ed1edfa5bba9a9a2425d95cb0c88e7ebf5 Author: Jan Psota gmail com> AuthorDate: Fri May 18 18:06:17 2018 + Commit: Jan Psota gmail com> CommitDate: Fri May 18 18:06:17 2018 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=b82b99ed app-portage/portage-utils-0.71-r1 +qtail,qportage .../{portage-utils-0.70-r1.ebuild => portage-utils-0.71-r1.ebuild}| 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app-portage/portage-utils/portage-utils-0.70-r1.ebuild b/app-portage/portage-utils/portage-utils-0.71-r1.ebuild similarity index 100% rename from app-portage/portage-utils/portage-utils-0.70-r1.ebuild rename to app-portage/portage-utils/portage-utils-0.71-r1.ebuild
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/, media-gfx/openscad/files/, media-gfx/openscad/, ...
commit: 708803cd29b48e6fcfb05969c56bb12e9aad2016 Author: Jan Psota gmail com> AuthorDate: Fri Apr 6 15:04:28 2018 + Commit: Jan Psota gmail com> CommitDate: Fri Apr 6 15:04:28 2018 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=708803cd newer app-portage/portage-utils-0.70, cleanup media-gfx/openscad and app-i18n/poedit app-i18n/poedit/Manifest | 1 - app-i18n/poedit/metadata.xml | 12 app-i18n/poedit/poedit-2.0.4.ebuild| 63 -- app-portage/portage-utils/Manifest | 2 +- ...0.65-r1.ebuild => portage-utils-0.70-r1.ebuild} | 4 +- media-gfx/opencsg/Manifest | 1 - media-gfx/opencsg/opencsg-1.4.2.ebuild | 41 media-gfx/openscad/files/50openscad-gentoo.el | 3 - media-gfx/openscad/metadata.xml| 11 media-gfx/openscad/openscad-.ebuild| 77 -- metadata/layout.conf | 1 + 11 files changed, 4 insertions(+), 212 deletions(-) diff --git a/app-i18n/poedit/Manifest b/app-i18n/poedit/Manifest deleted file mode 100644 index 3b3bae2..000 --- a/app-i18n/poedit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST poedit-2.0.4.tar.gz 2495814 SHA256 3887ab76dfa4607f77be00073277a8c5f060006a014b97d8fe05ebd99aadc61d SHA512 18133cd9f19ced71e3184a58123111478f6597aecda189b1dc647f67313fb140b109b4da91c83e03ca6c8fb93712627dbeb74ea2aa16ce7b340ef30474eeffa2 WHIRLPOOL 978e996eb84dc3fe9ec2294bb40ea0870b365697f60017bb55f02d17385e8284409ef2852b92c2ecf4cebbc7b746492381842c9c3a21a3ead57d442c68f473e5 diff --git a/app-i18n/poedit/metadata.xml b/app-i18n/poedit/metadata.xml deleted file mode 100644 index ce23bed..000 --- a/app-i18n/poedit/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd;> - - - wxwidg...@gentoo.org - Gentoo wxWidgets Project - - - vslavik/poedit - poedit - - diff --git a/app-i18n/poedit/poedit-2.0.4.ebuild b/app-i18n/poedit/poedit-2.0.4.ebuild deleted file mode 100644 index 1fe152b..000 --- a/app-i18n/poedit/poedit-2.0.4.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WX_GTK_VER=3.0-gtk3 - -PLOCALES="an ar az be be@latin bg bs ca ckb co cs da de el en_GB es et eu fa fi fr ga gl he hr hu hy id is it ja ka kab kk ko lt lv ms nb nl oc pa pl pt_BR pt_PT ro ru sk sl sq sr sv tg th tr uk uz vi zh_CN zh_TW" - -inherit fdo-mime l10n wxwidgets - -DESCRIPTION="GUI editor for gettext translations files" -HOMEPAGE="https://poedit.net; -SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}-oss/${P}.tar.gz; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" -IUSE="" - -# db/expat req for legacytm (backwards support for pre 1.6) -# we currently have 1.5.5 in stable so this is enabled -RDEPEND=" - app-text/gtkspell:3 - dev-cpp/lucene++ - dev-libs/boost:=[nls] - dev-libs/expat - dev-libs/icu:= - sys-libs/db[cxx] - x11-libs/gtk+:3 - x11-libs/wxGTK:${WX_GTK_VER}[X] - " - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - my_rm_loc() { - sed -i -e "/^POEDIT_LINGUAS = /s: ${1}::" locales/Makefile.in || die - rm "locales/${1}.mo" || die - } - l10n_find_plocales_changes 'locales' '' '.mo' - l10n_for_each_disabled_locale_do my_rm_loc - - setup-wxwidgets - default -} - -src_configure() { - econf --without-cpprest --without-cld2 -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS README -} - -pkg_postinst() { - fdo-mime_desktop_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 793fa7c..11158db 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.65.tar.xz 542804 SHA256 ad8ae8b78efad421489bc203a6ac610e0d6f45db46281a5a21d4d5f8e1228928 SHA512 a76be4d86b07ba39fa577efe477973f888062094d6f3a98b873e10998e10e3d0d08137444e11d14489ff8f465d984e8929b5ee91c26944bad7a245683ee4d056 WHIRLPOOL de7f8ffc332350f46a17613871405816d6ff618d429f536612479059b785df278d8786e7576651ff8dc61b5bdd7f153b7e64b20c76eb62cdb8e3bea316e5139f +DIST portage-utils-0.70.tar.xz 551192 BLAKE2B ca15637ee6532eebd3a064559bb933aad3042c19994e5dcb8234249312dac139288e4ed38f9c2b46ce1921d97398485bb7276ccf285b2f97df3889a2c91f4d9f SHA512 de3d0813a2e71ca93722828b9b8ee8211e7d5383b81a8ae343624e98618522c0d56945422ae6fadbe0694c4b0f381aa0047eb28bfa7e63e0d95c468e3e2934ab diff --git a/app-portage/portage-utils/portage-utils-0.65-r1.ebuild
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/, app-portage/portage-utils/files/
commit: 2abf9c992c0836f5f4ac197f811184f0db77b87a Author: Jan Psota gmail com> AuthorDate: Fri Dec 29 23:10:31 2017 + Commit: Jan Psota gmail com> CommitDate: Fri Dec 29 23:10:31 2017 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=2abf9c99 app-portage/portage-utils-0.65-r1 +qportage,qtail app-portage/portage-utils/Manifest| 2 +- app-portage/portage-utils/files/qlop-stdin.patch | 8 ...tage-utils-0.64-r1.ebuild => portage-utils-0.65-r1.ebuild} | 11 +-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 5fb52e9..793fa7c 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e +DIST portage-utils-0.65.tar.xz 542804 SHA256 ad8ae8b78efad421489bc203a6ac610e0d6f45db46281a5a21d4d5f8e1228928 SHA512 a76be4d86b07ba39fa577efe477973f888062094d6f3a98b873e10998e10e3d0d08137444e11d14489ff8f465d984e8929b5ee91c26944bad7a245683ee4d056 WHIRLPOOL de7f8ffc332350f46a17613871405816d6ff618d429f536612479059b785df278d8786e7576651ff8dc61b5bdd7f153b7e64b20c76eb62cdb8e3bea316e5139f diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch index 8e5009f..5eb4dcd 100644 --- a/app-portage/portage-utils/files/qlop-stdin.patch +++ b/app-portage/portage-utils/files/qlop-stdin.patch @@ -28,7 +28,7 @@ diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c #define QLOP_UNLIST 0x02 + -+_q_static FILE * ++static FILE * +qfopen(const char *logfile) +{ + FILE *fp; @@ -42,7 +42,7 @@ diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c + } +} + -+_q_static void ++static void +qfclose(FILE *fp) +{ + if (fp != stdin) @@ -51,7 +51,7 @@ diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c + exit(EXIT_SUCCESS); +} + - _q_static void + static void print_seconds_for_earthlings(const unsigned long t) { @@ -98,10 +122,7 @@ show_merge_times(char *package, const ch @@ -116,4 +116,4 @@ diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c + qfclose(fp); } - _q_static void show_current_emerge(void); + static void show_current_emerge(void); diff --git a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild b/app-portage/portage-utils/portage-utils-0.65-r1.ebuild similarity index 69% rename from app-portage/portage-utils/portage-utils-0.64-r1.ebuild rename to app-portage/portage-utils/portage-utils-0.65-r1.ebuild index a65aef2..7705a85 100644 --- a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild +++ b/app-portage/portage-utils/portage-utils-0.65-r1.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" +EAPI="6" inherit toolchain-funcs eutils DESCRIPTION="small and fast portage helper tools written in C" HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils; SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz; + https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls static" RDEPEND="dev-libs/iniparser:0" @@ -23,7 +22,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}/qlop-stdin.patch" - epatch_user + default } src_configure() {
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/files/, app-portage/portage-utils/
commit: 4817da2f35a3d4e852a411fa56408458075378df Author: Jan Psota gmail com> AuthorDate: Tue Mar 29 00:51:06 2016 + Commit: Jan Psota gmail com> CommitDate: Tue Mar 29 00:51:06 2016 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=4817da2f app-portage/portage-utils-0.63-r1 + qtail, qportage app-portage/portage-utils/Manifest | 2 +- app-portage/portage-utils/files/qlop-stdin.patch | 36 +++--- ...0.62-r1.ebuild => portage-utils-0.63-r1.ebuild} | 31 --- 3 files changed, 19 insertions(+), 50 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 5a693ba..234c259 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891 +DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b9565866674303152b55248b05130a02 SHA512 2b0bceee63b894e7f517f3c938a1873aa90c41b668abbf6a39125a1bb9ce1059731e34216cc357787b5cbf83a0cf0748530147262673ea0bc26404d6274714eb WHIRLPOOL fdaec19af639c744394063dd57f7e64fb02ff10c4ee5b1ef2f49928df6d47fb5bf732e547264390787e20ca6e3251be3935e9f348f2510aa0fc6779778ca44ba diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch index 568fa6d..8e5009f 100644 --- a/app-portage/portage-utils/files/qlop-stdin.patch +++ b/app-portage/portage-utils/files/qlop-stdin.patch @@ -1,7 +1,7 @@ -diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c portage-utils-0.62.orig/main.c 2016-02-22 19:31:41.0 +0100 -+++ portage-utils-0.62/main.c 2016-02-23 23:31:36.432002795 +0100 -@@ -1402,7 +1402,8 @@ int main(int argc, char **argv) +diff -pruN portage-utils-0.63.orig/main.c portage-utils-0.63/main.c +--- portage-utils-0.63.orig/main.c 2016-03-28 05:53:50.0 +0200 portage-utils-0.63/main.c 2016-03-29 02:40:11.935979233 +0200 +@@ -1422,7 +1422,8 @@ int main(int argc, char **argv) if (fstat(fileno(stdout), ) != -1) if (!isatty(fileno(stdout))) @@ -11,19 +11,19 @@ diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c if ((getenv("TERM") == NULL) || (strcmp(getenv("TERM"), "dumb") == 0)) no_colors(); -diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c portage-utils-0.62.orig/qlop.c 2016-02-22 19:31:41.0 +0100 -+++ portage-utils-0.62/qlop.c 2016-02-23 23:39:17.758530846 +0100 -@@ -48,7 +48,7 @@ static const char * const qlop_opts_help - "Show unmerge history", +diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c +--- portage-utils-0.63.orig/qlop.c 2016-03-28 05:53:50.0 +0200 portage-utils-0.63/qlop.c 2016-03-29 02:42:29.418960636 +0200 +@@ -32,7 +32,7 @@ static const char * const qlop_opts_help "Show sync history", "Show current emerging packages", + "Limit selection to this time (1st -d is start, 2nd -d is end)", - "Read emerge logfile instead of $EMERGE_LOG_DIR/" QLOP_DEFAULT_LOGFILE, -+ "Read emerge logfile instead of " QLOP_DEFAULT_LOGFILE "\n\t\t\t (use \"-\" for stdin)", ++ "Read emerge logfile instead of $EMERGE_LOG_DIR/" QLOP_DEFAULT_LOGFILE "\n\t\t\t (use \"-\" for stdin)", COMMON_OPTS_HELP }; - #define qlop_usage(ret) usage(ret, QLOP_FLAGS, qlop_long_opts, qlop_opts_help, lookup_applet_idx("qlop")) -@@ -56,6 +56,30 @@ static const char * const qlop_opts_help + static const char qlop_desc[] = +@@ -47,6 +47,30 @@ static const char qlop_desc[] = #define QLOP_LIST0x01 #define QLOP_UNLIST 0x02 @@ -54,7 +54,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c _q_static void print_seconds_for_earthlings(const unsigned long t) { -@@ -107,10 +131,7 @@ show_merge_times(char *package, const ch +@@ -98,10 +122,7 @@ show_merge_times(char *package, const ch pkg = package; } @@ -66,7 +66,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c while (fgets(buf[0], sizeof(buf[0]), fp) != NULL) { if (strstr(buf[0], pkg) == NULL) -@@ -218,7 +239,7 @@ show_merge_times(char *package, const ch +@@ -211,7 +232,7 @@ show_merge_times(char *package, const ch atom_implode(atom); } } @@ -75,7 +75,7 @@ diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c if (count == 0) return 0; if (average == 1) { -@@ -246,10 +267,7 @@
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/files/, app-portage/portage-utils/
commit: 599e5bb2ce34bba27d5897bc748f62ba50fc7295 Author: Jan Psota gmail com> AuthorDate: Tue Feb 23 23:48:39 2016 + Commit: Jan Psota gmail com> CommitDate: Tue Feb 23 23:48:39 2016 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=599e5bb2 app-portage/portage-utils-0.62-r1 +updated qtail and qportage app-portage/portage-utils/Manifest | 2 +- app-portage/portage-utils/files/qlop-stdin.patch | 41 +- app-portage/portage-utils/files/qportage | 9 ++--- app-portage/portage-utils/files/qtail | 6 ++-- ...0.60-r1.ebuild => portage-utils-0.62-r1.ebuild} | 4 +-- 5 files changed, 28 insertions(+), 34 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 66e194e..5a693ba 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d +DIST portage-utils-0.62.tar.xz 527216 SHA256 f6ce1938e41ec2073be12568470a7aae51489579add0709c08af5d9be1c0c563 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1 WHIRLPOOL 105d60d3f778a79972e39d2d8e78aa8b971f085721362e4d594d86006752d97b25d41a1e5a9006f603cda0088da89abb179d8bc129815c1363f30dfb6ff59891 diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch index f592dd0..568fa6d 100644 --- a/app-portage/portage-utils/files/qlop-stdin.patch +++ b/app-portage/portage-utils/files/qlop-stdin.patch @@ -1,7 +1,7 @@ -diff -pruN portage-utils-0.60.orig/main.c portage-utils-0.60/main.c portage-utils-0.60.orig/main.c 2015-11-28 00:27:34.0 +0100 -+++ portage-utils-0.60/main.c 2015-11-29 09:55:13.148892366 +0100 -@@ -1395,7 +1395,8 @@ int main(int argc, char **argv) +diff -pruN portage-utils-0.62.orig/main.c portage-utils-0.62/main.c +--- portage-utils-0.62.orig/main.c 2016-02-22 19:31:41.0 +0100 portage-utils-0.62/main.c 2016-02-23 23:31:36.432002795 +0100 +@@ -1402,7 +1402,8 @@ int main(int argc, char **argv) if (fstat(fileno(stdout), ) != -1) if (!isatty(fileno(stdout))) @@ -11,9 +11,9 @@ diff -pruN portage-utils-0.60.orig/main.c portage-utils-0.60/main.c if ((getenv("TERM") == NULL) || (strcmp(getenv("TERM"), "dumb") == 0)) no_colors(); -diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c portage-utils-0.60.orig/qlop.c 2015-11-28 00:27:34.0 +0100 -+++ portage-utils-0.60/qlop.c 2015-11-29 10:05:46.456183417 +0100 +diff -pruN portage-utils-0.62.orig/qlop.c portage-utils-0.62/qlop.c +--- portage-utils-0.62.orig/qlop.c 2016-02-22 19:31:41.0 +0100 portage-utils-0.62/qlop.c 2016-02-23 23:39:17.758530846 +0100 @@ -48,7 +48,7 @@ static const char * const qlop_opts_help "Show unmerge history", "Show sync history", @@ -54,9 +54,9 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c _q_static void print_seconds_for_earthlings(const unsigned long t) { -@@ -109,10 +133,7 @@ show_merge_times(char *package, const ch - - DBG("Searching for %s in %s\n", pkg, logfile); +@@ -107,10 +131,7 @@ show_merge_times(char *package, const ch + pkg = package; + } - if ((fp = fopen(logfile, "r")) == NULL) { - warnp("Could not open logfile '%s'", logfile); @@ -66,25 +66,18 @@ diff -pruN portage-utils-0.60.orig/qlop.c portage-utils-0.60/qlop.c while (fgets(buf[0], sizeof(buf[0]), fp) != NULL) { if (strstr(buf[0], pkg) == NULL) -@@ -220,7 +241,6 @@ show_merge_times(char *package, const ch +@@ -218,7 +239,7 @@ show_merge_times(char *package, const ch atom_implode(atom); } } - fclose(fp); ++ qfclose(fp); if (count == 0) return 0; if (average == 1) { -@@ -233,6 +253,7 @@ show_merge_times(char *package, const ch - } else { - printf("%s%s%s: %s%lu%s times\n", BLUE, pkg, NORM, GREEN, count, NORM); - } -+ qfclose(fp); - return 0; - } - -@@ -246,10 +267,7 @@ show_emerge_history(char listflag, int a - int i; +@@ -246,10 +267,7 @@ show_emerge_history(int listflag, array_ time_t t; + depend_atom *atom, *logatom; - if ((fp = fopen(logfile, "r")) == NULL) { - warnp("Could not open logfile '%s'", logfile); @@ -94,7 +87,7 @@ diff -pruN portage-utils-0.60.orig/qlop.c
[gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/, app-portage/portage-utils/files/
commit: 29d1a265b9384f71d57c1baf9b90154c77ed9888 Author: layman localhost> AuthorDate: Sun Nov 29 09:26:40 2015 + Commit: Jan Psota gmail com> CommitDate: Sun Nov 29 09:26:40 2015 + URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=29d1a265 portage-utils/portage-utils-0.60 with qtail and qportage app-portage/portage-utils/Manifest | 2 +- .../files/portage-utils-0.56-qcheck-tz.patch | 31 - .../files/portage-utils-0.56-qlop-tz.patch | 39 -- app-portage/portage-utils/files/qlop-stdin.patch | 27 +++ ...0.56-r1.ebuild => portage-utils-0.60-r1.ebuild} | 2 -- 5 files changed, 21 insertions(+), 80 deletions(-) diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest index 016789a..66e194e 100644 --- a/app-portage/portage-utils/Manifest +++ b/app-portage/portage-utils/Manifest @@ -1 +1 @@ -DIST portage-utils-0.56.tar.xz 513832 SHA256 4df7323fb2667dd9bcee0f2d169c01ed8600aa6196118e6cd3a10cfe99852bbf SHA512 f2136a7df4cd91499b135fbf000f81a71177d5a39b4da2db484ab0f9492d152eaa72a5fee0e56d4b58611462e251905e554f5e41890a749f05d19e50c16c77b6 WHIRLPOOL af0a96ca3bf2dd39335317829aa8aff110a63042c415368400977e974cc21163da7eb76f7d53fcd05e133fd8a8568255ba022a32f1b174bda0dcb15b5f1476b9 +DIST portage-utils-0.60.tar.xz 519424 SHA256 d5e4a7384321d21d0aa484fcd30768dbce557e9c97a98cd2723d3eb75b82f503 SHA512 80355b31d49ac0f47c0a05071584608bd5fc0b8a98ab9025cb0a3bc8c18e318fbc60ff33e6834cd4f0ad159c2eb7f63d0d9cb61d4c86cee473215670ebba5694 WHIRLPOOL ec6d2bc1b164a7baff83019455de91483a98401f052153e152cef3733d041e71ca2f4333c9281aa593ee962d0e42b2d4f72f0d04e13982cbb25518f3bd5ca66d diff --git a/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch b/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch deleted file mode 100644 index 5b493b6..000 --- a/app-portage/portage-utils/files/portage-utils-0.56-qcheck-tz.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 359fe5097ca531291a2cbb878dc6940351a7a358 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger-Date: Thu, 11 Jun 2015 09:51:22 + -Subject: [PATCH] tests: qcheck: fix timezone handling - -Make sure the stamps are pinned to UTC rather than using the active TZ. - -URL: https://bugs.gentoo.org/551718 -Reported-by: Jeroen Roovers - tests/qcheck/dotest | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/qcheck/dotest b/tests/qcheck/dotest -index 965a5b5..9122321 100755 a/tests/qcheck/dotest -+++ b/tests/qcheck/dotest -@@ -10,8 +10,8 @@ export Q_VDB=/ - # This is the "valid" mtime the test packages have hardcoded in the CONTENTS - # files. The stamp is the CONTENTS while the touch date is the corresponding - # unpacked date. --STAMP=1398954900 DATE=201405011035 --find "${ROOT}" -exec touch -h -t "${DATE}" {} + -+STAMP=1398954900 DATE='2014-05-01T14:35:00Z' -+find "${ROOT}" -exec touch -h -d "${DATE}" {} + - - mktmpdir - --- -2.4.1 - diff --git a/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch b/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch deleted file mode 100644 index d812daa..000 --- a/app-portage/portage-utils/files/portage-utils-0.56-qlop-tz.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 286688cb68c9989f697203ca779b08fad23366db Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 12 Jun 2015 05:05:41 -0400 -Subject: [PATCH] tests: force TZ to UTC for everyone - -This should make test outputs more stable across systems. - -URL: https://bugs.gentoo.org/551806 -Reported-by: Nikoli - tests/init.sh | 2 ++ - tests/qlop/list01.good | 4 ++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/init.sh b/tests/init.sh -index b3f634e..11fd379 100644 a/tests/init.sh -+++ b/tests/init.sh -@@ -33,6 +33,8 @@ setup_env - unset ROOT PORTAGE_CONFIGROOT PORTAGE_QUIET - # but make sure we don't implicitly rely on user's setup - export PORTAGE_CONFIGROOT="${ab}/not/a/real/path" -+# Always use UTC for timestamps to keep tests stable. #551806 -+export TZ='UTC 0' - - q -i -q - -diff --git a/tests/qlop/list01.good b/tests/qlop/list01.good -index 458c751..fc8683c 100644 a/tests/qlop/list01.good -+++ b/tests/qlop/list01.good -@@ -1,2 +1,2 @@ --Thu Jan 27 00:42:17 2005 >>> rsync://192.168.0.5/gentoo-portage --Sat May 16 04:21:00 2015 >>> gentoo -+Thu Jan 27 05:42:17 2005 >>> rsync://192.168.0.5/gentoo-portage -+Sat May 16 08:21:00 2015 >>> gentoo --- -2.4.1 - diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch index d5084b2..f592dd0 100644 --- a/app-portage/portage-utils/files/qlop-stdin.patch +++ b/app-portage/portage-utils/files/qlop-stdin.patch @@ -1,6 +1,19 @@ -diff -pruN portage-utils-0.55.orig/qlop.c portage-utils-0.55/qlop.c