Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-puzzle/sgt-puzzles: ChangeLog sgt-puzzles-8906.ebuild sgt-puzzles-99999999.ebuild
Date: Tue, 29 Jun 2010 17:09:50
Message-Id: 20100629170947.59E3B2C621@corvid.gentoo.org
1 mr_bones_ 10/06/29 17:09:47
2
3 Modified: ChangeLog sgt-puzzles-8906.ebuild
4 sgt-puzzles-99999999.ebuild
5 Log:
6 Fix building with live ebuild (bug #323629); honor CC and LDFLAGS; make release and live ebuild converge a bit more
7 (Portage version: 2.1.8.3/cvs/Linux i686)
8
9 Revision Changes Path
10 1.4 games-puzzle/sgt-puzzles/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog?r1=1.3&r2=1.4
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- ChangeLog 1 Apr 2010 16:41:45 -0000 1.3
23 +++ ChangeLog 29 Jun 2010 17:09:46 -0000 1.4
24 @@ -1,6 +1,11 @@
25 # ChangeLog for games-puzzle/sgt-puzzles
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.3 2010/04/01 16:41:45 mr_bones_ Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/ChangeLog,v 1.4 2010/06/29 17:09:46 mr_bones_ Exp $
29 +
30 + 29 Jun 2010; Michael Sterrett <mr_bones_@g.o>
31 + sgt-puzzles-8906.ebuild, sgt-puzzles-99999999.ebuild:
32 + Fix building with live ebuild (bug #323629); honor CC and LDFLAGS; make
33 + release and live ebuild converge a bit more
34
35 *sgt-puzzles-8906 (01 Apr 2010)
36
37
38
39
40 1.2 games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild?r1=1.1&r2=1.2
45
46 Index: sgt-puzzles-8906.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- sgt-puzzles-8906.ebuild 1 Apr 2010 16:41:45 -0000 1.1
53 +++ sgt-puzzles-8906.ebuild 29 Jun 2010 17:09:46 -0000 1.2
54 @@ -1,11 +1,11 @@
55 # Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild,v 1.1 2010/04/01 16:41:45 mr_bones_ Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-8906.ebuild,v 1.2 2010/06/29 17:09:46 mr_bones_ Exp $
59
60 EAPI=2
61 -inherit eutils games
62 +inherit eutils toolchain-funcs games
63 if [[ ${PV} == "99999999" ]] ; then
64 - ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles/trunk"
65 + ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles"
66 inherit subversion
67 SRC_URI=""
68 KEYWORDS=""
69 @@ -24,6 +24,7 @@
70
71 RDEPEND="x11-libs/gtk+:2"
72 DEPEND="${RDEPEND}
73 + dev-lang/perl
74 dev-util/pkgconfig
75 doc? ( >=app-doc/halibut-1.0 )"
76
77 @@ -37,7 +38,7 @@
78 }
79
80 src_compile() {
81 - emake || die
82 + emake CC="$(tc-getCC)" || die
83 if use doc ; then
84 halibut --text --html --info --pdf --ps puzzles.but
85 fi
86 @@ -53,8 +54,13 @@
87 [[ ${file} == "nullgame.R" ]] && continue
88 name=$(sed -n 's/^[a-z]*\.exe://p' "${file}")
89 file=${file%.R}
90 - newicon icons/${file}-48d24.png ${PN}-${file}.png || die
91 - make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
92 + if [[ ${PV} -lt 99999999 ]] ; then
93 + newicon icons/${file}-48d24.png ${PN}-${file}.png || die
94 + make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
95 + else
96 + # No icons with the live version
97 + make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}"
98 + fi
99 done
100
101 dodoc puzzles.txt puzzles.chm
102
103
104
105 1.4 games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
106
107 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild?rev=1.4&view=markup
108 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild?rev=1.4&content-type=text/plain
109 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild?r1=1.3&r2=1.4
110
111 Index: sgt-puzzles-99999999.ebuild
112 ===================================================================
113 RCS file: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild,v
114 retrieving revision 1.3
115 retrieving revision 1.4
116 diff -u -r1.3 -r1.4
117 --- sgt-puzzles-99999999.ebuild 2 Apr 2010 18:23:47 -0000 1.3
118 +++ sgt-puzzles-99999999.ebuild 29 Jun 2010 17:09:46 -0000 1.4
119 @@ -1,11 +1,11 @@
120 # Copyright 1999-2010 Gentoo Foundation
121 # Distributed under the terms of the GNU General Public License v2
122 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild,v 1.3 2010/04/02 18:23:47 mr_bones_ Exp $
123 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild,v 1.4 2010/06/29 17:09:46 mr_bones_ Exp $
124
125 EAPI=2
126 inherit eutils toolchain-funcs games
127 if [[ ${PV} == "99999999" ]] ; then
128 - ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles/trunk"
129 + ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles"
130 inherit subversion
131 SRC_URI=""
132 KEYWORDS=""
133 @@ -24,15 +24,20 @@
134
135 RDEPEND="x11-libs/gtk+:2"
136 DEPEND="${RDEPEND}
137 + dev-lang/perl
138 dev-util/pkgconfig
139 doc? ( >=app-doc/halibut-1.0 )"
140
141 src_prepare() {
142 sed -i \
143 + -e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
144 + -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
145 + mkfiles.pl \
146 + || die
147 + ./mkfiles.pl
148 + sed -i \
149 -e '1iPKG_CONFIG ?= pkg-config' \
150 -e '/^GTK_CONFIG/s:=.*:= $(PKG_CONFIG) gtk+-2.0:' \
151 - -e 's:= -O2 -Wall -Werror -ansi -pedantic -g:+= $(CPPFLAGS):' \
152 - -e '/LDFLAGS/s:=:=$(LDFLAGS) :' \
153 Makefile || die
154 }
155
156 @@ -46,21 +51,26 @@
157 src_install() {
158 dodir "${GAMES_BINDIR}"
159 emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install || die
160 - dodoc README HACKING
161 + dodoc README
162
163 - local file name size
164 + local file name
165 for file in *.R ; do
166 [[ ${file} == "nullgame.R" ]] && continue
167 name=$(sed -n 's/^[a-z]*\.exe://p' "${file}")
168 file=${file%.R}
169 - newicon icons/${file}-48d24.png ${PN}-${file}.png || die
170 - make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
171 + if [[ ${PV} -lt 99999999 ]] ; then
172 + newicon icons/${file}-48d24.png ${PN}-${file}.png || die
173 + make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
174 + else
175 + # No icons with the live version
176 + make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}"
177 + fi
178 done
179
180 if use doc ; then
181 dohtml *.html
182 doinfo puzzles.info
183 - dodoc puzzles.txt puzzles.pdf puzzles.ps
184 + dodoc puzzles.pdf puzzles.ps puzzles.txt puzzles.chm
185 fi
186
187 prepgamesdirs
Report Message
Find on MARC Find on Google Groups