Add ~x86 keyword

(Portage version: 2.1.2.9)

3 files changed, 90 insertions, 20 deletions

diff --git a/games-board/ascal/ChangeLog b/games-board/ascal/ChangeLog
index 562923f5427d..46de56abd7f6 100644
--- a/games-board/ascal/ChangeLog
+++ b/games-board/ascal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/ascal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ascal/ChangeLog,v 1.1 2007/05/13 11:36:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ascal/ChangeLog,v 1.2 2007/06/12 14:57:42 nyhm Exp $
+
+  12 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/ascal-0.1.1-install.patch, ascal-0.1.1.ebuild:
+  Add ~x86 keyword
 
 *ascal-0.1.1 (13 May 2007)
 
diff --git a/games-board/ascal/ascal-0.1.1.ebuild b/games-board/ascal/ascal-0.1.1.ebuild
index 238dd8a71759..18dc9e6b95e2 100644
--- a/games-board/ascal/ascal-0.1.1.ebuild
+++ b/games-board/ascal/ascal-0.1.1.ebuild
@@ -1,37 +1,33 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ascal/ascal-0.1.1.ebuild,v 1.2 2007/06/12 13:02:29 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ascal/ascal-0.1.1.ebuild,v 1.3 2007/06/12 14:57:42 nyhm Exp $
 
-inherit eutils games
+inherit autotools eutils games
 
 DESCRIPTION="A game similar to Draughts but with some really cool enhancements"
-HOMEPAGE="http://ascal.sourceforge.net"
+HOMEPAGE="http://ascal.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-cpp/libgnomecanvasmm
-	dev-cpp/libglademm"
-
-src_compile() {
-	egamesconf --disable-Werror || die "egamesconf failed"
-	emake || die "emake failed"
+RDEPEND="dev-cpp/libgnomecanvasmm
+	dev-cpp/libglademm
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-install.patch
+	eautoreconf
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm "${D}${GAMES_DATADIR}/pixmaps/${PN}.png" \
-		|| die "Cleaning pixmap entry failed"
-	rm "${D}${GAMES_DATADIR}/applications/${PN}.desktop" \
-		|| die "Cleaning desktop entry failed"
 	dodoc AUTHORS ChangeLog NEWS README THANKS
-
-	doicon ${PN}.png
-	make_desktop_entry ${PN} "Ascal" ${PN}.png
-
 	prepgamesdirs
 }
diff --git a/games-board/ascal/files/ascal-0.1.1-install.patch b/games-board/ascal/files/ascal-0.1.1-install.patch
new file mode 100644
index 000000000000..86c7659feeb1
--- /dev/null
+++ b/games-board/ascal/files/ascal-0.1.1-install.patch
@@ -0,0 +1,70 @@
+--- configure.ac
++++ configure.ac
+@@ -63,9 +63,6 @@
+         AC_DEFINE(DEBUG, 1, [Enable debug msg.])
+ 		CPPFLAGS=[`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`]
+         CPPFLAGS="$CPPFLAGS -g -O0"
+-else
+-    CPPFLAGS=[`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`]
+-	CPPFLAGS="$CPPFLAGS -O3"
+ fi
+ 
+ AC_ARG_ENABLE(Werror,
+@@ -74,7 +71,7 @@
+ )
+ 
+ if test "$enable_Werror" = yes; then
+-        CPPFLAGS="$CPPFLAGS -Werror -Wall"
++        CPPFLAGS="$CPPFLAGS -Wall"
+ fi
+ 
+ AC_ARG_ENABLE(static,
+--- m4/Makefile.am
++++ m4/Makefile.am
+@@ -15,6 +15,5 @@
+ m4macros = 
+ 
+ # The following is boilerplate
+-m4data_DATA = $(m4macros) 
+ EXTRA_DIST =  
+ 
+--- Makefile.am
++++ Makefile.am
+@@ -17,13 +17,13 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-pixmapdir = $(datadir)/pixmaps
++pixmapdir = /usr/share/pixmaps
+ pixmap_DATA = ascal.png
+ 
+-desktopdir = $(datadir)/applications
++desktopdir = /usr/share/applications
+ desktop_in_files = ascal.desktop.in
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-#include aminclude.am
+\ No newline at end of file
++#include aminclude.am
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -34,7 +34,7 @@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+ DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++itlocaledir = /usr/share/locale
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -50,5 +50,5 @@
+ 
+ 
+ 
+-INCLUDES = $(ASCAL_CFLAGS) $(GTKMM) -DLOCALEDIR=\""$(datadir)/locale"\" -DASCAL_DATA_PREFIX=\""$(ASCAL_DATA_PREFIX)"\"
++INCLUDES = $(ASCAL_CFLAGS) $(GTKMM) -DLOCALEDIR=\""/usr/share/locale"\" -DASCAL_DATA_PREFIX=\""$(ASCAL_DATA_PREFIX)"\"
+ LIBS = $(ASCAL_LIBS) $(GTKMM)