From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/utimer/files/, app-misc/utimer/
Date: Mon, 28 Dec 2020 11:50:45 +0000 (UTC) [thread overview]
Message-ID: <1609156211.1f02614a2f744c3bc9073a1cc4984a875747bc96.soap@gentoo> (raw)
commit: 1f02614a2f744c3bc9073a1cc4984a875747bc96
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 11:50:11 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 11:50:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f02614a
app-misc/utimer: Port to EAPI 7
* Thanks to Jeroen Roovers for submitting the fno-common patch
Closes: https://bugs.gentoo.org/717250
Closes: https://bugs.gentoo.org/709300
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-misc/utimer/files/utimer-0.4-fno-common.patch | 29 +++++++++++++++++++++++
app-misc/utimer/files/utimer-0.4-locale.patch | 10 ++++++++
app-misc/utimer/utimer-0.4-r1.ebuild | 24 +++++++++----------
3 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/app-misc/utimer/files/utimer-0.4-fno-common.patch b/app-misc/utimer/files/utimer-0.4-fno-common.patch
new file mode 100644
index 00000000000..a8386fe8e21
--- /dev/null
+++ b/app-misc/utimer/files/utimer-0.4-fno-common.patch
@@ -0,0 +1,29 @@
+--- a/src/utimer.h
++++ b/src/utimer.h
+@@ -66,9 +66,9 @@
+ #define TIMER_PRINT_RATE_MSEC 79
+ #define TIMER_CHECK_RATE_MSEC 500
+
+-GMainLoop *loop;
+-gboolean paused;
+-struct termios savedttystate;
+-Config ut_config;
++extern GMainLoop *loop;
++extern gboolean paused;
++extern struct termios savedttystate;
++extern Config ut_config;
+
+ #endif /* UTIMER_H */
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -36,6 +36,10 @@
+ #include "utils.h"
+ #include "utimer.h"
+
++GMainLoop *loop;
++gboolean paused;
++struct termios savedttystate;
++Config ut_config;
+
+ gulong ul_add (gulong a, gulong b)
+ {
diff --git a/app-misc/utimer/files/utimer-0.4-locale.patch b/app-misc/utimer/files/utimer-0.4-locale.patch
new file mode 100644
index 00000000000..68acdd471a3
--- /dev/null
+++ b/app-misc/utimer/files/utimer-0.4-locale.patch
@@ -0,0 +1,10 @@
+--- a/src/utimer.h
++++ b/src/utimer.h
+@@ -35,6 +35,7 @@
+ #include <stdlib.h>
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
++#include <locale.h>
+
+ #include "utils.h"
+ #include "timer.h"
diff --git a/app-misc/utimer/utimer-0.4-r1.ebuild b/app-misc/utimer/utimer-0.4-r1.ebuild
index bf5c8f9fd36..d3055fbb083 100644
--- a/app-misc/utimer/utimer-0.4-r1.ebuild
+++ b/app-misc/utimer/utimer-0.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="A command line timer and stopwatch"
HOMEPAGE="http://utimer.codealpha.net/utimer"
@@ -12,21 +12,19 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="debug nls"
-DEPEND="
+RDEPEND="
dev-libs/glib:2
dev-util/intltool"
+DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}"
-
+PATCHES=(
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-locale.patch
+)
DOCS=( AUTHORS ChangeLog NEWS README )
src_configure() {
- local myconf=( --enable-debug=no )
- use debug || myconf=( --enable-debug=yes )
- econf "${myconf[@]}" $(use_enable nls)
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- einstalldocs
+ econf \
+ $(use_enable debug) \
+ $(use_enable nls)
}
reply other threads:[~2020-12-28 11:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1609156211.1f02614a2f744c3bc9073a1cc4984a875747bc96.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox