commit: 2abf9c992c0836f5f4ac197f811184f0db77b87a
Author: Jan Psota <jasiupsota <AT> gmail <DOT> com>
AuthorDate: Fri Dec 29 23:10:31 2017 +0000
Commit: Jan Psota <jasiupsota <AT> gmail <DOT> com>
CommitDate: Fri Dec 29 23:10:31 2017 +0000
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() {
