Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/
Date: Sun, 30 May 2021 21:11:09
Message-Id: 1622408974.e1fd6e3ae5cc11bb5c4cd7354b185200eed8f3f9.asturm@gentoo
1 commit: e1fd6e3ae5cc11bb5c4cd7354b185200eed8f3f9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 15 15:24:36 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun May 30 21:09:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fd6e3a
7
8 games-puzzle/sgt-puzzles: Drop defunct 99999999 version
9
10 Upstream switched to cmake, patch broken, needs complete rework.
11
12 Closes: https://bugs.gentoo.org/769167
13 Package-Manager: Portage-3.0.18, Repoman-3.0.3
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 games-puzzle/sgt-puzzles/Manifest | 1 -
17 games-puzzle/sgt-puzzles/metadata.xml | 3 -
18 .../sgt-puzzles/sgt-puzzles-99999999.ebuild | 115 ---------------------
19 3 files changed, 119 deletions(-)
20
21 diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
22 index f6eeba83f95..94246fc1359 100644
23 --- a/games-puzzle/sgt-puzzles/Manifest
24 +++ b/games-puzzle/sgt-puzzles/Manifest
25 @@ -1,2 +1 @@
26 DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 6b19cde3f95b5375bde74923a5f8e3deb9abb7d4d737ad5f2d18aa7895b973a9ca1ed4a495cf80da8390ed7fb63f1eb973c8053d52145e5752c56e38d3ac19d7 SHA512 5f38c96cff4e745a1c1615762c0e5f3f3dd056ff7dbf0f80a5953e658ae1460503c6394fe29301f5682485d6a6121869853a270dc60327821a3059ca6d971fa1
27 -DIST sgt-puzzles-icons-20160315.tar.xz 715536 BLAKE2B c50b3a6a0d0f8a052215dd9fba7c3eca5822bc7f866a825ad5e92391bb1867d141793877bc7c4545cc6da674bf273752612f7d3578a6a05b22cc2552ea798ce6 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
28
29 diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
30 index 697024d76f6..fa736384b59 100644
31 --- a/games-puzzle/sgt-puzzles/metadata.xml
32 +++ b/games-puzzle/sgt-puzzles/metadata.xml
33 @@ -9,7 +9,4 @@
34 <email>np-hardass@g.o</email>
35 <name>Adam Feldman</name>
36 </maintainer>
37 - <use>
38 - <flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
39 - </use>
40 </pkgmetadata>
41
42 diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
43 deleted file mode 100644
44 index 2988d396d97..00000000000
45 --- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
46 +++ /dev/null
47 @@ -1,115 +0,0 @@
48 -# Copyright 1999-2021 Gentoo Authors
49 -# Distributed under the terms of the GNU General Public License v2
50 -
51 -EAPI=6
52 -
53 -inherit eutils gnome2-utils toolchain-funcs autotools
54 -
55 -if [[ ${PV} == "99999999" ]] ; then
56 - inherit git-r3
57 - EGIT_REPO_URI="https://git.tartarus.org/simon/puzzles.git"
58 - GENTOO_ICONS="20160315"
59 - SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
60 -else
61 - MAGIC=e2135d5
62 - SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
63 - S=${WORKDIR}/puzzles-${PV}.${MAGIC}
64 - KEYWORDS="~amd64 ~x86"
65 -fi
66 -
67 -DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
68 -HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
69 -
70 -LICENSE="MIT"
71 -SLOT="0"
72 -IUSE="+doc gtk3"
73 -
74 -COMMON_DEPEND="
75 - !gtk3? ( x11-libs/gtk+:2 )
76 - gtk3? ( x11-libs/gtk+:3 )"
77 -
78 -RDEPEND="${COMMON_DEPEND}
79 - x11-misc/xdg-utils" # Used by builtin help patch
80 -
81 -DEPEND="${COMMON_DEPEND}
82 - dev-lang/perl
83 - virtual/pkgconfig
84 - doc? ( >=app-doc/halibut-1.2 )"
85 -
86 -PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
87 -
88 -src_unpack() {
89 - default
90 - if [[ ${PV} == "99999999" ]]; then
91 - git-r3_src_unpack
92 - fi
93 -}
94 -
95 -src_prepare() {
96 - default
97 -
98 - sed -i \
99 - -e 's|-Werror||g' \
100 - configure.ac || die
101 - sed -i \
102 - -e 's/-O2 -Wall .* -g/-Wall/' \
103 - -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
104 - mkfiles.pl || die
105 - ./mkfiles.pl || die
106 - eautoreconf
107 -
108 - # Import icons from latest Gentoo tarball for live
109 - if [[ ${PV} == "99999999" ]]; then
110 - cp -R ../${PN}-icons/icons . || die
111 - fi
112 -}
113 -
114 -src_configure() {
115 - econf \
116 - --program-prefix="${PN}_" \
117 - --with-gtk=$(usex gtk3 3 2)
118 -}
119 -
120 -src_compile() {
121 - emake CC="$(tc-getCC)"
122 - if use doc ; then
123 - halibut --text --html --info --pdf --ps puzzles.but || die
124 - fi
125 -}
126 -
127 -src_install() {
128 - default
129 -
130 - local file name
131 - for file in *.R ; do
132 - [[ ${file} == "nullgame.R" ]] && continue
133 - name=$(awk -F: '/exe:/ { print $3 }' "${file}")
134 - file=${file%.R}
135 - newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
136 - make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
137 - done
138 -
139 - if use doc ; then
140 - DOCS=( puzzles.{pdf,ps,txt} )
141 - HTML_DOCS=( *.html )
142 - einstalldocs
143 - doinfo puzzles.info{,-1,-2,-3}
144 - fi
145 -
146 - insinto /etc/xdg/menus/applications-merged
147 - doins "${FILESDIR}/${PN}.menu"
148 - insinto /usr/share/desktop-directories
149 - doins "${FILESDIR}/${PN}.directory"
150 -}
151 -
152 -pkg_preinst() {
153 - gnome2_icon_savelist
154 -}
155 -
156 -pkg_postinst() {
157 - gnome2_icon_cache_update
158 -}
159 -
160 -pkg_postrm() {
161 - gnome2_icon_cache_update
162 -}