gentoo new year resync : 01.01.2021

4 files changed, 53 insertions, 14 deletions

diff --git a/app-misc/utimer/Manifest b/app-misc/utimer/Manifest
index 21464f189e2c..43d61ca8298c 100644
--- a/app-misc/utimer/Manifest
+++ b/app-misc/utimer/Manifest
@@ -1,3 +1,5 @@
+AUX utimer-0.4-fno-common.patch 672 BLAKE2B 2a325b112f2be43780e5e60a134c305859055b5e1c0af11e4d2ebc856d97fb550835f99ea67ca118022a52ecee65ca190c567cf0bd8faf719c0e319007b71a1b SHA512 a52e79c326022d893692d6b79b5240a758186172608373c099d18a60b65d3d50343071c6936647c8be58c7959a959704aeee08e87cc5da8708b0735640a18374
+AUX utimer-0.4-locale.patch 188 BLAKE2B 57e8f72c6541e1b161186ee4043c4685bb9593cd257bac5c11d7b80beeac627e434c60ee434036af5154636af7fbcb763a1d7d20da5e0226f193d488372b8845 SHA512 8c5d8c614def996e147dc89acad2e5a844413a5e16845bf76dd44761a3a2ac510b148eb72db0ab2e34d4d4d7097c60f3dc245b0ac4f99cf22eb700791d4f69bd
 DIST utimer-0.4.tar.gz 144408 BLAKE2B c23178e8501034c491d5350ef5d6ec4c251dac982f453f0b99cf6b4aeca81132acaa6abd40981ae9f8054f00c27c8f05404d0e2cd806cafc130f0a8d3c23f814 SHA512 f1a375de4b4b5b0f478e208e055badb12a49524137cbd9626238bc5fc35cf3576e7a7c66759dd00a061d12dc7a0ad3ee6974abc8213f5f6f8e22c50eb2901032
-EBUILD utimer-0.4-r1.ebuild 665 BLAKE2B 6e2bfbf7a9d0f1aab60a8d5b69d1ea3727729a8b26c8e36f951da2315c86f890db1d3318f8369d1fd7b270c5911985da1c4acf24769025b83c6ba67701c1f786 SHA512 3a03b5be2a019b9319e16f903da9bafccb920a4d9cf8ad4a7ca9396d79adbba9fee1801c0abfcaf11389c8bb17b9d2e6500bd652c98e15e6c680b4d9529e3a23
+EBUILD utimer-0.4-r1.ebuild 613 BLAKE2B cd8164d4e0d22b5317fa0eaca07d2f330a4bba770bf7819c50d5916a8410e6352f763cf180c7f7b14fc13cee0c2a4815b9c14bb511372b1468649cba945e22a4 SHA512 9ba26c95372b88ffd991f11c829f0915a290cbb4f2b83f0dbb62eb0741a94325188d4bafb2c6cea77b149a70d2be365bf2ec7a851124a977eb681b5134f57072
 MISC metadata.xml 349 BLAKE2B 7c7669d3a1a33cea3684b7fe7d3cac9f45cb0c93c71a28314084c1b6a418774003afadfd7b8f204db91509c188fb46d6a43271ffc745d3bb933221cd4bf519c9 SHA512 36bc7a82cebaf4a6915d78a65a3d69f845b139a699bc9a6b1d0137749bd0e210d6973cdecb8d68d50363f60baa5ed14af59b53d1414149c1115261d94910acd4
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 000000000000..a8386fe8e215
--- /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 000000000000..68acdd471a39
--- /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 bf5c8f9fd36b..d3055fbb083f 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)
 }