gentoo resync : 28.04.2021

4 files changed, 66 insertions, 54 deletions

diff --git a/games-board/xfreecell/Manifest b/games-board/xfreecell/Manifest
index 4f1991a9ce12..53cb72c0d25d 100644
--- a/games-board/xfreecell/Manifest
+++ b/games-board/xfreecell/Manifest
@@ -1,7 +1,8 @@
+AUX xfreecell-1.0.5b-ar-ranlib.patch 345 BLAKE2B 9eb89fd601dc17793c544bb41976bff76314e43c9c0a958b9bc445b00dce807e6b69537d8b6760070cd04a76cc28f07db3c18d550dc9aac02c9b1dfe95557f0d SHA512 39aef36982c3a5edcf2616e572781b7a4c1deb30baa34285fef443124e6d85d4cc0cd3ea5afe466e8bf26fc9f78194defca76e4f56e709c55fb087782f9b0cdb
 AUX xfreecell-1.0.5b-gcc43.patch 1124 BLAKE2B e4870d1a21b8322146b839bfbe792c5c2c24c93c825bc50ac15057f3d4186e4f6dd4c49c05d773044bc063a8773a55aad0bf1bb0912248ee8033f98611068cab SHA512 0164962559d0ce135ec08b8f143ef90ee3b70bcc4509057709d505e12e2efb3a70848befc187d228fc99ff225a10e415d81f3841796f2868751a2ce2df308e37
-AUX xfreecell-1.0.5b-gentoo.patch 11060 BLAKE2B 631f75fddd90000aa350a97f8f412341fe39c19b34894dbc2ecd5a0b761af1599157dbd9f52b3cbec37d1c0f9201c395af526b957970d1886c55b6e1500476ae SHA512 8109b5b05a20f36bf54eb8c5bee7b5a9031c82419b9efbea7f2513a0d81083fb959f2267357a73a75b5de5966304c62b5d245d7f1cf1e77730f6565a3a438185
+AUX xfreecell-1.0.5b-gentoo.patch 9018 BLAKE2B 6538f72db74de1a6dd1e6d64675dd9cb4bd560e78dbb5a449d8c9edd99817f78b360e9cf6499395f5eab3eb701d505aec8d645bcb0ef3f873426ef7195a604df SHA512 94a1c095da08c50dd941d6701409b1f7cf802a26aae310175d5d9cf657b3ed61440633a5d13d42767101bc628bd8ced46f0fa9f4019aa9222147d8540799dfc9
 DIST MSNumbers.gz 1212278 BLAKE2B f976aed03fd176407cddc91ecdc42c26a94bc6e8cb09b24dc3f2e577c05d7a2695e7a33e9784e411cdcb30e7d411f5a6712214660ee0dffd732b0136913afc2f SHA512 6a8215f72bb4f10262c41875e1668bc5bb691f9ba2b803162675cf1fb8ce6090f6009727939ecb86301de76264d35d7d10614887b677055ac470975029e55785
 DIST xfreecell-1.0.5b-gcc6.patch.xz 18888 BLAKE2B b0bbba9a093bb00bdc3d21da61375db8d0cd189adae545c149b0816088a595d585df1e15da9da76696df74fe15a23b4b74d298575fc87b9b9a49efaa168982f3 SHA512 08c544d14c43bcfccb4eee7e99d77225297be8274b85de98edcb4fa297060f8b219814729286f90939b99427b4d32725c82134b860939b5894ccbba2e15226d9
 DIST xfreecell-1.0.5b.tgz 49367 BLAKE2B 6a2fd34f025cd86e55a9f8fe3d4294396078b850e014b6df5584b0ee575856d99ceeae7822d0ae33e168003b4b673920bb03dfbbf4130f46adcdc5acc79c25cf SHA512 b4437d9c78d5a6cb5fabd0157528aef85aa1d01b87875314e122d1eafbe5808af67b7b4dbf4db8e70d3d5193b10e61cc20210725b75c01ca6ff6db2b5840a64c
