EAPI=2; get rid of X11R6 in the config for the database location (bug #286206)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 19 insertions, 13 deletions

diff --git a/games-board/xgammon/ChangeLog b/games-board/xgammon/ChangeLog
index 0c57f3993642..67ad7eb380f2 100644
--- a/games-board/xgammon/ChangeLog
+++ b/games-board/xgammon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/xgammon
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/ChangeLog,v 1.12 2009/01/30 05:38:12 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/ChangeLog,v 1.13 2009/09/24 20:46:30 mr_bones_ Exp $
+
+  24 Sep 2009; Michael Sterrett <mr_bones_@gentoo.org> xgammon-0.98.ebuild,
+  files/xgammon-0.98-config.patch:
+  EAPI=2; get rid of X11R6 in the config for the database location (bug
+  #286206)
 
   30 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> xgammon-0.98.ebuild:
   look in . first to find db
diff --git a/games-board/xgammon/Manifest b/games-board/xgammon/Manifest
index 80581c8abc29..0b259abe71de 100644
--- a/games-board/xgammon/Manifest
+++ b/games-board/xgammon/Manifest
@@ -1,7 +1,7 @@
 AUX gcc33.patch 3672 RMD160 716d7601927e2197c5877d8d5910dbaceac551b5 SHA1 bdcc3082941cabbd01a762ddf205e86e0aa8606f SHA256 cffcce795c717e029b1c9f9eec2519d8bef57e874855735f6da8b16ff0ff3c65
 AUX xgammon-0.98-broken.patch 263 RMD160 6928f23005bdcc58bf1f202bc02bc6e83fbeee67 SHA1 db1aab1429797950d312212e1c21a5d43b55fad0 SHA256 edbc9480c8b568b0ca42522291e2a3659cb39e7678a017832114de2e1e5864a3
-AUX xgammon-0.98-config.patch 823 RMD160 18432ed73250111ecf449fc42f632aa9101d6863 SHA1 4e0afe457f6c91c1e2e198abfcbab965d7d36794 SHA256 2920b501e0cdb4973146332d6f42d009083de14490b3e80397d391e9569d34ef
+AUX xgammon-0.98-config.patch 817 RMD160 e27a785dd2f0973fba52f1324d3adce0ca6aa766 SHA1 9254f92c667727eb694c78719b1a0c1707ba0075 SHA256 e9184dcd0eeb66bc669da2a695514fec25a5841b45c8c5f0053ffee4e4f0c69a
 DIST xgammon-0.98a.tar.gz 76415 RMD160 1c6ce60526b4f7d59e8e5e23ae5b86527591dc48 SHA1 4a73ed7878781b1c5181faf456f0319d94ce5138 SHA256 c11d4efa7c6d9755b1d7bca8afc6a41058a92f5935ad8e08b6e6375954d453fc
-EBUILD xgammon-0.98.ebuild 922 RMD160 46cb75b2517dccb66ec167438bb40f939af5c14e SHA1 723ccada807a2448dc69595148991333e603fb15 SHA256 aff4b9e3226ccb607a5c9715d1ba0f5bee7c1b58f4c77dd645b6491a8f85a34b
-MISC ChangeLog 1614 RMD160 d8d4ec00d4bf2326b8af1b237a00dfe5eacc2b6e SHA1 bb8e619dce299976ec53dead2d5654925da50330 SHA256 3b11492a8ec4a02c553d74ae62571fc570324f0a1763c51fa086637b4887b337
+EBUILD xgammon-0.98.ebuild 928 RMD160 2d694fcc0e51e9a2ca3ad6b9fccaca4c1f027f03 SHA1 58ea70f60852714eec6c620053ecf7d7010ceea9 SHA256 7cd78807dd2a9a61f3a75b08701e540e36fc39426daebc23d04e2de02ac6ce6e
+MISC ChangeLog 1809 RMD160 700dfbe16899d604b6ce4b9ceeea2af59a531259 SHA1 a8032ca24f978a00d877d64866be363ae4e82826 SHA256 1fe086ac2a6559216a3b7289e9d4e181cb48b281e76fbf727d045e12d06711cb
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-board/xgammon/files/xgammon-0.98-config.patch b/games-board/xgammon/files/xgammon-0.98-config.patch
index d2e11bacfd81..363d1730933c 100644
--- a/games-board/xgammon/files/xgammon-0.98-config.patch
+++ b/games-board/xgammon/files/xgammon-0.98-config.patch
@@ -5,7 +5,7 @@
  xgammon.stonesteps:			5
  xgammon.delaytime:			5
 -xgammon.database:			lib/xgammon.db
-+xgammon.database:			/usr/X11R6/lib/X11/xgammon/xgammon.db
++xgammon.database:			/usr/lib/X11/xgammon/xgammon.db
 --- xgammon-0.98/Imakefile.rhconfig	Wed Aug 23 15:26:39 1995
 +++ xgammon-0.98/Imakefile	Wed Aug 12 18:42:55 1998
 @@ -12,9 +12,9 @@
diff --git a/games-board/xgammon/xgammon-0.98.ebuild b/games-board/xgammon/xgammon-0.98.ebuild
index dc5d810f8b17..f7a6b7e8fbe5 100644
--- a/games-board/xgammon/xgammon-0.98.ebuild
+++ b/games-board/xgammon/xgammon-0.98.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/xgammon-0.98.ebuild,v 1.12 2009/01/30 05:38:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/xgammon-0.98.ebuild,v 1.13 2009/09/24 20:46:30 mr_bones_ Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="very nice backgammon game for X"
@@ -20,21 +21,21 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}a
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-broken.patch" \
 		"${FILESDIR}/${P}-config.patch" \
 		"${FILESDIR}/gcc33.patch"
 }
 
-src_compile() {
+src_configure() {
 	xmkmf || die "xmkmf died"
+}
+
+src_compile() {
 	env PATH=".:${PATH}" emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 }