summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2006-10-20 21:01:59 +0000
committerAlfredo Tupone <tupone@gentoo.org>2006-10-20 21:01:59 +0000
commit73af3475def3d43690f3f521f5dd64ea134dab5c (patch)
treedc0dfc555d9720c14f0c0d548aac07151de97cf9
parentMarking amd64 stable (diff)
downloadgentoo-2-73af3475def3d43690f3f521f5dd64ea134dab5c.tar.gz
gentoo-2-73af3475def3d43690f3f521f5dd64ea134dab5c.tar.bz2
gentoo-2-73af3475def3d43690f3f521f5dd64ea134dab5c.zip
Adding ~amd64 keyword. Bug #111828
(Portage version: 2.1.1)
-rw-r--r--games-strategy/lgeneral/ChangeLog8
-rw-r--r--games-strategy/lgeneral/files/lgeneral-1.2_beta12-64bit.patch11
-rw-r--r--games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild7
3 files changed, 22 insertions, 4 deletions
diff --git a/games-strategy/lgeneral/ChangeLog b/games-strategy/lgeneral/ChangeLog
index 5cb4cdf42fd9..e428ec83cb06 100644
--- a/games-strategy/lgeneral/ChangeLog
+++ b/games-strategy/lgeneral/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for games-strategy/lgeneral
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.22 2006/10/09 21:46:05 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/ChangeLog,v 1.23 2006/10/20 21:01:59 tupone Exp $
+
+ 20 Oct 2006; <tupone@gentoo.org> +files/lgeneral-1.2_beta12-64bit.patch,
+ -lgeneral-1.2_beta8.ebuild, -lgeneral-1.2_beta9.ebuild,
+ lgeneral-1.2_beta12-r1.ebuild:
+ Adding ~amd64 keyword. Bug #111828 by Mike Bonar
+ Removing obsoleted ebuilds
09 Oct 2006; <tupone@gentoo.org> +files/lgeneral-1.2_beta12-gettext.patch,
lgeneral-1.2_beta12-r1.ebuild:
diff --git a/games-strategy/lgeneral/files/lgeneral-1.2_beta12-64bit.patch b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-64bit.patch
new file mode 100644
index 000000000000..d152657f3aca
--- /dev/null
+++ b/games-strategy/lgeneral/files/lgeneral-1.2_beta12-64bit.patch
@@ -0,0 +1,11 @@
+--- src/unit_lib.h.old 2006-10-20 22:11:43.000000000 +0200
++++ src/unit_lib.h 2006-10-20 22:11:58.000000000 +0200
+@@ -145,7 +145,7 @@
+ #endif
+ int eval_score; /* between 0 - 1000 indicating the worth of the unit relative the
+ best one */
+-} Unit_Lib_Entry;
++} __attribute__((__packed__)) Unit_Lib_Entry;
+
+
+ /*
diff --git a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
index 766733df92cc..d175ef1fa23d 100644
--- a/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
+++ b/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.2 2006/10/09 21:46:05 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/lgeneral/lgeneral-1.2_beta12-r1.ebuild,v 1.3 2006/10/20 21:01:59 tupone Exp $
inherit eutils autotools games
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/lgeneral/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="media-libs/libsdl
@@ -26,7 +26,8 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/${P}"-gentoo-path.patch \
- "${FILESDIR}"/${P}-gettext.patch
+ "${FILESDIR}"/${P}-gettext.patch \
+ "${FILESDIR}"/${P}-64bit.patch
eautoreconf
# Build a temporary lgc-pg that knows about /var/tmp/portage in work/lgc-pg:
cp -pPR "${S}" "${WORKDIR}/lgc-pg" || die "cp failed."