summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-10-11 15:34:38 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-10-11 15:34:38 +0000
commitd22885d95788db7d8a0e976ad7dd1c7fd5d2c8ab (patch)
treef69371a408d92575451c55b6c94e86c5faeb9c7d /games-board/xscrabble
parentEnsure we can build in parallel (diff)
downloadhistorical-d22885d95788db7d8a0e976ad7dd1c7fd5d2c8ab.tar.gz
historical-d22885d95788db7d8a0e976ad7dd1c7fd5d2c8ab.tar.bz2
historical-d22885d95788db7d8a0e976ad7dd1c7fd5d2c8ab.zip
Respect LDFLAGS. Bug #335996
Package-Manager: portage-2.1.9.14/cvs/Linux i686
Diffstat (limited to 'games-board/xscrabble')
-rw-r--r--games-board/xscrabble/ChangeLog8
-rw-r--r--games-board/xscrabble/Manifest5
-rw-r--r--games-board/xscrabble/files/xscrabble-2.10-ldflags.patch11
-rw-r--r--games-board/xscrabble/xscrabble-2.10-r1.ebuild12
4 files changed, 28 insertions, 8 deletions
diff --git a/games-board/xscrabble/ChangeLog b/games-board/xscrabble/ChangeLog
index 485c80ba4601..5a7e6d8ad71b 100644
--- a/games-board/xscrabble/ChangeLog
+++ b/games-board/xscrabble/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-board/xscrabble
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/ChangeLog,v 1.11 2008/01/14 19:29:09 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/ChangeLog,v 1.12 2010/10/11 15:34:38 tupone Exp $
+
+ 11 Oct 2010; Tupone Alfredo <tupone@gentoo.org> xscrabble-2.10-r1.ebuild,
+ +files/xscrabble-2.10-ldflags.patch:
+ Respect LDFLAGS. Bug #335996 by flameeyes@gentoo.org
14 Jan 2008; Fabian Groffen <grobian@gentoo.org> xscrabble-2.10-r1.ebuild:
Dropped ppc-macos keyword, see you in prefix
diff --git a/games-board/xscrabble/Manifest b/games-board/xscrabble/Manifest
index e1c11ea22493..ce2052b9e846 100644
--- a/games-board/xscrabble/Manifest
+++ b/games-board/xscrabble/Manifest
@@ -1,7 +1,8 @@
+AUX xscrabble-2.10-ldflags.patch 310 RMD160 fb6198685d0b4f29d45fdf1585c5b26a18aa3857 SHA1 ee3901a4628a1270e34212022bbf3a1614e1b9f3 SHA256 67958f27dd697b809e9bb03495a7ddd763504defa977dfb2b7e110fb79a4ceee
AUX xscrabble-2.10-path-fixes.patch 1106 RMD160 04d82ca1999b229083735ac6531e5d223f674580 SHA1 115adf943b032f059137fbd7a3bd8f174f102476 SHA256 e2831c4d094c83d085f79c1a807be81267cef323d88abbeec66a3e110cec471a
DIST xscrabble-2.10.tgz 83575 RMD160 bc2bafaeb4418650ea3159c96da9f3f624a7cb02 SHA1 38c99b6e38fa5335beb19f35aa43e1a575ba69ba SHA256 a496804b62ad4bd95792505c3f6dbb9fce33cc49aa38ad36c4a812f7e1e2dff1
DIST xscrabble_en.tgz 393527 RMD160 b9de0f6abe1887fa7456b86235981024526acad2 SHA1 38bc32dddde9e84bc92356a4b3ccdf0fb56c9ed6 SHA256 8bd52efeb50419e310f7a4c436045c3028903a197294bd8af0eab32093074fb0
DIST xscrabble_fr.tgz 810737 RMD160 3e0463321527bdb94390b0b261d1f8267db5e224 SHA1 4e3e1a4fffc0dae7a0c7d46fb7433dc183bfd439 SHA256 9a27b610e789362c3678fee27891cef8ca682be7cedea1b6d26895ec0c171b4a
-EBUILD xscrabble-2.10-r1.ebuild 1518 RMD160 547b0572899793d605b8ba4daf3beab098e6c956 SHA1 b6bb7a2e67ce3f5a3063a0ae14a809aef0240003 SHA256 0ce7eb48c54b615d319542c1d1f510f1de92ff19003e3ca754022d9635e38ca6
-MISC ChangeLog 1586 RMD160 e5b70cd6b45444d7c2d11e4636261adc3346a99a SHA1 a1eaeb45f625b14e5053354e5b0e19e411fab7c0 SHA256 b2006ec438f2f049bc8f4d7eb7c351340438458798ebf91064c774edad60bcf6
+EBUILD xscrabble-2.10-r1.ebuild 1571 RMD160 2ebe094e40bb0ae8d70419c3e2113c1b9d4525ac SHA1 b5eb3e6649ea336f7567c707836d494d12ac1faf SHA256 82f13bcc662fd42b4c1bc4cc5fdd365e97881a6ad6456cc25ea66733ac9690fe
+MISC ChangeLog 1756 RMD160 c750b38cc20ffd406c95b99ddb0cf241830cc748 SHA1 1020e9b811284647ea38c0fdd501dfbe683e6aea SHA256 4c4d4c69c58f75b737a68cf4a8a8091cc846ae7634f7198df9be432e56399b5a
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-board/xscrabble/files/xscrabble-2.10-ldflags.patch b/games-board/xscrabble/files/xscrabble-2.10-ldflags.patch
new file mode 100644
index 000000000000..ca7076a8ceca
--- /dev/null
+++ b/games-board/xscrabble/files/xscrabble-2.10-ldflags.patch
@@ -0,0 +1,11 @@
+--- build.old 2010-10-11 17:25:44.000000000 +0200
++++ build 2010-10-11 17:26:08.000000000 +0200
+@@ -36,7 +36,7 @@
+ #define RULES_FILE \"$LIBDIR/en/scrabble_rules\"
+ " > src/config.h
+ xmkmf -a
+- make
++ make LOCAL_LDFLAGS="${LDFLAGS}"
+ echo "
+ Now, type './build install' to install programs in $BINDIR
+ "
diff --git a/games-board/xscrabble/xscrabble-2.10-r1.ebuild b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
index 096d15f10736..1143a3d5728c 100644
--- a/games-board/xscrabble/xscrabble-2.10-r1.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/xscrabble-2.10-r1.ebuild,v 1.7 2008/01/14 19:29:09 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/xscrabble-2.10-r1.ebuild,v 1.8 2010/10/11 15:34:38 tupone Exp $
+EAPI="2"
inherit eutils multilib games
@@ -25,8 +26,11 @@ src_unpack() {
unpack ${P}.tgz
cp "${DISTDIR}"/xscrabble_en.tgz .
use linguas_fr && cp "${DISTDIR}"/xscrabble_fr.tgz .
- cd "${S}"
- epatch "${FILESDIR}"/${P}-path-fixes.patch
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-path-fixes.patch \
+ "${FILESDIR}"/${P}-ldflags.patch
sed -i '/install/s/-s //' build || die "sed failed"
}