summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-06-03 07:51:58 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-06-03 07:51:58 +0000
commita2ffa62018e2c9881f2e98ec88715014915cc4d6 (patch)
tree0fedc849cd712787dd102500e00ad15d35c97f9d /games-puzzle/mirrormagic
parentVersion bump. (diff)
downloadhistorical-a2ffa62018e2c9881f2e98ec88715014915cc4d6.tar.gz
historical-a2ffa62018e2c9881f2e98ec88715014915cc4d6.tar.bz2
historical-a2ffa62018e2c9881f2e98ec88715014915cc4d6.zip
Fix parallel make issue. Bug #322363
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-puzzle/mirrormagic')
-rw-r--r--games-puzzle/mirrormagic/ChangeLog6
-rw-r--r--games-puzzle/mirrormagic/Manifest5
-rw-r--r--games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch11
-rw-r--r--games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild3
4 files changed, 21 insertions, 4 deletions
diff --git a/games-puzzle/mirrormagic/ChangeLog b/games-puzzle/mirrormagic/ChangeLog
index c1b2c5d10544..49a245f0960a 100644
--- a/games-puzzle/mirrormagic/ChangeLog
+++ b/games-puzzle/mirrormagic/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/mirrormagic
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.14 2010/05/20 16:57:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.15 2010/06/03 07:51:57 tupone Exp $
+
+ 03 Jun 2010; Tupone Alfredo <tupone@gentoo.org>
+ mirrormagic-2.0.2-r1.ebuild, +files/mirrormagic-2.0.2-parallel.patch:
+ Fix parallel make issue. Bug #322363 by flameeyes@gentoo.org
20 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
mirrormagic-2.0.2-r1.ebuild:
diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
index 6ecb7ce7c6f0..de9c612dfefd 100644
--- a/games-puzzle/mirrormagic/Manifest
+++ b/games-puzzle/mirrormagic/Manifest
@@ -1,8 +1,9 @@
AUX mirrormagic-2.0.2-64bit.patch 888 RMD160 9de7b82dbc56933c685c448fca06250b656ee868 SHA1 1fd32ff1e1118c9d582fe26a81b4f23993749b7d SHA256 7ec4d6ec4c1ecc4b04053a47236ee77475282adbedd03631b15459b0b8b401b5
AUX mirrormagic-2.0.2-gcc41.patch 339 RMD160 d7d8fe4004cf7360a99ddcdf0db2a56e2f55be3c SHA1 beb6a0170e2a749f7826c774c3ca0f2555ae6049 SHA256 ae5e1eee2ed2c37de5d2259d8150b0dace6e6744045989e83b1b0239b6fd0f4f
+AUX mirrormagic-2.0.2-parallel.patch 306 RMD160 6468a11c78fc44994974ab5e361492a5d1b91ff6 SHA1 e6a0da2dc945b97131dee2a2f6389dcd3e996b54 SHA256 6323a7f57cc5125aa1a5bfe2fe5a0ba1111a88883634d4175e2b501a069a63b5
AUX mirrormagic.xpm 6347 RMD160 fad9c381f9fec62f9d8a1c3f7c762ef8ae751e36 SHA1 cf68f03894639de631658e60a7867e7351bada74 SHA256 3c9f65ca677859140d34427d46ff9213c9f928f30157d028be2f590659671f5b
DIST mirrormagic-2.0.2.tar.gz 1168098 RMD160 57de928f2b37575886ddb5cbafcababf9de765dc SHA1 bce7fbf163d5177f59ba4f516b06a3ebb7cc3927 SHA256 79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2
-EBUILD mirrormagic-2.0.2-r1.ebuild 1405 RMD160 074bbf166a0c208a1521785a4f410100174f50d3 SHA1 1e25c703c1792de76aa10565dacef18874137c5e SHA256 944aac4e16c626c46846602876d4f4dfa5c48fe6ae993bb135e8b7cc2f96bb86
+EBUILD mirrormagic-2.0.2-r1.ebuild 1439 RMD160 645e0e39ab3d75e3edc55316af6b6e365fd2d156 SHA1 d2e42072b2ce27418681750f96751c9d66d67529 SHA256 7d4ee50062a77a9c5a7aded049ca7fbd163ba238a112e76cd2bb0673f83071c2
EBUILD mirrormagic-2.0.2.ebuild 1290 RMD160 9ee0c026e7be694bf3e08de9fe94c4bc7f315b3b SHA1 c79c83debf3290466e8ec128b32f8c1edd96e294 SHA256 7cc8d9f877ac28bbd4a45ee70fc12da697a4252c79c5915799527b026abc2885
-MISC ChangeLog 1754 RMD160 8d21d9453f71f6eeda14771076e75a1797b01897 SHA1 381b5b5c66290152160be24af72ea9622c1b438e SHA256 37f9c657a4bc937a72158cb6b727d4e4841391f6023d078966b5612ddc85d0ca
+MISC ChangeLog 1936 RMD160 eb2c1dba34906a9509fc13aee5a76bbcc9aa1f3c SHA1 83623b030afc57f3efeb99e488bca8ab4efb8045 SHA256 93819259586d4dd934b1014d7cbb939ce80dc35c14139f6ae9321b4a1f1d64e3
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
new file mode 100644
index 000000000000..5d5297f3c021
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.old 2010-06-03 09:43:15.000000000 +0200
++++ src/Makefile 2010-06-03 09:43:42.000000000 +0200
+@@ -146,7 +146,7 @@
+ endif
+
+
+-all: libgame_dir $(PROGNAME)
++all: $(PROGNAME)
+
+ $(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
+ $(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
index 0980c015536b..480b2e920ecd 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild,v 1.2 2010/05/20 16:57:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild,v 1.3 2010/06/03 07:51:57 tupone Exp $
EAPI=2
inherit eutils toolchain-funcs games
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-gcc41.patch \
+ "${FILESDIR}"/${P}-parallel.patch \
"${FILESDIR}"/${P}-64bit.patch
rm -f ${PN}
}