Gentoo Archives: gentoo-commits

From: Jan Psota <jasiupsota@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/bleeding-edge:master commit in: app-portage/portage-utils/, app-portage/portage-utils/files/
Date: Fri, 29 Dec 2017 23:11:59
Message-Id: 1514589031.2abf9c992c0836f5f4ac197f811184f0db77b87a.jasiupsota@gentoo
1 commit: 2abf9c992c0836f5f4ac197f811184f0db77b87a
2 Author: Jan Psota <jasiupsota <AT> gmail <DOT> com>
3 AuthorDate: Fri Dec 29 23:10:31 2017 +0000
4 Commit: Jan Psota <jasiupsota <AT> gmail <DOT> com>
5 CommitDate: Fri Dec 29 23:10:31 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=2abf9c99
7
8 app-portage/portage-utils-0.65-r1 +qportage,qtail
9
10 app-portage/portage-utils/Manifest | 2 +-
11 app-portage/portage-utils/files/qlop-stdin.patch | 8 ++++----
12 ...tage-utils-0.64-r1.ebuild => portage-utils-0.65-r1.ebuild} | 11 +++++------
13 3 files changed, 10 insertions(+), 11 deletions(-)
14
15 diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
16 index 5fb52e9..793fa7c 100644
17 --- a/app-portage/portage-utils/Manifest
18 +++ b/app-portage/portage-utils/Manifest
19 @@ -1 +1 @@
20 -DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e
21 +DIST portage-utils-0.65.tar.xz 542804 SHA256 ad8ae8b78efad421489bc203a6ac610e0d6f45db46281a5a21d4d5f8e1228928 SHA512 a76be4d86b07ba39fa577efe477973f888062094d6f3a98b873e10998e10e3d0d08137444e11d14489ff8f465d984e8929b5ee91c26944bad7a245683ee4d056 WHIRLPOOL de7f8ffc332350f46a17613871405816d6ff618d429f536612479059b785df278d8786e7576651ff8dc61b5bdd7f153b7e64b20c76eb62cdb8e3bea316e5139f
22
23 diff --git a/app-portage/portage-utils/files/qlop-stdin.patch b/app-portage/portage-utils/files/qlop-stdin.patch
24 index 8e5009f..5eb4dcd 100644
25 --- a/app-portage/portage-utils/files/qlop-stdin.patch
26 +++ b/app-portage/portage-utils/files/qlop-stdin.patch
27 @@ -28,7 +28,7 @@ diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c
28 #define QLOP_UNLIST 0x02
29
30 +
31 -+_q_static FILE *
32 ++static FILE *
33 +qfopen(const char *logfile)
34 +{
35 + FILE *fp;
36 @@ -42,7 +42,7 @@ diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c
37 + }
38 +}
39 +
40 -+_q_static void
41 ++static void
42 +qfclose(FILE *fp)
43 +{
44 + if (fp != stdin)
45 @@ -51,7 +51,7 @@ diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c
46 + exit(EXIT_SUCCESS);
47 +}
48 +
49 - _q_static void
50 + static void
51 print_seconds_for_earthlings(const unsigned long t)
52 {
53 @@ -98,10 +122,7 @@ show_merge_times(char *package, const ch
54 @@ -116,4 +116,4 @@ diff -pruN portage-utils-0.63.orig/qlop.c portage-utils-0.63/qlop.c
55 + qfclose(fp);
56 }
57
58 - _q_static void show_current_emerge(void);
59 + static void show_current_emerge(void);
60
61 diff --git a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild b/app-portage/portage-utils/portage-utils-0.65-r1.ebuild
62 similarity index 69%
63 rename from app-portage/portage-utils/portage-utils-0.64-r1.ebuild
64 rename to app-portage/portage-utils/portage-utils-0.65-r1.ebuild
65 index a65aef2..7705a85 100644
66 --- a/app-portage/portage-utils/portage-utils-0.64-r1.ebuild
67 +++ b/app-portage/portage-utils/portage-utils-0.65-r1.ebuild
68 @@ -1,19 +1,18 @@
69 -# Copyright 1999-2016 Gentoo Foundation
70 +# Copyright 1999-2017 Gentoo Foundation
71 # Distributed under the terms of the GNU General Public License v2
72 -# $Id$
73
74 -EAPI="5"
75 +EAPI="6"
76
77 inherit toolchain-funcs eutils
78
79 DESCRIPTION="small and fast portage helper tools written in C"
80 HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
81 SRC_URI="mirror://gentoo/${P}.tar.xz
82 - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
83 + https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
84
85 LICENSE="GPL-2"
86 SLOT="0"
87 -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"
88 +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"
89 IUSE="nls static"
90
91 RDEPEND="dev-libs/iniparser:0"
92 @@ -23,7 +22,7 @@ DEPEND="${RDEPEND}
93
94 src_prepare() {
95 epatch "${FILESDIR}/qlop-stdin.patch"
96 - epatch_user
97 + default
98 }
99
100 src_configure() {