1 |
commit: e7dae32d5f17951e2f55815f074ceb251c633d69 |
2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 7 06:32:54 2017 +0000 |
4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 7 06:36:37 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7dae32d |
7 |
|
8 |
games-puzzle/sgt-puzzles: Stabilize 20170314, drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
games-puzzle/sgt-puzzles/Manifest | 1 - |
13 |
.../sgt-puzzles/sgt-puzzles-20170228.ebuild | 113 --------------------- |
14 |
.../sgt-puzzles/sgt-puzzles-20170314.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 115 deletions(-) |
16 |
|
17 |
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest |
18 |
index 2359e3454b5..519638ae6ad 100644 |
19 |
--- a/games-puzzle/sgt-puzzles/Manifest |
20 |
+++ b/games-puzzle/sgt-puzzles/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST puzzles-20170228.1f613ba.tar.gz 2898117 SHA256 e53bf0800daae37c9be25fd260b0010a44178ca7a5ccc70b29b96fe85060d80a SHA512 41d73461984c589ed18ca2a8cab3871e87a1b56b2d38a8b11c0cb95150423cecbf5ddb76a2e9db4b9109980576527ae2fa7d2663e41dceee8847efc0044766b2 WHIRLPOOL 482c88b96d97878708771ccb6aacd38de527787e0a2ca9c6ba16ef48f917d0f269022530e849cfbc5ec74a04753f0aea42dd20a76a24bbd804566b1c07131e88 |
23 |
DIST puzzles-20170314.eedea41.tar.gz 2897824 SHA256 57c156fa7de2605a4ae0f18e54ce20ef4e08b8faf32d26eccf5a7fa545940fa8 SHA512 ef7d12e0e20aef487a18b572a4464f3e23b226fae599cc22fdb34348f6c3baf3dcd21207c8fedef0ac3a6c4344b13e520767efef8830aaa2ad4b914285f8aa3c WHIRLPOOL 17b069ae171497212411ed6696fafd00108064f3a28ce38925a4fc6d9040e3d072a14920b024c329e597fe1fdedc9723089ea5c17d7df9226ac45ba612a1de70 |
24 |
DIST sgt-puzzles-icons-20160315.tar.xz 715536 SHA256 9ddc1b6d02b3c3358a9bc6b17c7070650f794cf5f650f25b2ac7e5def6674447 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57 WHIRLPOOL 17bdadc9519320bc88af27f2db7a9c243f04d80e524db51ad9398831185e2c66f2430006c324fa7d5b70ce156cb9df93d9405216053b32101b5f56035a60f6ac |
25 |
|
26 |
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild |
27 |
deleted file mode 100644 |
28 |
index 9b10bce098b..00000000000 |
29 |
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,113 +0,0 @@ |
32 |
-# Copyright 1999-2017 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=6 |
36 |
- |
37 |
-inherit eutils gnome2-utils toolchain-funcs autotools |
38 |
- |
39 |
-if [[ ${PV} == "99999999" ]] ; then |
40 |
- inherit git-r3 |
41 |
- EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git" |
42 |
- GENTOO_ICONS="20160315" |
43 |
- SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz" |
44 |
- KEYWORDS="" |
45 |
-else |
46 |
- MAGIC=1f613ba |
47 |
- SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz" |
48 |
- S=${WORKDIR}/puzzles-${PV}.${MAGIC} |
49 |
- KEYWORDS="amd64 x86" |
50 |
-fi |
51 |
- |
52 |
-DESCRIPTION="Simon Tatham's Portable Puzzle Collection" |
53 |
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" |
54 |
- |
55 |
-LICENSE="MIT" |
56 |
-SLOT="0" |
57 |
-IUSE="+doc gtk3" |
58 |
- |
59 |
-COMMON_DEPEND=" |
60 |
- !gtk3? ( x11-libs/gtk+:2 ) |
61 |
- gtk3? ( x11-libs/gtk+:3 )" |
62 |
- |
63 |
-RDEPEND="${COMMON_DEPEND} |
64 |
- x11-misc/xdg-utils" # Used by builtin help patch |
65 |
- |
66 |
-DEPEND="${COMMON_DEPEND} |
67 |
- dev-lang/perl |
68 |
- virtual/pkgconfig |
69 |
- doc? ( >=app-doc/halibut-1.0 )" |
70 |
- |
71 |
-PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" ) |
72 |
- |
73 |
-src_unpack() { |
74 |
- default |
75 |
- if [[ ${PV} == "99999999" ]]; then |
76 |
- git-r3_src_unpack |
77 |
- fi |
78 |
-} |
79 |
- |
80 |
-src_prepare() { |
81 |
- default |
82 |
- |
83 |
- sed -i \ |
84 |
- -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \ |
85 |
- -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \ |
86 |
- mkfiles.pl || die |
87 |
- ./mkfiles.pl || die |
88 |
- eautoreconf |
89 |
- |
90 |
- # Import icons from latest Gentoo tarball for live |
91 |
- if [[ ${PV} == "99999999" ]]; then |
92 |
- cp -R ../${PN}-icons/icons . || die |
93 |
- fi |
94 |
-} |
95 |
- |
96 |
-src_configure() { |
97 |
- econf \ |
98 |
- --program-prefix="${PN}_" \ |
99 |
- --with-gtk=$(usex gtk3 3 2) |
100 |
-} |
101 |
- |
102 |
-src_compile() { |
103 |
- emake CC="$(tc-getCC)" |
104 |
- if use doc ; then |
105 |
- halibut --text --html --info --pdf --ps puzzles.but || die |
106 |
- fi |
107 |
-} |
108 |
- |
109 |
-src_install() { |
110 |
- default |
111 |
- |
112 |
- local file name |
113 |
- for file in *.R ; do |
114 |
- [[ ${file} == "nullgame.R" ]] && continue |
115 |
- name=$(awk -F: '/exe:/ { print $3 }' "${file}") |
116 |
- file=${file%.R} |
117 |
- newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png |
118 |
- make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};" |
119 |
- done |
120 |
- |
121 |
- if use doc ; then |
122 |
- DOCS=( puzzles.{pdf,ps,txt} ) |
123 |
- HTML_DOCS=( *.html ) |
124 |
- einstalldocs |
125 |
- doinfo puzzles.info{,-1,-2,-3} |
126 |
- fi |
127 |
- |
128 |
- insinto /etc/xdg/menus/applications-merged |
129 |
- doins "${FILESDIR}/${PN}.menu" |
130 |
- insinto /usr/share/desktop-directories |
131 |
- doins "${FILESDIR}/${PN}.directory" |
132 |
-} |
133 |
- |
134 |
-pkg_preinst() { |
135 |
- gnome2_icon_savelist |
136 |
-} |
137 |
- |
138 |
-pkg_postinst() { |
139 |
- gnome2_icon_cache_update |
140 |
-} |
141 |
- |
142 |
-pkg_postrm() { |
143 |
- gnome2_icon_cache_update |
144 |
-} |
145 |
|
146 |
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild |
147 |
index 824c7f94307..ec67b9f3b61 100644 |
148 |
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild |
149 |
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170314.ebuild |
150 |
@@ -15,7 +15,7 @@ else |
151 |
MAGIC=eedea41 |
152 |
SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz" |
153 |
S=${WORKDIR}/puzzles-${PV}.${MAGIC} |
154 |
- KEYWORDS="~amd64 ~x86" |
155 |
+ KEYWORDS="amd64 x86" |
156 |
fi |
157 |
|
158 |
DESCRIPTION="Simon Tatham's Portable Puzzle Collection" |