summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-01-30 08:08:06 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-01-30 08:08:06 +0000
commit1c26bbcc8bc7e37e49eb6af7bb730f2e1763362e (patch)
tree1f7908d325dc2024de642cb19c2ccfcde8c1591c /games-server
parentFix build error w/ gcc-4.5. (diff)
downloadgentoo-2-1c26bbcc8bc7e37e49eb6af7bb730f2e1763362e.tar.gz
gentoo-2-1c26bbcc8bc7e37e49eb6af7bb730f2e1763362e.tar.bz2
gentoo-2-1c26bbcc8bc7e37e49eb6af7bb730f2e1763362e.zip
Skip install of combine.pl (bug #236205)
(Portage version: 2.1.7.16/cvs/Linux i686)
Diffstat (limited to 'games-server')
-rw-r--r--games-server/crossfire-server/ChangeLog8
-rw-r--r--games-server/crossfire-server/crossfire-server-1.11.0.ebuild5
2 files changed, 9 insertions, 4 deletions
diff --git a/games-server/crossfire-server/ChangeLog b/games-server/crossfire-server/ChangeLog
index 42af73892ba0..b96efe3d9881 100644
--- a/games-server/crossfire-server/ChangeLog
+++ b/games-server/crossfire-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-server/crossfire-server
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.14 2009/12/31 01:00:29 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/ChangeLog,v 1.15 2010/01/30 08:08:06 mr_bones_ Exp $
+
+ 30 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org>
+ crossfire-server-1.11.0.ebuild:
+ Skip install of combine.pl (bug #236205)
31 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org>
crossfire-server-1.11.0.ebuild:
diff --git a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild b/games-server/crossfire-server/crossfire-server-1.11.0.ebuild
index f9009ac68d9b..dca9856d0163 100644
--- a/games-server/crossfire-server/crossfire-server-1.11.0.ebuild
+++ b/games-server/crossfire-server/crossfire-server-1.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.2 2009/12/31 01:00:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/crossfire-server/crossfire-server-1.11.0.ebuild,v 1.3 2010/01/30 08:08:06 mr_bones_ Exp $
EAPI=2
inherit autotools games
@@ -32,6 +32,7 @@ src_prepare() {
-e '/,2.5/s/,2.5/,2.6,2.5/' \
acinclude.m4 \
|| die 'sed failed'
+ rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205
eautoreconf
}