-EBUILD xfreecell-1.0.5b-r1.ebuild 973 BLAKE2B c6eb237433230abaa3ff8cc07a8df1af6672d3383470fcfce56606674b5fc3a998aca95cd85448f07f2c38629eed9539825f4f19226f7e42c3274ed06fb595c0 SHA512 885942c051cb61c0d33e505b532e05d4a6bc5cdf9709a8b96179543e1b98d86e8f0ccfe35c5307f44cd0455aefb326a8d00f5f1b3e81eada091764d9cf4f34b5
+EBUILD xfreecell-1.0.5b-r1.ebuild 1071 BLAKE2B 60df0b8090f7871c8ef3e25ac42f1622c3b7e968a9f67319d919be6ce412a65d40c6fc5bac0319876e9dc291baa79ac968330c24c74e0dceb61e655136c56a29 SHA512 3328386ffee025473e1b33c23adfe30cf3009333b701effedf96f1c405d31b602e78b8c04587810988c64538407b1cf10caf1b6ca94753a55920a02f0ea27cca
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xfreecell/files/xfreecell-1.0.5b-ar-ranlib.patch b/games-board/xfreecell/files/xfreecell-1.0.5b-ar-ranlib.patch
new file mode 100644
index 000000000000..d2fd441cba17
--- /dev/null
+++ b/games-board/xfreecell/files/xfreecell-1.0.5b-ar-ranlib.patch
@@ -0,0 +1,15 @@
+diff --git a/widget/makefile b/widget/makefile
+index 93b178b..eeedc51 100644
+--- a/widget/makefile
++++ b/widget/makefile
+@@ -16,8 +16,8 @@ tgz:
+ 	tar cvzf widget.tgz *.cpp *.h makefile
+ 
+ dummy: $(OBJECTS)
+-	ar r $(LIBNAME) $(OBJECTS)
+-	ranlib $(LIBNAME)
++	$(AR) r $(LIBNAME) $(OBJECTS)
++	$(RANLIB) $(LIBNAME)
+ 	mv $(LIBNAME) ..
+ 	touch dummy
+ 
diff --git a/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch b/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch
index 85a2e4dd3c41..02cd51bd53c2 100644
--- a/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch
+++ b/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru xfreecellg/card.cpp xfreecell/card.cpp
---- xfreecellg/card.cpp	1999-03-27 05:36:28.000000000 -0800
-+++ xfreecell/card.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/card.cpp
++++ b/card.cpp
 @@ -119,7 +119,7 @@
      int oldy = y();
      int newx = dest_x;
@@ -10,9 +9,8 @@ diff -ru xfreecellg/card.cpp xfreecell/card.cpp
      float curx = (float) oldx;
      float cury = (float) oldy;
  
-diff -ru xfreecellg/freecell.cpp xfreecell/freecell.cpp
---- xfreecellg/freecell.cpp	1999-07-27 07:15:27.000000000 -0700
-+++ xfreecell/freecell.cpp	2004-02-25 02:18:13.000000000 -0800
+--- a/freecell.cpp
++++ b/freecell.cpp
 @@ -64,7 +64,7 @@
  static GameNumberManager* gnManager; 
  static const int PathLength = 256;
