summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-action/poopmup')
-rw-r--r--games-action/poopmup/ChangeLog6
-rw-r--r--games-action/poopmup/Manifest5
-rw-r--r--games-action/poopmup/files/poopmup-1.2-ldflags.patch11
-rw-r--r--games-action/poopmup/poopmup-1.2.ebuild10
4 files changed, 24 insertions, 8 deletions
diff --git a/games-action/poopmup/ChangeLog b/games-action/poopmup/ChangeLog
index 79af7d4e8e64..166d1584c694 100644
--- a/games-action/poopmup/ChangeLog
+++ b/games-action/poopmup/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/poopmup
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.14 2010/09/16 16:48:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.15 2010/09/30 22:09:19 tupone Exp $
+
+ 30 Sep 2010; Tupone Alfredo <tupone@gentoo.org> poopmup-1.2.ebuild,
+ +files/poopmup-1.2-ldflags.patch:
+ Respect LDFLAGS. Bug #337424 by flameeyes@gentoo.org
16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> poopmup-1.2.ebuild:
virtual/glut -> media-libs/glut
diff --git a/games-action/poopmup/Manifest b/games-action/poopmup/Manifest
index af578e53c7d6..9a77ad5d84d8 100644
--- a/games-action/poopmup/Manifest
+++ b/games-action/poopmup/Manifest
@@ -1,6 +1,7 @@
AUX poopmup-1.2-freeglut.patch 245 RMD160 f7f98e107e79e83f78df4186f1ac88f23a0c452e SHA1 35079967586ffa4d421d9580a42dad2a50041bfc SHA256 914b2504fc3e02f62db8f63bc71959af7bdafb5a150c3f9e524aa75a2f617f46
AUX poopmup-1.2-gcc43.patch 831 RMD160 f969978c869103c60a89f9e92c7fd5687250e491 SHA1 c75942f50b913d100cccb2b61b80f362bcc6a852 SHA256 372179a27405962d21306bb08cfc68c7ad06d188d38cbf8ed1e823ba52bc839a
+AUX poopmup-1.2-ldflags.patch 358 RMD160 35d8dffd817c7511b7be4575d2a416e4052aa2ec SHA1 2ce182d7e40ec43a95b35d46ac7de93d22436022 SHA256 983884c05ac27fcfac4f61cc6eb0bfceac49f582bd7ab8000aa8426d8d90a787
DIST poopmup-1.2.tar.gz 1461794 RMD160 e8efd4af5d62502b289a532ca9698eac598c915a SHA1 efc857c5f6a73bca81ea1f3da2f9a2c24fa748be SHA256 d2f1515c981d49e18fba6f6d7b4ab354d21def62587eab8dcb048c9eb8a7ff3b
-EBUILD poopmup-1.2.ebuild 1369 RMD160 6a286364713dcc7876ff4047c82d4ff61b6f6b4d SHA1 bfe95bb68abc1a137660c50b267319708b003ec4 SHA256 421691e00abc05335b5d668f655ee8e135b5740264824e1d86b49b0299357422
-MISC ChangeLog 1769 RMD160 02af1e6dc65dec7ebf7e1d280f4baa4b4fbc3489 SHA1 384c524b0645e780a3616821201162a59019f7fe SHA256 993e5ba9a5218e9a838fc105a002858a02dcfc4274764c9d5d80eaa7f71e328d
+EBUILD poopmup-1.2.ebuild 1389 RMD160 ba1ea469b0169ea92c8b89579359d21464fc37f5 SHA1 5544e47c0a5ef4cf4385b43703a35a043cc0f739 SHA256 21e046c8cb5d999e2452292b910c27d1659688e95bb9c6f7bfb0bc190bea5155
+MISC ChangeLog 1928 RMD160 e52d86f86252fcee1f2098062059d2a7676ac031 SHA1 ed44b6eca9b1d4c4454b15a11efd5d0fa6c3bb88 SHA256 d3a8a50370428c9f972c805fd4a66d753082ba6e016d18f36d105d216d241153
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-action/poopmup/files/poopmup-1.2-ldflags.patch b/games-action/poopmup/files/poopmup-1.2-ldflags.patch
new file mode 100644
index 000000000000..e831a4fc34dd
--- /dev/null
+++ b/games-action/poopmup/files/poopmup-1.2-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old 2010-10-01 00:05:06.000000000 +0200
++++ Makefile 2010-10-01 00:05:30.000000000 +0200
+@@ -7,7 +7,7 @@
+ OBJ =poopmup.o
+
+ all:
+- $(CC) $(SOURCE) -o $(OBJ) -lglut -lGL -lGLU -L/usr/X11R6/lib -lXmu -lXext -lXt -lXi -lX11
++ $(CC) $(LDFLAGS) $(SOURCE) -o $(OBJ) -lglut -lGL -lGLU -L/usr/X11R6/lib -lXmu -lXext -lXt -lXi -lX11
+
+
+ clean:
diff --git a/games-action/poopmup/poopmup-1.2.ebuild b/games-action/poopmup/poopmup-1.2.ebuild
index d587be9d25c3..6fbd083084bc 100644
--- a/games-action/poopmup/poopmup-1.2.ebuild
+++ b/games-action/poopmup/poopmup-1.2.ebuild
@@ -1,6 +1,7 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.17 2010/09/16 16:48:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.18 2010/09/30 22:09:19 tupone Exp $
+EAPI="2"
inherit eutils toolchain-funcs games
@@ -21,9 +22,7 @@ DEPEND="media-libs/freeglut
S=${WORKDIR}/${PN}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
sed -i \
-e "s:textures/:${GAMES_DATADIR}/${PN}/:" \
includes/textureLoader.h || die "sed failed"
@@ -36,7 +35,8 @@ src_unpack() {
epatch \
"${FILESDIR}"/${P}-freeglut.patch \
- "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-ldflags.patch
ecvs_clean
}