Gentoo Archives: gentoo-commits

From: NP Hardass <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/sgt-puzzles/, games-puzzle/sgt-puzzles/files/
Date: Fri, 29 Jul 2016 04:49:06
Message-Id: 1469767729.7ad73ab5adf81e02ef2d131ac5949cebcb8cc733.np-hardass@gentoo
1 commit: 7ad73ab5adf81e02ef2d131ac5949cebcb8cc733
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 26 18:56:25 2016 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 29 04:48:49 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad73ab5
7
8 games-puzzle/sgt-puzzles: Drop old
9
10 Package-Manager: portage-2.2.28
11
12 games-puzzle/sgt-puzzles/Manifest | 1 -
13 .../files/sgt-puzzles-9861-gentoo.patch | 23 ------
14 games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild | 88 ----------------------
15 3 files changed, 112 deletions(-)
16
17 diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
18 index 7754d2c..2550a33 100644
19 --- a/games-puzzle/sgt-puzzles/Manifest
20 +++ b/games-puzzle/sgt-puzzles/Manifest
21 @@ -1,3 +1,2 @@
22 DIST puzzles-20160315.c0bc13c.tar.gz 2838135 SHA256 fc557d3a1021a1e56ae63589d08788a8ccdfa1772e4c74cbbade5fefcf4e691f SHA512 9317ab26605982d5a97cec57596bd3e75cb1cb93b2bc14f6f295cf3950a759b21c5262e3eb04a3c3cda1d3d1cf4ff9477ee7fac9d310558567714e8e1cfc3496 WHIRLPOOL 7cc52ecabbfda7f71c64c02cc4ca434a20e637e25754d00b3f397318d0dd120aaf7ea19faafbb7eee259b7c2ca91e8e396d7667e4b1fa7fc6a153f15a69fb52f
23 -DIST puzzles-r9861.tar.gz 3255388 SHA256 cc08ffd96c20dfe249d6db0e97f32608e8c52da9ca00a0e8d7d67fd4a474c3a2 SHA512 fc8abf5912e7ecdf5c5166c6b8f354e5f6dc8c42d646ffeae812c3cea21496f9ff03671268453a32c3246d1c94dfaba83628bf65ebeb645b3deb208ee3045ba1 WHIRLPOOL 1f91bc25d5c8dbf531d71eb3783169477834c232810f529cf682d69a121688584af7dc51b00c380e85dfee3119f9644d2f741f4c9f9dfc2054bc72fa5dd88de5
24 DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac
25
26 diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch
27 deleted file mode 100644
28 index c4ac19e..0000000
29 --- a/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch
30 +++ /dev/null
31 @@ -1,23 +0,0 @@
32 -diff -ru puzzles-r9861.orig/mkfiles.pl puzzles-r9861/mkfiles.pl
33 ---- puzzles-r9861.orig/mkfiles.pl 2013-03-30 16:16:21.000000000 -0400
34 -+++ puzzles-r9861/mkfiles.pl 2013-06-11 17:59:54.255885226 -0400
35 -@@ -1117,8 +1117,8 @@
36 - "\n".
37 - &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
38 - (join " ", map {"-I$dirpfx$_"} @srcdirs) .
39 -- " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
40 -- "XLIBS = `\$(GTK_CONFIG) --libs` -lm\n".
41 -+ " `pkg-config gtk+-2.0 --cflags` \$(CFLAGS)")."\n".
42 -+ "XLIBS = `pkg-config gtk+-2.0 --libs` -lm\n".
43 - "ULIBS = -lm#\n".
44 - "INSTALL=install\n",
45 - "INSTALL_PROGRAM=\$(INSTALL)\n",
46 -@@ -1138,7 +1138,7 @@
47 - $objstr = &objects($p, "X.o", undef, undef);
48 - print &splitline("\$(BINPREFIX)" . $prog . ": " . $objstr), "\n";
49 - $libstr = &objects($p, undef, undef, "-lX");
50 -- print &splitline("\t\$(CC) -o \$@ $objstr $libstr \$(XLFLAGS) \$(${type}LIBS)", 69),
51 -+ print &splitline("\t\$(CC) \$(LDFLAGS) -o \$@ $objstr $libstr \$(XLFLAGS) \$(${type}LIBS)", 69),
52 - "\n\n";
53 - }
54 - foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
55
56 diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild
57 deleted file mode 100644
58 index 9879da7..0000000
59 --- a/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild
60 +++ /dev/null
61 @@ -1,88 +0,0 @@
62 -# Copyright 1999-2015 Gentoo Foundation
63 -# Distributed under the terms of the GNU General Public License v2
64 -# $Id$
65 -
66 -EAPI=5
67 -inherit eutils gnome2-utils toolchain-funcs games
68 -if [[ ${PV} == "99999999" ]] ; then
69 - ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles"
70 - inherit subversion
71 - SRC_URI=""
72 - KEYWORDS=""
73 -else
74 - SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-r${PV}.tar.gz"
75 - S=${WORKDIR}/puzzles-r${PV}
76 - KEYWORDS="amd64 x86"
77 -fi
78 -
79 -DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
80 -HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
81 -
82 -LICENSE="MIT"
83 -SLOT="0"
84 -IUSE="doc"
85 -
86 -RDEPEND="x11-libs/gtk+:2"
87 -DEPEND="${RDEPEND}
88 - dev-lang/perl
89 - virtual/pkgconfig
90 - doc? ( >=app-doc/halibut-1.0 )"
91 -
92 -src_prepare() {
93 - epatch "${FILESDIR}"/${P}-gentoo.patch
94 - ./mkfiles.pl
95 - sed -i \
96 - -e 's:= -O2 -Wall -Werror -ansi -pedantic -g:= $(CPPFLAGS):' \
97 - -e '/LDFLAGS/s:=:=$(LDFLAGS) :' \
98 - Makefile || die
99 -}
100 -
101 -src_compile() {
102 - emake CC="$(tc-getCC)"
103 - if use doc ; then
104 - halibut --text --html --info --pdf --ps puzzles.but
105 - fi
106 -}
107 -
108 -src_install() {
109 - dodir "${GAMES_BINDIR}"
110 - emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install
111 - dodoc README HACKING
112 -
113 - local file name
114 - for file in *.R ; do
115 - [[ ${file} == "nullgame.R" ]] && continue
116 - name=$(awk -F: '/exe:/ { print $3 }' "${file}")
117 - file=${file%.R}
118 - if [[ ${PV} -lt 99999999 ]] ; then
119 - newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png
120 - make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
121 - else
122 - # No icons with the live version
123 - make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}"
124 - fi
125 - done
126 -
127 - dodoc puzzles.txt puzzles.chm
128 - if use doc ; then
129 - dohtml *.html
130 - doinfo puzzles.info
131 - dodoc puzzles.pdf puzzles.ps
132 - fi
133 -
134 - prepgamesdirs
135 -}
136 -
137 -pkg_preinst() {
138 - games_pkg_preinst
139 - [[ ${PV} -lt 99999999 ]] && gnome2_icon_savelist
140 -}
141 -
142 -pkg_postinst() {
143 - games_pkg_postinst
144 - [[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update
145 -}
146 -
147 -pkg_postrm() {
148 - [[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update
149 -}