gentoo resync : 22.01.2021

4 files changed, 163 insertions, 10 deletions

diff --git a/app-misc/geekcode/Manifest b/app-misc/geekcode/Manifest
index 726339415aea..9612d643964a 100644
--- a/app-misc/geekcode/Manifest
+++ b/app-misc/geekcode/Manifest
@@ -1,4 +1,5 @@
-AUX geekcode-1.7.3-exit.patch 276 BLAKE2B bd008224a005aa5554d4932b3d7ecaba241009deed3e633bf787d04546141f64c9e00d3617af20fb9a84b3f304bb2b037c860528919faaf6e7a0a979e5999378 SHA512 eb8161f72166c6c03c9b6a6355a3bc6fda6aa415a3cb7e9b7d8643de9b7a414249a42d5816e191e739a433b6633b146b5058ef43ca959775b8dacf8ed9cb44bc
+AUX geekcode-1.7.3-exit.patch 203 BLAKE2B 119ed822686a89039a0b41376a312c969eb714a7f61a22371779418e7f7699cf43728655f641d9f7226ce99b95db7ac3aea4c54df5c2de85117d7954605d8328 SHA512 34718833c4294f53db35e9d948aecac25fa389a06146a0ab2db2606f50d7de26779415a16689bbe1ef5db09260d3c33fe124aad781c05b1c252e956b1381204c
+AUX geekcode-1.7.3-fno-common.patch 5896 BLAKE2B 88ab358dd1866752e4f994e72e42561dd78318727f12dfefbf55f4102a3209782c9acee81d959c17132d6bcc43aa06d64141405243cc051104a4453a4b22acaf SHA512 bcaf71f3135a1ce1642628badaee5144e625515af09f5ccf119c31458ae14369c794c602cf40a500f7c5cd46f965c7ff92cb5278f093fd87eda9ef3cd0d50123
 DIST geekcode-1.7.3.tar.gz 60617 BLAKE2B 9e848d45054805e21489e59c6e31ba4aa41a557bf9f89754a3423724bbc449415b3033de0383b9e035af6409abfb24c36b5fcb5a25ad90a14602f7d2164b59af SHA512 eca8489dafee507246538bbb8d35cc17c5712571603bad1f470803883cdbaf9658769df77e214704b6a5adec382f76e599a2f6c48ec3759861159ac626131bfa
-EBUILD geekcode-1.7.3-r1.ebuild 714 BLAKE2B 3c94952217039e2f606d41b219b08c36c1f16a933ec5a534b6baffb4aa33f104444bc2a91a050a1b3d1e4fbb662c1d23f16b04bc9b8d7268c1a8fdaac4f2c7ff SHA512 a128e55feeb88bc148428b20ff3f1998687238bb550688519cce9a083cf2a4fbea0bbe1739cd5b5185ddfe48f88f3ae0949d47aaee239ab5bf1f305a4885db1f
+EBUILD geekcode-1.7.3-r1.ebuild 724 BLAKE2B 1bfcc76c1fc03eef841af314af5899c3d7c534f0b3300f2a3fe5dc3d826c6f30883e5cc309ff19640773fc8b378a31fdefc8b79578b66688b6d5f352a3418a2f SHA512 91e1e4fef6f00535d1b4c9f7cbe3442306f516555bad8177fe3fc8e9b982d5e466505eb3e90cb62917df4d005bb416472400d8def0c4396b744b0bd7e2f2c67b
 MISC metadata.xml 245 BLAKE2B 3c0714cdd9bae31bdd4066cdacae1b7f6da612dfb694a03268c1229922ea4b9786750624e77844eb39dd5a239a4cd025b7a520551434481dd133e5f12358f051 SHA512 893b63b0ea6d148dc82926eb61cc86db6ec79b5121f65ec56160f7ccea3610a134851cc82e9161a32ff7bd8094ee5c6b8e16060b4642b046a769bcd85dc19b32
diff --git a/app-misc/geekcode/files/geekcode-1.7.3-exit.patch b/app-misc/geekcode/files/geekcode-1.7.3-exit.patch
index 23eba06a52eb..08fe92601942 100644
--- a/app-misc/geekcode/files/geekcode-1.7.3-exit.patch
+++ b/app-misc/geekcode/files/geekcode-1.7.3-exit.patch
@@ -1,5 +1,5 @@
---- geekcode.h.orig	2003-06-30 16:47:40.000000000 +0200
-+++ geekcode.h	2010-12-30 19:14:51.000000000 +0100
+--- a/geekcode.h
++++ b/geekcode.h
 @@ -22,6 +22,7 @@
  #ifndef __INCLUDED_GEEKCODE_H__
  #define __INCLUDED_GEEKCODE_H__
diff --git a/app-misc/geekcode/files/geekcode-1.7.3-fno-common.patch b/app-misc/geekcode/files/geekcode-1.7.3-fno-common.patch
new file mode 100644
index 000000000000..c5725d19c2b2
--- /dev/null
+++ b/app-misc/geekcode/files/geekcode-1.7.3-fno-common.patch
@@ -0,0 +1,151 @@
+--- a/geekcode.c
++++ b/geekcode.c
+@@ -24,6 +24,55 @@
+ #include <sys/stat.h>
+ #include "geekcode.h"
+ 
++/* Geek type - gc_type.c */
++int get_type(void),          gc_type;
++
++/* Appearance section - gc_appearance.c */
++int get_dress(void),         gc_dress;
++int get_height(void),        gc_height;
++int get_weight(void),        gc_weight;
++int get_age(void),           gc_age;
++
++/* Computers section - gc_computers.c */
++int get_computers(void),     gc_computers;
++int get_unix_type(void),     gc_unix_type; /* Added in v1.1 */
++int get_unix(int x),         gc_unix;
++int get_perl(void),          gc_perl;
++int get_linux(void),         gc_linux;
++int get_emacs(void),         gc_emacs;
++int get_www(void),           gc_www;
++int get_usenet(void),        gc_usenet;
++int get_oracle(void),        gc_oracle;
++int get_kibo(void),          gc_kibo;
++int get_windows(void),       gc_windows;
++int get_os2(void),           gc_os2;
++int get_mac(void),           gc_mac;
++int get_vms(void),           gc_vms;
++
++/* Politics section - gc_politics.c */
++int get_social(void),        gc_social;
++int get_economic(void),      gc_economic;
++int get_cypher(void),        gc_cypher;
++int get_pgp(void),           gc_pgp;
++
++/* Entertainment section - gc_entertainment.c */
++int get_startrek(void),      gc_startrek;
++int get_babylon5(void),      gc_babylon5;
++int get_xfiles(void),        gc_xfiles;
++int get_rp(void),            gc_rp;
++int get_television(void),    gc_television;
++int get_books(void),         gc_books;
++int get_dilbert(void),       gc_dilbert;
++int get_doom(void),          gc_doom;
++int get_geekcode(void),      gc_geekcode;
++
++/* Lifestyle section - gc_lifestyle.c */
++int get_education(void),     gc_education;
++int get_housing(void),       gc_housing;
++int get_relationships(void), gc_relationships;
++int get_sex_type(void),      gc_sex_type; /* Added in v1.2 */
++int get_sex(int x),          gc_sex;      /* Modified in v1.2 */
++
+ int readgeek(char geekcode[64][16],char *data,int *j,int *k){
+   int i;
+ 
+--- a/geekcode.h
++++ b/geekcode.h
+@@ -34,53 +34,53 @@
+                  */
+ 
+ /* Geek type - gc_type.c */
+-int get_type(void),          gc_type;
++extern int get_type(void),          gc_type;
+ 
+ /* Appearance section - gc_appearance.c */
+-int get_dress(void),         gc_dress;
+-int get_height(void),        gc_height;
+-int get_weight(void),        gc_weight;
+-int get_age(void),           gc_age;
++extern int get_dress(void),         gc_dress;
++extern int get_height(void),        gc_height;
++extern int get_weight(void),        gc_weight;
++extern int get_age(void),           gc_age;
+ 
+ /* Computers section - gc_computers.c */
+-int get_computers(void),     gc_computers;
+-int get_unix_type(void),     gc_unix_type; /* Added in v1.1 */
+-int get_unix(int x),         gc_unix;
+-int get_perl(void),          gc_perl;
+-int get_linux(void),         gc_linux;
+-int get_emacs(void),         gc_emacs;
+-int get_www(void),           gc_www;
+-int get_usenet(void),        gc_usenet;
+-int get_oracle(void),        gc_oracle;
+-int get_kibo(void),          gc_kibo;
+-int get_windows(void),       gc_windows;
+-int get_os2(void),           gc_os2;
+-int get_mac(void),           gc_mac;
+-int get_vms(void),           gc_vms;
++extern int get_computers(void),     gc_computers;
++extern int get_unix_type(void),     gc_unix_type; /* Added in v1.1 */
++extern int get_unix(int x),         gc_unix;
++extern int get_perl(void),          gc_perl;
++extern int get_linux(void),         gc_linux;
++extern int get_emacs(void),         gc_emacs;
++extern int get_www(void),           gc_www;
++extern int get_usenet(void),        gc_usenet;
++extern int get_oracle(void),        gc_oracle;
++extern int get_kibo(void),          gc_kibo;
++extern int get_windows(void),       gc_windows;
++extern int get_os2(void),           gc_os2;
++extern int get_mac(void),           gc_mac;
++extern int get_vms(void),           gc_vms;
+ 
+ /* Politics section - gc_politics.c */
+-int get_social(void),        gc_social;
+-int get_economic(void),      gc_economic;
+-int get_cypher(void),        gc_cypher;
+-int get_pgp(void),           gc_pgp;
++extern int get_social(void),        gc_social;
++extern int get_economic(void),      gc_economic;
++extern int get_cypher(void),        gc_cypher;
++extern int get_pgp(void),           gc_pgp;
+ 
+ /* Entertainment section - gc_entertainment.c */
+-int get_startrek(void),      gc_startrek;
+-int get_babylon5(void),      gc_babylon5;
+-int get_xfiles(void),        gc_xfiles;
+-int get_rp(void),            gc_rp;
+-int get_television(void),    gc_television;
+-int get_books(void),         gc_books;
+-int get_dilbert(void),       gc_dilbert;
+-int get_doom(void),          gc_doom;
+-int get_geekcode(void),      gc_geekcode;
++extern int get_startrek(void),      gc_startrek;
++extern int get_babylon5(void),      gc_babylon5;
++extern int get_xfiles(void),        gc_xfiles;
++extern int get_rp(void),            gc_rp;
++extern int get_television(void),    gc_television;
++extern int get_books(void),         gc_books;
++extern int get_dilbert(void),       gc_dilbert;
++extern int get_doom(void),          gc_doom;
++extern int get_geekcode(void),      gc_geekcode;
+ 
+ /* Lifestyle section - gc_lifestyle.c */
+-int get_education(void),     gc_education;
+-int get_housing(void),       gc_housing;
+-int get_relationships(void), gc_relationships;
+-int get_sex_type(void),      gc_sex_type; /* Added in v1.2 */
+-int get_sex(int x),          gc_sex;      /* Modified in v1.2 */
++extern int get_education(void),     gc_education;
++extern int get_housing(void),       gc_housing;
++extern int get_relationships(void), gc_relationships;
++extern int get_sex_type(void),      gc_sex_type; /* Added in v1.2 */
++extern int get_sex(int x),          gc_sex;      /* Modified in v1.2 */
+ char show_sex_type(int x);                /* Added in v1.2 */
+ 
+ void show_geekcode(int x);                /* Modified in v1.2 */
diff --git a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
index 861f0cd3f61c..443adb611452 100644
--- a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs flag-o-matic
 
@@ -13,13 +13,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-exit.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
 src_prepare() {
-	eapply -p0 "${FILESDIR}/${P}-exit.patch"
+	default
 	sed -i Makefile -e 's| -o | ${LDFLAGS}&|g' || die "sed Makefile"
-
-	eapply_user
-
-	append-flags -fcommon
 }
 
 src_compile() {