Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xfishtank/files/, x11-misc/xfishtank/
Date: Fri, 04 Sep 2020 11:54:26
Message-Id: 1599220462.193ff1e6236c89f88b92ee7d4c4a86bcc89a3d96.jer@gentoo
1 commit: 193ff1e6236c89f88b92ee7d4c4a86bcc89a3d96
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 4 11:52:53 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 4 11:54:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193ff1e6
7
8 x11-misc/xfishtank: Version 2.5
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 x11-misc/xfishtank/Manifest | 1 +
14 .../xfishtank/files/xfishtank-2.1-implicits.patch | 20 +++++------
15 x11-misc/xfishtank/xfishtank-2.5.ebuild | 39 ++++++++++++++++++++++
16 3 files changed, 50 insertions(+), 10 deletions(-)
17
18 diff --git a/x11-misc/xfishtank/Manifest b/x11-misc/xfishtank/Manifest
19 index c0d925ad8a9..ca1d5ddc5b5 100644
20 --- a/x11-misc/xfishtank/Manifest
21 +++ b/x11-misc/xfishtank/Manifest
22 @@ -1 +1,2 @@
23 DIST xfishtank-2.1tp.tar.gz 187513 BLAKE2B e2acec91ef52776bee82ea1b4df347b7fe509377687e74422d6dff81d7fce8a4009e4d0f45327a8401e4ae9782440d9f6478d1dd501c6e4e7d595d94b2d40b1a SHA512 641efa1104685d94589c2d9d365108308cb1b0dd238dbba6dc333c5922bda371536c0e26a63645351ac245a18f2386e4c47b4a1fc2a7f4b0400d37db846976a1
24 +DIST xfishtank-2.5.tar.gz 153464 BLAKE2B 0bb3121b84c3d08ea2251a70f9ad569e90fe6299ad3ee4942ec83d80483fcf4db0b0079161c28ff63461597f76b0d0532a65c1bde8aa821ff6bc92be189843f2 SHA512 1bfe16737bdbc2b7cf74abb98408bf632d8881f15753005424f84eba4afca756b07fa7ad424df800ee3f3e46e033b8f60142877bcd9a7e4e806e318ee283721f
25
26 diff --git a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
27 index 0a4a0350324..b00118631be 100644
28 --- a/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
29 +++ b/x11-misc/xfishtank/files/xfishtank-2.1-implicits.patch
30 @@ -1,5 +1,5 @@
31 ---- xfishtank-2.1tp/read.c
32 -+++ xfishtank-2.1tp/read.c
33 +--- a/read.c
34 ++++ b/read.c
35 @@ -1,5 +1,7 @@
36 #include <X11/Xlib.h>
37 #include <stdio.h>
38 @@ -8,16 +8,16 @@
39 #include "compact.h"
40 #include "medcut.h"
41
42 ---- xfishtank-2.1tp/medcut.c
43 -+++ xfishtank-2.1tp/medcut.c
44 +--- a/medcut.c
45 ++++ b/medcut.c
46 @@ -1,4 +1,5 @@
47 #include <stdio.h>
48 +#include <stdlib.h>
49 #include "medcut.h"
50
51 #define RED 0
52 ---- xfishtank-2.1tp/xfish.c
53 -+++ xfishtank-2.1tp/xfish.c
54 +--- a/xfish.c
55 ++++ b/xfish.c
56 @@ -46,6 +46,9 @@
57 #endif
58
59 @@ -51,8 +51,8 @@
60 timeout.tv_sec = seconds;
61 timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0;
62 select(0, &fds, &fds, &fds, &timeout);
63 ---- xfishtank-2.1tp/makeh.c
64 -+++ xfishtank-2.1tp/makeh.c
65 +--- a/makeh.c
66 ++++ b/makeh.c
67 @@ -1,6 +1,6 @@
68 -
69 +#include <stdlib.h>
70 @@ -62,8 +62,8 @@
71 main()
72 {
73 FILE *fp;
74 ---- xfishtank-2.1tp/gifread.c
75 -+++ xfishtank-2.1tp/gifread.c
76 +--- a/gifread.c
77 ++++ b/gifread.c
78 @@ -56,6 +56,8 @@
79
80 #include <X11/Xlib.h>
81
82 diff --git a/x11-misc/xfishtank/xfishtank-2.5.ebuild b/x11-misc/xfishtank/xfishtank-2.5.ebuild
83 new file mode 100644
84 index 00000000000..8ea5a3d929a
85 --- /dev/null
86 +++ b/x11-misc/xfishtank/xfishtank-2.5.ebuild
87 @@ -0,0 +1,39 @@
88 +# Copyright 1999-2020 Gentoo Authors
89 +# Distributed under the terms of the GNU General Public License v2
90 +
91 +EAPI=7
92 +inherit toolchain-funcs
93 +
94 +DESCRIPTION="Turns your root window into an aquarium"
95 +HOMEPAGE="https://jim.rees.org/computers/xfishtank.html"
96 +SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
97 +
98 +LICENSE="public-domain"
99 +SLOT="0"
100 +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
101 +
102 +RDEPEND="
103 + x11-libs/libX11
104 + x11-libs/libXext
105 + x11-libs/libXt
106 +"
107 +DEPEND="
108 + ${RDEPEND}
109 + x11-base/xorg-proto
110 +"
111 +BDEPEND="
112 + x11-misc/imake
113 +"
114 +S=${WORKDIR}/${PN}
115 +
116 +src_configure() {
117 + xmkmf || die
118 +}
119 +
120 +src_compile() {
121 + emake \
122 + CC="$(tc-getCC)" \
123 + CDEBUGFLAGS="${CFLAGS}" \
124 + EXTRA_LDOPTIONS="${LDFLAGS}" \
125 + ${PN}
126 +}