summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-10-07 09:06:55 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-10-07 09:06:55 +0000
commit75282c1ba431395c482204208358f9f8e1a6bef2 (patch)
tree759b6d38cd7fdb16bb6373edc5747567f6eb3958
parentFix building (linking) with USE="-X". (diff)
downloadhistorical-75282c1ba431395c482204208358f9f8e1a6bef2.tar.gz
historical-75282c1ba431395c482204208358f9f8e1a6bef2.tar.bz2
historical-75282c1ba431395c482204208358f9f8e1a6bef2.zip
Respect LDFLAGS. Bug #339871
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
-rw-r--r--games-strategy/xconq/ChangeLog5
-rw-r--r--games-strategy/xconq/Manifest4
-rw-r--r--games-strategy/xconq/xconq-7.4.1.ebuild21
3 files changed, 17 insertions, 13 deletions
diff --git a/games-strategy/xconq/ChangeLog b/games-strategy/xconq/ChangeLog
index 44076dff0fbe..a0aff60cb988 100644
--- a/games-strategy/xconq/ChangeLog
+++ b/games-strategy/xconq/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-strategy/xconq
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.15 2010/09/25 12:12:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/ChangeLog,v 1.16 2010/10/07 09:06:55 tupone Exp $
+
+ 07 Oct 2010; Alfredo Tupone <tupone@gentoo.org> xconq-7.4.1.ebuild:
+ Respect LDFLAGS. Bug #339871 by flameeyes@gentoo.org
25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> xconq-7.4.1.ebuild,
+files/xconq-make-382.patch:
diff --git a/games-strategy/xconq/Manifest b/games-strategy/xconq/Manifest
index 8b4bdd426070..8c5dba026e6e 100644
--- a/games-strategy/xconq/Manifest
+++ b/games-strategy/xconq/Manifest
@@ -2,6 +2,6 @@ AUX xconq-gcc-3.4.patch 223 RMD160 286b8a0f3604eff1030234d35ca4c14a835e96fc SHA1
AUX xconq-make-382.patch 1238 RMD160 8a76e1148ebbc2d5dbda20d0dae20b4f9c9b35ca SHA1 ec08ada20034c4cb2c11d0cddcdd40ace3136104 SHA256 2292c75bef3c6a3b42bc925fdfec1a50caba38be30d03593c11d0a79c8771e8b
AUX xconq-tkconq.patch 3712 RMD160 f2527764a5c40d871f3a17d7a94c506408fa157d SHA1 bcba3ff34f687c5962a062f40a44d74f832effa0 SHA256 425351a06a8271d832caa936be3b106e579a7a27338fa30443b0b1d3c45822c4
DIST xconq-7.4.1.tar.gz 3402832 RMD160 e596eaccb6a48709e9ceb58fc59e715e36dbf43a SHA1 b7d03d17806500f05c23889a00b7608843a27ce7 SHA256 50d0d11887374a9351ec1235f6b93b1e9060fd852ca99a6700c76098e585f3ce
-EBUILD xconq-7.4.1.ebuild 1340 RMD160 3aca7e314b7277d3bc72fa1ab7bca53778daa366 SHA1 69d5ba70a2ccbe40e7349b72ee1051fcd0237385 SHA256 f2a25b92ac4d1b7449dc700e3478986380977e9f62a85ac2dc66e39aa6a2caa1
-MISC ChangeLog 1822 RMD160 dd0831dd0dc4caa4208f74c576f876f2b952106d SHA1 cfeea73b515c126020ffd0bb334270fad81ffc74 SHA256 e6517f74612097cfec4751c1d5cbeb4435897d97a4ffc8db76149f4dad7f196a
+EBUILD xconq-7.4.1.ebuild 1353 RMD160 c65c4e139d4ad5d30357d02829ca834fbbe821fe SHA1 6ed80a5571bd02347eb2966fc6cdb276ad7b1a42 SHA256 f2d8b3ed2febb4bb769a7909c0c5c2aaf96b84baeeb4a3f3f658271405c25866
+MISC ChangeLog 1945 RMD160 4e1fb61ce3793ec5dc3cca900a0449df0e763806 SHA1 5d80615d78ecf6b8027ad1abd547de9a2c668e82 SHA256 10324c3226ea1bfc55b7812f77ba07a61f4190ed1e7bee49108c50376dd4e3d2
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/xconq/xconq-7.4.1.ebuild b/games-strategy/xconq/xconq-7.4.1.ebuild
index 3dfd1b23925f..12aa4ddb711a 100644
--- a/games-strategy/xconq/xconq-7.4.1.ebuild
+++ b/games-strategy/xconq/xconq-7.4.1.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-strategy/xconq/xconq-7.4.1.ebuild,v 1.14 2010/09/25 12:12:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/xconq/xconq-7.4.1.ebuild,v 1.15 2010/10/07 09:06:55 tupone Exp $
+EAPI="2"
inherit eutils games
@@ -19,21 +20,21 @@ DEPEND="x11-libs/libXmu
dev-lang/tk
dev-lang/tcl"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch \
- "${FILESDIR}"/${PN}-gcc-3.4.patch \
- "${FILESDIR}"/${PN}-tkconq.patch \
- "${FILESDIR}"/${PN}-make-382.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-gcc-3.4.patch
+ "${FILESDIR}"/${PN}-tkconq.patch
+ "${FILESDIR}"/${PN}-make-382.patch
+ )
-src_compile() {
+src_configure() {
egamesconf \
--enable-alternate-scoresdir="${GAMES_STATEDIR}"/${PN} \
|| die
+}
+
+src_compile() {
emake \
CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
datadir="${GAMES_DATADIR}"/${PN} \
|| die "emake failed"
}