@@ -31,9 +29,8 @@ diff -ru xfreecellg/freecell.cpp xfreecell/freecell.cpp
  
    if (home == NULL) {
      fprintf(stderr, "Cannot get $HOME. Assuming I am at home directory now.\n");
-diff -ru xfreecellg/gnmanager.cpp xfreecell/gnmanager.cpp
---- xfreecellg/gnmanager.cpp	1999-07-27 07:18:05.000000000 -0700
-+++ xfreecell/gnmanager.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/gnmanager.cpp
++++ b/gnmanager.cpp
 @@ -16,7 +16,7 @@
  GameNumberManager::GameNumberManager()
  {
@@ -61,9 +58,8 @@ diff -ru xfreecellg/gnmanager.cpp xfreecell/gnmanager.cpp
  {
    FILE* fp = fopen(file.c_str(), "w+");
  
-diff -ru xfreecellg/gnmanager.h xfreecell/gnmanager.h
---- xfreecellg/gnmanager.h	1999-03-29 05:07:19.000000000 -0800
-+++ xfreecell/gnmanager.h	2004-02-25 02:17:24.000000000 -0800
+--- a/gnmanager.h
++++ b/gnmanager.h
 @@ -2,7 +2,13 @@
  #define GNManager_H
  
@@ -98,9 +94,8 @@ diff -ru xfreecellg/gnmanager.h xfreecell/gnmanager.h
  
    hash_set<int> msWonGames;
    hash_set<int> msLostGames;
-diff -ru xfreecellg/makefile xfreecell/makefile
---- xfreecellg/makefile	1999-04-03 05:42:49.000000000 -0800
-+++ xfreecell/makefile	2004-02-25 02:17:48.000000000 -0800
+--- a/makefile
++++ b/makefile
 @@ -1,16 +1,15 @@
  OBJECTS=card.o freecell.o option.o stack.o subwindows.o undo.o util.o gnmanager.o random.o
 -CC=g++
@@ -146,9 +141,8 @@ diff -ru xfreecellg/makefile xfreecell/makefile
 -#	install ms-compatible/MSNumbers $(DESTDIR)/usr/local/lib/xfreecell
 \ No newline at end of file
 +#	install ms-compatible/MSNumbers $(DESTDIR)/usr/share/xfreecell
-diff -ru xfreecellg/option.h xfreecell/option.h
---- xfreecellg/option.h	1999-03-27 11:39:17.000000000 -0800
-+++ xfreecell/option.h	2004-02-25 02:17:24.000000000 -0800
+--- a/option.h
++++ b/option.h
 @@ -22,7 +22,7 @@
    void readPrefs();
    void writePrefs();
@@ -158,9 +152,8 @@ diff -ru xfreecellg/option.h xfreecell/option.h
  
    static int _speedup;
    static bool _queryWindow;
-diff -ru xfreecellg/stack.h xfreecell/stack.h
---- xfreecellg/stack.h	1999-03-02 10:20:02.000000000 -0800
-+++ xfreecell/stack.h	2004-02-25 02:17:24.000000000 -0800
+--- a/stack.h
++++ b/stack.h
 @@ -28,7 +28,7 @@
    int _next_x, _next_y;
  
@@ -170,9 +163,8 @@ diff -ru xfreecellg/stack.h xfreecell/stack.h
  };
  
  class PlayStack : public Stack {
-diff -ru xfreecellg/subwindows.h xfreecell/subwindows.h
---- xfreecellg/subwindows.h	1999-03-15 15:09:49.000000000 -0800
-+++ xfreecell/subwindows.h	2004-02-25 02:17:24.000000000 -0800
+--- a/subwindows.h
++++ b/subwindows.h
 @@ -76,7 +76,7 @@
    int _undos;
    int _totalScore;
@@ -182,9 +174,8 @@ diff -ru xfreecellg/subwindows.h xfreecell/subwindows.h
  
    bool exitPressed;
  
-diff -ru xfreecellg/undo.cpp xfreecell/undo.cpp
---- xfreecellg/undo.cpp	1999-03-25 07:48:40.000000000 -0800
-+++ xfreecell/undo.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/undo.cpp
++++ b/undo.cpp
 @@ -22,7 +22,7 @@
    c->moveToStack(from, false, false);
  }
@@ -194,9 +185,8 @@ diff -ru xfreecellg/undo.cpp xfreecell/undo.cpp
  
  void undoClearMoves()
  {
-diff -ru xfreecellg/widget/container.cpp xfreecell/widget/container.cpp
---- xfreecellg/widget/container.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/container.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/widget/container.cpp
++++ b/widget/container.cpp
 @@ -61,18 +61,18 @@
  
  void NSContainer::remove(NSComponent* nsc)
@@ -233,9 +223,8 @@ diff -ru xfreecellg/widget/container.cpp xfreecell/widget/container.cpp
        if (nscVec.size() == 0) {
  	_width = 0; _height = 0;
        } else {
-diff -ru xfreecellg/widget/makefile xfreecell/widget/makefile
---- xfreecellg/widget/makefile	1999-03-17 21:54:57.000000000 -0800
-+++ xfreecell/widget/makefile	2004-02-25 02:17:59.000000000 -0800
+--- a/widget/makefile
++++ b/widget/makefile
 @@ -1,15 +1,13 @@
  OBJECTS=window.o plate.o string.o button.o label.o textfield.o container.o frame.o util.o scrollbar.o font.o main.o
 -#C=/usr/local/gcc-2.8.1/bin/g++
@@ -255,17 +244,15 @@ diff -ru xfreecellg/widget/makefile xfreecell/widget/makefile
  
  clean:
  	rm -f *.o *~ a.out .nfs* dummy
-diff -ru xfreecellg/widget/textfield.cpp xfreecell/widget/textfield.cpp
---- xfreecellg/widget/textfield.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/textfield.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/widget/textfield.cpp
++++ b/widget/textfield.cpp
 @@ -1,3 +1,4 @@
 +#include <cctype>
  #include "widget.h"
  
  GC NSTextField::gc;
-diff -ru xfreecellg/widget/widget.h xfreecell/widget/widget.h
---- xfreecellg/widget/widget.h	1999-03-15 08:29:32.000000000 -0800
-+++ xfreecell/widget/widget.h	2004-02-25 02:17:24.000000000 -0800
+--- a/widget/widget.h
++++ b/widget/widget.h
 @@ -114,7 +114,7 @@
      Elt(NSWindow* nw, Window w) { nswindow = nw; window = w; }
    };
@@ -302,9 +289,8 @@ diff -ru xfreecellg/widget/widget.h xfreecell/widget/widget.h
  };
  
  // ##### NSHContainer #####
-diff -ru xfreecellg/widget/window.cpp xfreecell/widget/window.cpp
---- xfreecellg/widget/window.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/window.cpp	2004-02-25 02:17:24.000000000 -0800
+--- a/widget/window.cpp
++++ b/widget/window.cpp
 @@ -2,7 +2,7 @@
  
  bool NSWindow::windowInitialized = false;
diff --git a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild b/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
index b5e38916ce0a..309d1fc0d90a 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
@@ -1,39 +1,49 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A freecell game for X"
 HOMEPAGE="http://www2.giganet.net/~nakayama/"
 SRC_URI="http://www2.giganet.net/~nakayama/${P}.tgz
 	http://www2.giganet.net/~nakayama/MSNumbers.gz
 	https://dev.gentoo.org/~dilfridge/distfiles/${P}-gcc6.patch.xz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/font-misc-misc
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
 
-S=${WORKDIR}/${PN}
+RDEPEND="
+	media-fonts/font-misc-misc
+	x11-libs/libXext
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-gcc43.patch
 	"${WORKDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-ar-ranlib.patch
 )
 
+src_configure() {
+	tc-export AR CXX RANLIB
+}
+
 src_install() {
 	dobin xfreecell
+
 	insinto /usr/share/${PN}
 	doins "${WORKDIR}"/MSNumbers
 	dodoc CHANGES README mshuffle.txt
 	doman xfreecell.6
+
 	make_desktop_entry xfreecell XFreecell
 }