commit: e62c25e3c92722beaa9526260fb78166ae928455 Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> AuthorDate: Mon Aug 19 21:53:15 2019 +0000 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> CommitDate: Mon Aug 19 21:53:15 2019 +0000 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=e62c25e3
games-puzzle/numptyphysics: fix .../files/numptyphysics-142-ownbox2d.patch | 102 --------------------- .../numptyphysics/numptyphysics-142.ebuild | 48 ---------- .../numptyphysics/numptyphysics-9999.ebuild | 29 ++++++ 3 files changed, 29 insertions(+), 150 deletions(-) diff --git a/games-puzzle/numptyphysics/files/numptyphysics-142-ownbox2d.patch b/games-puzzle/numptyphysics/files/numptyphysics-142-ownbox2d.patch deleted file mode 100644 index 1974966..0000000 --- a/games-puzzle/numptyphysics/files/numptyphysics-142-ownbox2d.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Naur trunkO/Makefile.am trunkO-p/Makefile.am ---- trunkO/Makefile.am 2009-10-12 17:31:07.000000000 +0200 -+++ trunkO-p/Makefile.am 2009-10-12 18:25:01.000000000 +0200 -@@ -1,6 +1,6 @@ - bin_PROGRAMS = numptyphysics --noinst_LIBRARIES = libbox2d.a --INCLUDES = -IBox2D/Include -+noinst_LIBRARIES = -+INCLUDES = -I/usr/include/Box2D/ - - numptyphysicsdir = $(datadir)/numptyphysics - -@@ -33,7 +33,7 @@ - OsWin32.cpp - - numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS) --numptyphysics_LDADD = libbox2d.a $(SDL_LIBS) $(HILDON_LIBS) -+numptyphysics_LDADD = -lbox2d $(SDL_LIBS) $(HILDON_LIBS) - - numptyphysics_DATA = \ - data/C01_Tutorial.npz \ -@@ -47,37 +47,3 @@ - data/theend.png \ - data/femkeklaver.ttf - -- --libbox2d_a_SOURCES = \ -- Box2D/Source/Collision/b2Distance.cpp \ -- Box2D/Source/Collision/b2TimeOfImpact.cpp \ -- Box2D/Source/Collision/b2CollideCircle.cpp \ -- Box2D/Source/Collision/b2CollidePoly.cpp \ -- Box2D/Source/Collision/Shapes/b2PolygonShape.cpp \ -- Box2D/Source/Collision/Shapes/b2CircleShape.cpp \ -- Box2D/Source/Collision/Shapes/b2Shape.cpp \ -- Box2D/Source/Collision/b2PairManager.cpp \ -- Box2D/Source/Collision/b2Collision.cpp \ -- Box2D/Source/Collision/b2BroadPhase.cpp \ -- Box2D/Source/Dynamics/b2WorldCallbacks.cpp \ -- Box2D/Source/Dynamics/Joints/b2PrismaticJoint.cpp \ -- Box2D/Source/Dynamics/Joints/b2MouseJoint.cpp \ -- Box2D/Source/Dynamics/Joints/b2GearJoint.cpp \ -- Box2D/Source/Dynamics/Joints/b2Joint.cpp \ -- Box2D/Source/Dynamics/Joints/b2PulleyJoint.cpp \ -- Box2D/Source/Dynamics/Joints/b2DistanceJoint.cpp \ -- Box2D/Source/Dynamics/Joints/b2RevoluteJoint.cpp \ -- Box2D/Source/Dynamics/Contacts/b2CircleContact.cpp \ -- Box2D/Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp \ -- Box2D/Source/Dynamics/Contacts/b2Contact.cpp \ -- Box2D/Source/Dynamics/Contacts/b2PolyContact.cpp \ -- Box2D/Source/Dynamics/Contacts/b2ContactSolver.cpp \ -- Box2D/Source/Dynamics/b2Island.cpp \ -- Box2D/Source/Dynamics/b2Body.cpp \ -- Box2D/Source/Dynamics/b2ContactManager.cpp \ -- Box2D/Source/Dynamics/b2World.cpp \ -- Box2D/Source/Common/b2BlockAllocator.cpp \ -- Box2D/Source/Common/b2StackAllocator.cpp \ -- Box2D/Source/Common/b2Settings.cpp \ -- Box2D/Source/Common/b2Math.cpp -- -diff -Naur trunkO/Makefile.in trunkO-p/Makefile.in ---- trunkO/Makefile.in 2009-10-12 17:31:07.000000000 +0200 -+++ trunkO-p/Makefile.in 2009-10-12 18:16:05.000000000 +0200 -@@ -87,7 +87,7 @@ - numptyphysics-OsWin32.$(OBJEXT) - numptyphysics_OBJECTS = $(am_numptyphysics_OBJECTS) - am__DEPENDENCIES_1 = --numptyphysics_DEPENDENCIES = libbox2d.a $(am__DEPENDENCIES_1) \ -+numptyphysics_DEPENDENCIES = -lbox2d $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp -@@ -97,8 +97,8 @@ - CXXLD = $(CXX) - CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ --SOURCES = $(libbox2d_a_SOURCES) $(numptyphysics_SOURCES) --DIST_SOURCES = $(libbox2d_a_SOURCES) $(numptyphysics_SOURCES) -+SOURCES = $(numptyphysics_SOURCES) -+DIST_SOURCES = $(numptyphysics_SOURCES) - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; - am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -@@ -230,8 +230,8 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --noinst_LIBRARIES = libbox2d.a --INCLUDES = -IBox2D/Include -+noinst_LIBRARIES = -+INCLUDES = -I/usr/include/Box2D - numptyphysicsdir = $(datadir)/numptyphysics - desktopentry_DATA = data/numptyphysics.desktop - serviceentry_DATA = data/numptyphysics.service -@@ -261,7 +261,7 @@ - OsWin32.cpp - - numptyphysics_CPPFLAGS = -IXX $(SDL_CFLAGS) $(HILDON_CFLAGS) --numptyphysics_LDADD = libbox2d.a $(SDL_LIBS) $(HILDON_LIBS) -+numptyphysics_LDADD = -lbox2d $(SDL_LIBS) $(HILDON_LIBS) - numptyphysics_DATA = \ - data/C01_Tutorial.npz \ - data/C10_Standard.npz \ diff --git a/games-puzzle/numptyphysics/numptyphysics-142.ebuild b/games-puzzle/numptyphysics/numptyphysics-142.ebuild deleted file mode 100644 index 698078a..0000000 --- a/games-puzzle/numptyphysics/numptyphysics-142.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit games subversion - -ESVN_REPO_URI="https://vcs.maemo.org/svn/numptyphysics/trunk"; -if [[ "$PV" != "9999" ]] ; then - ESVN_REVISION="$PV" -fi - -DESCRIPTION="a drawing puzzle game in the spirit of Crayon Physics using the same excellent Box2D engine" -HOMEPAGE="http://numptyphysics.garage.maemo.org/"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/libsdl - media-libs/sdl-image[png] - media-libs/sdl-ttf - x11-libs/libX11 - dev-libs/box2d - sys-libs/zlib" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch ${FILESDIR}/"${P}-ownbox2d.patch" - sed -i -e "s:/usr/share/numptyphysics:"${GAMES_DATADIR}"/"${PN}"/:g" -i Config.h || die 'sed failed' -} - -src_configure() { - egamesconf --disable-hildon || die "egamesconf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" - doicon data/icon64/${PN}.png - make_desktop_entry "${PN}" "${PN}" - prepgamesdirs -} - -pkg_preinst() { - games_pkg_postinst -} diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild new file mode 100644 index 0000000..c867411 --- /dev/null +++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit git-r3 + +EGIT_REPO_URI="https://github.com/thp/numptyphysics"; + +DESCRIPTION="A drawing puzzle game in the spirit of Crayon Physics" +HOMEPAGE="https://github.com/thp/numptyphysics"; + +LICENSE="GPL-3" +SLOT="0" + +RDEPEND="media-libs/libsdl + media-libs/sdl-image[png] + media-libs/sdl-ttf + x11-libs/libX11 + dev-libs/box2d + sys-libs/zlib" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -r \ + -e '/git describe/s@--tags@--always@' \ + -i makefile + default +}
