Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-board/awale/, games-board/awale/files/
Date: Tue, 29 Jun 2021 20:55:28
Message-Id: 1624999995.5394dc948588061ef8b8045c5352536fac126d44.ionen@gentoo
1 commit: 5394dc948588061ef8b8045c5352536fac126d44
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 29 20:13:34 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 29 20:53:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5394dc94
7
8 games-board/awale: drop 1.5-r1
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 games-board/awale/Manifest | 2 -
13 games-board/awale/awale-1.5-r1.ebuild | 59 -------------
14 games-board/awale/files/awale-1.5-build.patch | 116 --------------------------
15 3 files changed, 177 deletions(-)
16
17 diff --git a/games-board/awale/Manifest b/games-board/awale/Manifest
18 index 1ff1ba01fb7..957a0135406 100644
19 --- a/games-board/awale/Manifest
20 +++ b/games-board/awale/Manifest
21 @@ -1,3 +1 @@
22 -DIST awale-1.5-no-autoreconf2.patch.xz 37268 BLAKE2B cec173e9b0be75c5d3d037a171fd796dccca5689e53f2e08d832e15a63d96502b4277f2ca6dbcbe817949cda8243aaacf7d7ede281fa32a34ffbf5f3031042f1 SHA512 857814c6ffe828bb0c3b82c214932ddf95162b7abaac6720db987f2af31a3b144543773a607edc70e0fceb8433f2aa519d3cfaca7474750cb45074aef0c37cb1
23 -DIST awale-1.5.tar.gz 489357 BLAKE2B d9f5efd10018b1e5f9964abf25189df5186159c7826c23b85f794999c5bc8d8ea93792e83dbde2ae010489a7d90258651e7ab7115e0fc361ce682968c438aed6 SHA512 b3f33068d7d6cfd964051e15cfd84e7f2c8483c30f2ccea35e2dddb34353ea984561fdf28c0d668404d80cda89c6d5fcd0004a1a86d92325e5f6fc2f88197c61
24 DIST awale-1.6.tar.gz 490881 BLAKE2B 721b8dfdc6dd7a558e43e00616372b2b1a89acf1cc79cb051650809b54605d4d0c2fbc91168ad940356748c0632fba7bd016db7afee2f977f8d52f64bdd08400 SHA512 0b9e4f18d6fbd5e8acdf8e5ecbbcebad4d732993cb61b8d84787fa2a9dad5b73eee62462fddc9296c050019de76a73b1e6d8d29d3ef57148ab086e49b1016f0d
25
26 diff --git a/games-board/awale/awale-1.5-r1.ebuild b/games-board/awale/awale-1.5-r1.ebuild
27 deleted file mode 100644
28 index 13e96b998a9..00000000000
29 --- a/games-board/awale/awale-1.5-r1.ebuild
30 +++ /dev/null
31 @@ -1,59 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -# do not use autotools related stuff in stable ebuilds
36 -# unless you like random breakage: 469796, 469798, 424041
37 -
38 -EAPI=6
39 -
40 -inherit autotools eutils gnome2-utils
41 -
42 -DESCRIPTION="Free Awale - The game of all Africa"
43 -HOMEPAGE="http://www.nongnu.org/awale/"
44 -SRC_URI="mirror://nongnu/awale/${P}.tar.gz"
45 -SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf2.patch.xz" # STABLE ARCH
46 -
47 -LICENSE="GPL-2"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~x86"
50 -IUSE="tk"
51 -
52 -RDEPEND="tk? ( dev-lang/tcl:0= dev-lang/tk:0= )"
53 -
54 -PATCHES=(
55 - "${FILESDIR}"/${P}-build.patch
56 -)
57 -
58 -src_prepare() {
59 - default
60 -
61 - mv src/xawale.tcl src/xawale.tcl.in || die
62 - mv configure.{in,ac} || die
63 - rm aclocal.m4 || die
64 - eautoreconf
65 -}
66 -
67 -src_configure() {
68 - econf \
69 - --mandir=/usr/share/man \
70 - --with-iconsdir=/usr/share/icons/hicolor/48x48/apps \
71 - --with-desktopdir=/usr/share/applications \
72 - $(use_enable tk)
73 -}
74 -
75 -src_install() {
76 - default
77 - use tk && fperms +x /usr/share/${PN}/xawale.tcl
78 -}
79 -
80 -pkg_preinst() {
81 - use tk && gnome2_icon_savelist
82 -}
83 -
84 -pkg_postinst() {
85 - use tk && gnome2_icon_cache_update
86 -}
87 -
88 -pkg_postrm() {
89 - use tk && gnome2_icon_cache_update
90 -}
91
92 diff --git a/games-board/awale/files/awale-1.5-build.patch b/games-board/awale/files/awale-1.5-build.patch
93 deleted file mode 100644
94 index 0e8ca136a41..00000000000
95 --- a/games-board/awale/files/awale-1.5-build.patch
96 +++ /dev/null
97 @@ -1,116 +0,0 @@
98 -From: Julian Ospald <hasufell@g.o>
99 -Date: Sat Jan 26 20:04:17 UTC 2013
100 -Subject: build system
101 -
102 - fix FHS compliance
103 - add several switches for icon, desktopdir and tk
104 - fix a few macros
105 -
106 ---- awale-1.5/src/Makefile.am
107 -+++ awale-1.5/src/Makefile.am
108 -@@ -1,24 +1,30 @@
109 - bin_PROGRAMS = awale
110 - awale_SOURCES = awale.c getopt.c getopt1.c getopt.h
111 --INCLUDES = -I. -I$(srcdir)
112 -+AM_CPPFLAGS = -I. -I$(srcdir)
113 -+
114 -+if TK_GUI
115 - bin_SCRIPTS = xawale
116 - xawale:
117 - echo "#! /bin/sh" >$@
118 -- echo '`dirname $$0`/../share/awale/xawale.tcl' >>$@
119 -+ echo "cd \"$(datadir)/awale/\" ; exec \"$(datadir)/awale/xawale.tcl\"" >>$@
120 - chmod ugo+x $@
121 --appdir = $(prefix)/share/applications
122 -+appdir = @DESKTOPFILESDIR@
123 - app_DATA = awale.desktop
124 - awale.desktop:
125 - echo "[Desktop Entry]" >$@
126 - echo "Name=Free Awale" >>$@
127 - echo "Comment=Awale game" >>$@
128 - echo "Exec=xawale" >>$@
129 -- echo 'Icon=$(pkgdatadir)/awale.png' >>$@
130 -+ echo 'Icon=awale' >>$@
131 - echo "Terminal=false" >>$@
132 - echo "Type=Application" >>$@
133 - echo "Categories=Game;BoardGame;" >>$@
134 - chmod 644 $@
135 - CLEANFILES = xawale awale.desktop
136 -+
137 -+xawale.tcl:
138 -+ sed 's|@my_bindir@|$(bindir)|' < $@.in > $@
139 -+
140 - pkgdata_SCRIPTS = xawale.tcl
141 - dist_pkgdata_DATA = Trou00.gif Trou01.gif Trou02.gif Trou03.gif Trou04.gif Trou05.gif \
142 - Trou06.gif Trou07.gif Trou08.gif Trou09.gif Trou10.gif Trou11.gif \
143 -@@ -28,3 +34,8 @@
144 - Trou06.gif Trou07.gif Trou08.gif Trou09.gif Trou10.gif Trou11.gif \
145 - Trou12.gif Trou13.gif Trou14.gif Trou15.gif board.gif copyright.gif \
146 - awale.png awale.ico uk.gif fr.gif sp.gif AwaleBanner.bmp README
147 -+
148 -+# icon
149 -+iconsdir = @ICONSDIR@
150 -+dist_icons_DATA = awale.png
151 -+endif
152 ---- awale-1.5/configure.in
153 -+++ awale-1.5/configure.in
154 -@@ -1,6 +1,34 @@
155 --AC_INIT(awale.c)
156 --AM_INIT_AUTOMAKE(awale, 1.5)
157 -+AC_INIT([awale], [1.5])
158 -+AM_INIT_AUTOMAKE([-Wall])
159 - AC_CONFIG_SRCDIR([src/awale.c])
160 - AC_PROG_CC
161 -+
162 -+
163 -+# let user specify desktopdir
164 -+AC_ARG_WITH([desktopdir],
165 -+ [AS_HELP_STRING([--with-desktopdir=DIR],
166 -+ [path where desktop files get installed (default: $datadir/applications)])],
167 -+ [DESKTOPFILESDIR="$withval"],
168 -+ [DESKTOPFILESDIR='$(datadir)/applications'])
169 -+
170 -+# let user specify iconsdir
171 -+AC_ARG_WITH([iconsdir],
172 -+ [AS_HELP_STRING([--with-iconsdir=DIR],
173 -+ [path where icons get installed (default: $datadir/pixmaps)])],
174 -+ [ICONSDIR="$withval"],
175 -+ [ICONSDIR='$(datadir)/pixmaps'])
176 -+
177 -+# configure-switch for tkgui
178 -+AC_ARG_ENABLE([tk],
179 -+ [AS_HELP_STRING([--enable-tk],
180 -+ [enable tk gui (default: enable)])],
181 -+ [enable_tk=$enableval],
182 -+ [enable_tk="no"])
183 -+
184 -+AM_CONDITIONAL([TK_GUI], [test "x$enable_tk" = "xyes"])
185 -+
186 -+AC_SUBST([ICONSDIR])
187 -+AC_SUBST([DESKTOPFILESDIR])
188 -+
189 - AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
190 - AC_OUTPUT
191 -
192 ---- awale-1.5/man/Makefile.am
193 -+++ awale-1.5/man/Makefile.am
194 -@@ -1,3 +1,7 @@
195 --mandir = $(prefix)/share/man
196 -+if TK_GUI
197 - man_MANS = awale.6 xawale.6
198 -+else
199 -+man_MANS = awale.6
200 -+endif
201 -+
202 - EXTRA_DIST = $(man_MANS)
203 ---- awale-1.5/src/xawale.tcl
204 -+++ awale-1.5/src/xawale.tcl
205 -@@ -693,7 +693,7 @@
206 -
207 - switch $tcl_platform(platform) {
208 - "unix" {
209 -- set JOUER [file join [file dirname [info script]] .. .. bin awale]
210 -+ set JOUER "@my_bindir@/awale"
211 - }
212 - "macintosh" {
213 - set JOUER [file join [file dirname [info script]] .. .. bin awale]