* [gentoo-commits] repo/gentoo:master commit in: app-misc/geekcode/files/, app-misc/geekcode/
@ 2021-01-12 10:49 David Seifert
0 siblings, 0 replies; only message in thread
From: David Seifert @ 2021-01-12 10:49 UTC (permalink / raw
To: gentoo-commits
commit: eda3d3e7da5f1d94dea881a3369bd882bcfc98ae
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Jan 12 10:48:47 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 10:48:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda3d3e7
app-misc/geekcode: Port to EAPI 7
Closes: https://github.com/gentoo/gentoo/pull/18956
Closes: https://bugs.gentoo.org/707246
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-misc/geekcode/files/geekcode-1.7.3-exit.patch | 4 +-
.../geekcode/files/geekcode-1.7.3-fno-common.patch | 151 +++++++++++++++++++++
app-misc/geekcode/geekcode-1.7.3-r1.ebuild | 13 +-
3 files changed, 160 insertions(+), 8 deletions(-)
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 23eba06a52e..08fe9260194 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 00000000000..c5725d19c2b
--- /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 861f0cd3f61..443adb61145 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() {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-12 10:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-12 10:49 [gentoo-commits] repo/gentoo:master commit in: app-misc/geekcode/files/, app-misc/geekcode/ David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox