gentoo resync : 28.04.2021

5 files changed, 24 insertions, 25 deletions

diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index 271b4fae5b28..55429b5cb1c1 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -1,7 +1,7 @@
-AUX wmSpaceWeather-1.04_p19-gcc-10.patch 962 BLAKE2B 935948a401c6e5a1bf8bd3bf74721f3c0b099d072401051ab17eef2b95406f4e6b46a661944e003c8ddb3beb3c8ed90089f8a64e49c6372de2e3a9900baaa68b SHA512 46a1a069f6fff39e4771582576540693405759d9033ba3961b23eaa9f7d04f81bf91a8177c7fb75cc7fea78faed28fa561b849a425187a5a2a19783afa0babbd
-AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 BLAKE2B b81b73f9fb8c64c8ba9560f999f72b75a4c12aadb222a84903461adb3756ee991467f74a5b59ea96c3eb46e9ca479cbdd78a2cfa6f8dd2e929dc158201eb1c2c SHA512 7e8d76b6db7e6fd6b498712d0d06cee4a3550914f9c48844c6b3dfc77c1086ac119a097365fd5424e1c251f0e9088feec3c2a1e9ab53e146f3a5427786872982
-AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 BLAKE2B dd350e57e2c0d40716ead4fb6bdc215f263bf5340c242550668ba252d78873a5ceab7cbf789209214daec41e33abea3a128b6cd5a5a83ee4e22b9de694ccecec SHA512 54f1ee8d2152bafc7895b2a626f27a4c5bf7b3702a2d14e2523952fcffb8e636f6f3ceb30d95b12b80470a58cb16dd50e04435ccae91e81c83097d41e2949b59
+AUX wmSpaceWeather-1.04_p19-gcc-10.patch 476 BLAKE2B 84a9a694371b40c2a3bb1a73331d8c008297d620c7bafe84f08b3e29c3e1318099510540a2bd9618d88a9dd6770dc957e26cf0b0e2043c601c23afa8d427d4f3 SHA512 ac96f54015aea470570b69e31b19fc0d363cefade86204d55c0eb41936f9e88d56d4f6d58d6d98fa5837a75797219685ce9bb6d09b0f2d51e25612ffede3dde5
+AUX wmSpaceWeather-1.04_p19-gentoo.patch 1880 BLAKE2B f874c9972baddeb5118d7ba00a5d469e9947824c052f3f459b55d40cbb7093fdf85853bf689ef702407749bba36327133ec2114718e916c179de377117a98099 SHA512 f0ebafcc49d37578173e5c097e78ecbc621a6fad4e4152c7e6c93751eee2826d3b85552ac3e7d5c8ea7780842408bd6fcf44bbfccbe28daaf8fb20e33af1a878
+AUX wmSpaceWeather-1.04_p19-getkp.patch 1213 BLAKE2B fee1aed8eec9ed13317a0ab43b8bd004108f9b13aa1ed4a4fa05b5861dbfca896d1c1b12d6b66f15a963874909ade2ccd01a492b416138d4448871072e9d02f6 SHA512 025bef6ab47aff79956996291b4cadbdbbb5a06d2cae58295c758ed2fedf9458602414790c303564b29434947773f8c98581723acc7b1904a2a625896ff112ee
 DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
 DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
-EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1655 BLAKE2B f0fec1016e233b4a14cf8d1a3be96d8537e0f3d31548ff6ff1f8b8fdb0d62b33af56aa1cdbf03c5e6361574a664ebab641976efc9d6878c40acc09316767bd91 SHA512 33c67461d55fdfe6b8c9c57df9e2599340dc45c8fd92bb8bd2eeb60a834d106a1e2794fda90f47a02b14da83fa8f4ffaa64448ae3b18162e411a91add92dafc3
+EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1533 BLAKE2B 212707fa911e22e74203d6a0013bcf2f4144f4970675700a834de2b098214a2e58cf9ee744ea90eb7ce6bc87480f594b4de1a84eb526dc06383e37a6da4a02f6 SHA512 d807b4560e43c1f64530e65322d2e26729fd9634c240bc18c6f0f6dde804a842529cfbb25957ffa109b9eb81527045f4eb79dddbbdacb791af19b102b54f82b3
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
index f95e7e5ccbe0..e40682abf8d2 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
@@ -1,6 +1,5 @@
-diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h
---- wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h	1999-04-11 07:35:53.000000000 +0200
-+++ wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h	2020-03-01 16:13:29.843346352 +0100
+--- a/wmgeneral/wmgeneral.h
++++ b/wmgeneral/wmgeneral.h
 @@ -28,7 +28,7 @@
   /* Global variable */
  /*******************/
@@ -10,9 +9,8 @@ diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h wmspaceweather-1.
  
    /***********************/
   /* Function Prototypes */
-diff -Naur wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c
---- wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c	1999-04-11 07:35:53.000000000 +0200
-+++ wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c	2020-03-01 16:13:38.172348429 +0100
+--- a/wmSpaceWeather/wmSpaceWeather.c
++++ b/wmSpaceWeather/wmSpaceWeather.c
 @@ -91,6 +91,7 @@
  char            URL[1024];
  int		ForceUpdate2;
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
index 29cb5f984f13..104003a9b4f0 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
@@ -1,5 +1,5 @@
---- wmSpaceWeather/Makefile.orig	2008-01-28 02:45:07.000000000 +0100
-+++ wmSpaceWeather/Makefile	2008-01-28 02:46:04.000000000 +0100
+--- wmSpaceWeather/Makefile
++++ wmSpaceWeather/Makefile
 @@ -1,8 +1,8 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall
@@ -48,8 +48,8 @@
 +	install -m 0755 GetKp $(DESTDIR)$(PREFIX)/share/wmspaceweather
 +	install -m 0644 wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1
  
---- wmSpaceWeather/wmSpaceWeather.c.orig	2008-01-28 03:16:36.000000000 +0100
-+++ wmSpaceWeather/wmSpaceWeather.c	2008-01-28 03:22:12.000000000 +0100
+--- wmSpaceWeather/wmSpaceWeather.c
++++ wmSpaceWeather/wmSpaceWeather.c
 @@ -663,7 +663,7 @@
      if (GotDoubleClick1) {
          GotFirstClick1 = 0;
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
index 6d6d90137feb..aaea89f8ae05 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
@@ -1,5 +1,5 @@
---- wmSpaceWeather/GetKp.orig	2008-01-28 14:20:43.000000000 +0100
-+++ wmSpaceWeather/GetKp	2008-01-28 14:22:48.000000000 +0100
+--- wmSpaceWeather/GetKp
++++ wmSpaceWeather/GetKp
 @@ -17,10 +17,10 @@
      unlink(CUR_INDEX);
  
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
index 9bd5996db7f1..7fdcae9bcf96 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="wmspaceweather"
 MY_PV_ORIG="${PV/_p*}"
@@ -33,16 +33,17 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}"
 
-src_unpack() {
-	unpack ${MY_P_ORIG}.tar.gz
-	epatch "${DISTDIR}"/${MY_P_PATCH}.gz
-	epatch "${FILESDIR}"/${P}-gcc-10.patch
+src_prepare() {
+	default
+
+	cd .. || die
+
+	eapply "${WORKDIR}"/${MY_P_PATCH}
+	eapply "${FILESDIR}"/${P}-gcc-10.patch
 
 	# need to apply patches from Debian first, do NOT change the order
 	cd "${S}" || die
-	mv ../debian/patches "${WORKDIR}"/patch || die
-	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" \
-		EPATCH_MULTI_MSG="Applying Debian patches ..." epatch
+	eapply -p2 ../debian/patches/*.dpatch
 	eapply "${FILESDIR}"/${P}-gentoo.patch
 	eapply "${FILESDIR}"/${P}-getkp.patch
 }