1 |
commit: e62c25e3c92722beaa9526260fb78166ae928455 |
2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
3 |
AuthorDate: Mon Aug 19 21:53:15 2019 +0000 |
4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
5 |
CommitDate: Mon Aug 19 21:53:15 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=e62c25e3 |
7 |
|
8 |
games-puzzle/numptyphysics: fix |
9 |
|
10 |
.../files/numptyphysics-142-ownbox2d.patch | 102 --------------------- |
11 |
.../numptyphysics/numptyphysics-142.ebuild | 48 ---------- |
12 |
.../numptyphysics/numptyphysics-9999.ebuild | 29 ++++++ |
13 |
3 files changed, 29 insertions(+), 150 deletions(-) |
14 |
|
15 |
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-142-ownbox2d.patch b/games-puzzle/numptyphysics/files/numptyphysics-142-ownbox2d.patch |
16 |
deleted file mode 100644 |
17 |
index 1974966..0000000 |
18 |
--- a/games-puzzle/numptyphysics/files/numptyphysics-142-ownbox2d.patch |
19 |
+++ /dev/null |
20 |
@@ -1,102 +0,0 @@ |
21 |
-diff -Naur trunkO/Makefile.am trunkO-p/Makefile.am |
22 |
---- trunkO/Makefile.am 2009-10-12 17:31:07.000000000 +0200 |
23 |
-+++ trunkO-p/Makefile.am 2009-10-12 18:25:01.000000000 +0200 |
24 |
-@@ -1,6 +1,6 @@ |
25 |
- bin_PROGRAMS = numptyphysics |
26 |
--noinst_LIBRARIES = libbox2d.a |
27 |
--INCLUDES = -IBox2D/Include |
28 |
-+noinst_LIBRARIES = |
29 |
-+INCLUDES = -I/usr/include/Box2D/ |
30 |
- |
31 |
- numptyphysicsdir = $(datadir)/numptyphysics |
32 |
- |
33 |
-@@ -33,7 +33,7 @@ |
34 |
- OsWin32.cpp |
35 |
- |
36 |
- numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS) |
37 |
--numptyphysics_LDADD = libbox2d.a $(SDL_LIBS) $(HILDON_LIBS) |
38 |
-+numptyphysics_LDADD = -lbox2d $(SDL_LIBS) $(HILDON_LIBS) |
39 |
- |
40 |
- numptyphysics_DATA = \ |
41 |
- data/C01_Tutorial.npz \ |
42 |
-@@ -47,37 +47,3 @@ |
43 |
- data/theend.png \ |
44 |
- data/femkeklaver.ttf |
45 |
- |
46 |
-- |
47 |
--libbox2d_a_SOURCES = \ |
48 |
-- Box2D/Source/Collision/b2Distance.cpp \ |
49 |
-- Box2D/Source/Collision/b2TimeOfImpact.cpp \ |
50 |
-- Box2D/Source/Collision/b2CollideCircle.cpp \ |
51 |
-- Box2D/Source/Collision/b2CollidePoly.cpp \ |
52 |
-- Box2D/Source/Collision/Shapes/b2PolygonShape.cpp \ |
53 |
-- Box2D/Source/Collision/Shapes/b2CircleShape.cpp \ |
54 |
-- Box2D/Source/Collision/Shapes/b2Shape.cpp \ |
55 |
-- Box2D/Source/Collision/b2PairManager.cpp \ |
56 |
-- Box2D/Source/Collision/b2Collision.cpp \ |
57 |
-- Box2D/Source/Collision/b2BroadPhase.cpp \ |
58 |
-- Box2D/Source/Dynamics/b2WorldCallbacks.cpp \ |
59 |
-- Box2D/Source/Dynamics/Joints/b2PrismaticJoint.cpp \ |
60 |
-- Box2D/Source/Dynamics/Joints/b2MouseJoint.cpp \ |
61 |
-- Box2D/Source/Dynamics/Joints/b2GearJoint.cpp \ |
62 |
-- Box2D/Source/Dynamics/Joints/b2Joint.cpp \ |
63 |
-- Box2D/Source/Dynamics/Joints/b2PulleyJoint.cpp \ |
64 |
-- Box2D/Source/Dynamics/Joints/b2DistanceJoint.cpp \ |
65 |
-- Box2D/Source/Dynamics/Joints/b2RevoluteJoint.cpp \ |
66 |
-- Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp \ |
67 |
-- Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp \ |
68 |
-- Box2D/Source/Dynamics/Contacts/b2Contact.cpp \ |
69 |
-- Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp \ |
70 |
-- Box2D/Source/Dynamics/Contacts/b2ContactSolver.cpp \ |
71 |
-- Box2D/Source/Dynamics/b2Island.cpp \ |
72 |
-- Box2D/Source/Dynamics/b2Body.cpp \ |
73 |
-- Box2D/Source/Dynamics/b2ContactManager.cpp \ |
74 |
-- Box2D/Source/Dynamics/b2World.cpp \ |
75 |
-- Box2D/Source/Common/b2BlockAllocator.cpp \ |
76 |
-- Box2D/Source/Common/b2StackAllocator.cpp \ |
77 |
-- Box2D/Source/Common/b2Settings.cpp \ |
78 |
-- Box2D/Source/Common/b2Math.cpp |
79 |
-- |
80 |
-diff -Naur trunkO/Makefile.in trunkO-p/Makefile.in |
81 |
---- trunkO/Makefile.in 2009-10-12 17:31:07.000000000 +0200 |
82 |
-+++ trunkO-p/Makefile.in 2009-10-12 18:16:05.000000000 +0200 |
83 |
-@@ -87,7 +87,7 @@ |
84 |
- numptyphysics-OsWin32.$(OBJEXT) |
85 |
- numptyphysics_OBJECTS = $(am_numptyphysics_OBJECTS) |
86 |
- am__DEPENDENCIES_1 = |
87 |
--numptyphysics_DEPENDENCIES = libbox2d.a $(am__DEPENDENCIES_1) \ |
88 |
-+numptyphysics_DEPENDENCIES = -lbox2d $(am__DEPENDENCIES_1) \ |
89 |
- $(am__DEPENDENCIES_1) |
90 |
- DEFAULT_INCLUDES = -I.@am__isrc@ |
91 |
- depcomp = $(SHELL) $(top_srcdir)/depcomp |
92 |
-@@ -97,8 +97,8 @@ |
93 |
- CXXLD = $(CXX) |
94 |
- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ |
95 |
- -o $@ |
96 |
--SOURCES = $(libbox2d_a_SOURCES) $(numptyphysics_SOURCES) |
97 |
--DIST_SOURCES = $(libbox2d_a_SOURCES) $(numptyphysics_SOURCES) |
98 |
-+SOURCES = $(numptyphysics_SOURCES) |
99 |
-+DIST_SOURCES = $(numptyphysics_SOURCES) |
100 |
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
101 |
- am__vpath_adj = case $$p in \ |
102 |
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
103 |
-@@ -230,8 +230,8 @@ |
104 |
- top_build_prefix = @top_build_prefix@ |
105 |
- top_builddir = @top_builddir@ |
106 |
- top_srcdir = @top_srcdir@ |
107 |
--noinst_LIBRARIES = libbox2d.a |
108 |
--INCLUDES = -IBox2D/Include |
109 |
-+noinst_LIBRARIES = |
110 |
-+INCLUDES = -I/usr/include/Box2D |
111 |
- numptyphysicsdir = $(datadir)/numptyphysics |
112 |
- desktopentry_DATA = data/numptyphysics.desktop |
113 |
- serviceentry_DATA = data/numptyphysics.service |
114 |
-@@ -261,7 +261,7 @@ |
115 |
- OsWin32.cpp |
116 |
- |
117 |
- numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS) |
118 |
--numptyphysics_LDADD = libbox2d.a $(SDL_LIBS) $(HILDON_LIBS) |
119 |
-+numptyphysics_LDADD = -lbox2d $(SDL_LIBS) $(HILDON_LIBS) |
120 |
- numptyphysics_DATA = \ |
121 |
- data/C01_Tutorial.npz \ |
122 |
- data/C10_Standard.npz \ |
123 |
|
124 |
diff --git a/games-puzzle/numptyphysics/numptyphysics-142.ebuild b/games-puzzle/numptyphysics/numptyphysics-142.ebuild |
125 |
deleted file mode 100644 |
126 |
index 698078a..0000000 |
127 |
--- a/games-puzzle/numptyphysics/numptyphysics-142.ebuild |
128 |
+++ /dev/null |
129 |
@@ -1,48 +0,0 @@ |
130 |
-# Copyright 1999-2009 Gentoo Foundation |
131 |
-# Distributed under the terms of the GNU General Public License v2 |
132 |
-# $Header: $ |
133 |
- |
134 |
-EAPI=2 |
135 |
- |
136 |
-inherit games subversion |
137 |
- |
138 |
-ESVN_REPO_URI="https://vcs.maemo.org/svn/numptyphysics/trunk" |
139 |
-if [[ "$PV" != "9999" ]] ; then |
140 |
- ESVN_REVISION="$PV" |
141 |
-fi |
142 |
- |
143 |
-DESCRIPTION="a drawing puzzle game in the spirit of Crayon Physics using the same excellent Box2D engine" |
144 |
-HOMEPAGE="http://numptyphysics.garage.maemo.org/" |
145 |
- |
146 |
-LICENSE="GPL-3" |
147 |
-SLOT="0" |
148 |
-KEYWORDS="~amd64 ~x86" |
149 |
-IUSE="" |
150 |
- |
151 |
-RDEPEND="media-libs/libsdl |
152 |
- media-libs/sdl-image[png] |
153 |
- media-libs/sdl-ttf |
154 |
- x11-libs/libX11 |
155 |
- dev-libs/box2d |
156 |
- sys-libs/zlib" |
157 |
-DEPEND="${RDEPEND}" |
158 |
- |
159 |
-src_prepare() { |
160 |
- epatch ${FILESDIR}/"${P}-ownbox2d.patch" |
161 |
- sed -i -e "s:/usr/share/numptyphysics:"${GAMES_DATADIR}"/"${PN}"/:g" -i Config.h || die 'sed failed' |
162 |
-} |
163 |
- |
164 |
-src_configure() { |
165 |
- egamesconf --disable-hildon || die "egamesconf failed" |
166 |
-} |
167 |
- |
168 |
-src_install() { |
169 |
- emake DESTDIR="${D}" install || die "Install failed" |
170 |
- doicon data/icon64/${PN}.png |
171 |
- make_desktop_entry "${PN}" "${PN}" |
172 |
- prepgamesdirs |
173 |
-} |
174 |
- |
175 |
-pkg_preinst() { |
176 |
- games_pkg_postinst |
177 |
-} |
178 |
|
179 |
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild |
180 |
new file mode 100644 |
181 |
index 0000000..c867411 |
182 |
--- /dev/null |
183 |
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild |
184 |
@@ -0,0 +1,29 @@ |
185 |
+# Copyright 1999-2019 Gentoo Authors |
186 |
+# Distributed under the terms of the GNU General Public License v2 |
187 |
+ |
188 |
+EAPI=7 |
189 |
+ |
190 |
+inherit git-r3 |
191 |
+ |
192 |
+EGIT_REPO_URI="https://github.com/thp/numptyphysics" |
193 |
+ |
194 |
+DESCRIPTION="A drawing puzzle game in the spirit of Crayon Physics" |
195 |
+HOMEPAGE="https://github.com/thp/numptyphysics" |
196 |
+ |
197 |
+LICENSE="GPL-3" |
198 |
+SLOT="0" |
199 |
+ |
200 |
+RDEPEND="media-libs/libsdl |
201 |
+ media-libs/sdl-image[png] |
202 |
+ media-libs/sdl-ttf |
203 |
+ x11-libs/libX11 |
204 |
+ dev-libs/box2d |
205 |
+ sys-libs/zlib" |
206 |
+DEPEND="${RDEPEND}" |
207 |
+ |
208 |
+src_prepare() { |
209 |
+ sed -r \ |
210 |
+ -e '/git describe/s@--tags@--always@' \ |
211 |
+ -i makefile |
212 |
+ default |
213 |
+} |