Add ~x86 keyword

Package-Manager: portage-2.1.2.9

4 files changed, 105 insertions, 31 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/Manifest b/games-board/ascal/Manifest
index f71e7b802a8c..183340716123 100644
--- a/games-board/ascal/Manifest
+++ b/games-board/ascal/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ascal-0.1.1-install.patch 1718 RMD160 5f492dcf0e5afdd8a79a398e36b4803cc59abe30 SHA1 605b73609265901c0f4f2882e3f78299f487f83e SHA256 76755d6bd2a9b6f90edad02923939bfda15025a17b6c26cab488cdc8a9974cca
+MD5 f06f3b348de8069b657802d2aa09d3b9 files/ascal-0.1.1-install.patch 1718
+RMD160 5f492dcf0e5afdd8a79a398e36b4803cc59abe30 files/ascal-0.1.1-install.patch 1718
+SHA256 76755d6bd2a9b6f90edad02923939bfda15025a17b6c26cab488cdc8a9974cca files/ascal-0.1.1-install.patch 1718
 DIST ascal-0.1.1.tar.bz2 960688 RMD160 b719f9506059b85cfc9537fc3e77c2f9ab5b0ed9 SHA1 4969d74eeba33ffcf121abcaf2ea357bc6bd351c SHA256 43a5e19d5b2e33ffcaa11b2b2d4dcd62f975f87617505fd3356190c694476ac9
-EBUILD ascal-0.1.1.ebuild 1007 RMD160 251ad4010bd13eab0f1f5cb13d4925d3ac492135 SHA1 40fa424fba1d6eecabcc3f9a43819d2a469c9090 SHA256 bf53e30dbf59c619472d9b6a7b3f538ec573d5e2b55ad02df7c1a08eb9ecfc3b
-MD5 b344052f13b22e037c1b33e8f3b5493e ascal-0.1.1.ebuild 1007
-RMD160 251ad4010bd13eab0f1f5cb13d4925d3ac492135 ascal-0.1.1.ebuild 1007
-SHA256 bf53e30dbf59c619472d9b6a7b3f538ec573d5e2b55ad02df7c1a08eb9ecfc3b ascal-0.1.1.ebuild 1007
-MISC ChangeLog 370 RMD160 8498ca585de85048af2dfd595bbecfd23b9c37f5 SHA1 1bfcf0197c07a94ee9f5ec4d607214da44623e2b SHA256 212a39553e043b8bf6a191a54dc9ef7a11fe308ecc2269da242963d5218bd32c
-MD5 fdd27d5ec555b2606100c14dfed6f54b ChangeLog 370
-RMD160 8498ca585de85048af2dfd595bbecfd23b9c37f5 ChangeLog 370
-SHA256 212a39553e043b8bf6a191a54dc9ef7a11fe308ecc2269da242963d5218bd32c ChangeLog 370
+EBUILD ascal-0.1.1.ebuild 823 RMD160 e7eff2bb4c4de699593df8b613d2fb34d7b15b94 SHA1 648ae3c9f970c03ffdafd65726d35100a1d64997 SHA256 abae79972c35ff373077e7b0ca9d805279baf5a4e557472bc1dcfc7ec8ab1fe4
+MD5 84ab531937aa24f01202bc91db59c8cb ascal-0.1.1.ebuild 823
+RMD160 e7eff2bb4c4de699593df8b613d2fb34d7b15b94 ascal-0.1.1.ebuild 823
+SHA256 abae79972c35ff373077e7b0ca9d805279baf5a4e557472bc1dcfc7ec8ab1fe4 ascal-0.1.1.ebuild 823
+MISC ChangeLog 492 RMD160 637b31a103d678d4261706e630119f58d6222eb7 SHA1 83508964b82cbe2b697d985b4f60e41a5d641c6d SHA256 47c3149219cfa96be7840a6327ec1a9b45ead3583624d853d6e6df2c78f557ee
+MD5 a4d877de838949cfe2ef41130eb40f5f ChangeLog 492
+RMD160 637b31a103d678d4261706e630119f58d6222eb7 ChangeLog 492
+SHA256 47c3149219cfa96be7840a6327ec1a9b45ead3583624d853d6e6df2c78f557ee ChangeLog 492
 MISC metadata.xml 645 RMD160 371fd49009457a94f97706b6b5b1f75ec8bdd72f SHA1 d50b26fd188678bb6e6e2bcfcc88b25e44d34499 SHA256 418f0bcc7720dba9b63708a579ce0c4cfe4416bcc3ed9bcb735945d2e0e9068c
 MD5 794d031696a909e493a8d3d84ec3a47d metadata.xml 645
 RMD160 371fd49009457a94f97706b6b5b1f75ec8bdd72f metadata.xml 645
@@ -20,7 +24,7 @@ SHA256 3344bff79d2c7937cc585360436b233b39a27f11313db0c070c58a9bed9b3f43 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGbplrdz7hIScOURERAgE7AJ9UzvZgdsi9SHuxGVa/oKcaI9mrwgCgihL6
-AfkIpmTFonrGmKuyr716Z48=
-=Tjwg
+iD8DBQFGbrRsdz7hIScOURERAjNHAKDrubD4RVz9eSvXGqMFB3Z3kM2ZxQCgyrkv
+H1x0AblktxJ3U0Ss53wTTuY=
+=fkdT
 -----END PGP SIGNATURE-----
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)