7 files changed, 51 insertions, 31 deletions
diff --git a/gnustep-apps/gridlock/ChangeLog b/gnustep-apps/gridlock/ChangeLog
index ac46dcaf082e..80ecb89c8e3d 100644
--- a/gnustep-apps/gridlock/ChangeLog
+++ b/gnustep-apps/gridlock/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/gridlock
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/ChangeLog,v 1.5 2004/10/17 09:38:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/ChangeLog,v 1.6 2004/11/12 03:53:29 fafhrd Exp $
+
+*gridlock-1.9-r1 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -gridlock-1.6.1.ebuild,
+  +gridlock-1.9-r1.ebuild, gridlock-1.9.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
   17 Oct 2004; David Holm <dholm@gentoo.org> gridlock-1.9.ebuild:
   Added to ~ppc.
diff --git a/gnustep-apps/gridlock/Manifest b/gnustep-apps/gridlock/Manifest
index 50e2b8434da9..6560ca10e4ef 100644
--- a/gnustep-apps/gridlock/Manifest
+++ b/gnustep-apps/gridlock/Manifest
@@ -1,6 +1,6 @@
-MD5 c2bd20fcdcf1b04b00a766313daa8c31 ChangeLog 1320
-MD5 349c49699fa48f2d6ce3ad6eb35114d4 gridlock-1.6.1.ebuild 596
+MD5 f43684ae52398617798d41725e2d5e88 gridlock-1.9-r1.ebuild 748
+MD5 18382290fa1774112361538e1c49a3db gridlock-1.9.ebuild 815
+MD5 b3e9a4ef8ba347936491027c10b23224 ChangeLog 1815
 MD5 b18e9974948edfd39ccec88acfcea333 metadata.xml 418
-MD5 0fd1acfff906ffdb99e1fdbd9a7fe9ab gridlock-1.9.ebuild 809
-MD5 63293230c20e5507fec605ea87fa0bf7 files/digest-gridlock-1.6.1 74
+MD5 f07903e65a83b0f4d5f1f38b00acb63e files/digest-gridlock-1.9-r1 72
 MD5 f07903e65a83b0f4d5f1f38b00acb63e files/digest-gridlock-1.9 72
diff --git a/gnustep-apps/gridlock/files/digest-gridlock-1.6.1 b/gnustep-apps/gridlock/files/digest-gridlock-1.6.1
deleted file mode 100644
index 8adfac755a1d..000000000000
--- a/gnustep-apps/gridlock/files/digest-gridlock-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34a47e168793c3949e25460d6ea36830 Gridlock-GNUstep-1.6.1.tar.gz 191166
diff --git a/gnustep-apps/gridlock/files/digest-gridlock-1.9-r1 b/gnustep-apps/gridlock/files/digest-gridlock-1.9-r1
new file mode 100644
index 000000000000..14058755559b
--- /dev/null
+++ b/gnustep-apps/gridlock/files/digest-gridlock-1.9-r1
@@ -0,0 +1 @@
+MD5 05ea4dc2c2b1a36771b374b29701753f Gridlock-gnustep-1.9.tar.gz 211523
diff --git a/gnustep-apps/gridlock/gridlock-1.6.1.ebuild b/gnustep-apps/gridlock/gridlock-1.6.1.ebuild
deleted file mode 100644
index 05c59ed734fd..000000000000
--- a/gnustep-apps/gridlock/gridlock-1.6.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.6.1.ebuild,v 1.2 2004/07/23 14:58:21 fafhrd Exp $
-
-inherit gnustep-old
-
-S=${WORKDIR}/${PN/g/G}
-
-DESCRIPTION="Gridlock is a collection of grid-based games"
-HOMEPAGE="http://dozingcat.com/"
-SRC_URI="http://dozingcat.com/Gridlock/${PN/g/G}-GNUstep-${PV}.tar.gz"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-DEPEND=">=gnustep-base/gnustep-gui-0.8.5"
-
-src_unpack() {
-	unpack ${PN/g/G}-GNUstep-${PV}.tar.gz
-	cd ${S}
-}
diff --git a/gnustep-apps/gridlock/gridlock-1.9-r1.ebuild b/gnustep-apps/gridlock/gridlock-1.9-r1.ebuild
new file mode 100644
index 000000000000..2cf25a35329c
--- /dev/null
+++ b/gnustep-apps/gridlock/gridlock-1.9-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.9-r1.ebuild,v 1.1 2004/11/12 03:53:29 fafhrd Exp $
+
+inherit gnustep
+
+S=${WORKDIR}/${PN/g/G}
+
+DESCRIPTION="Gridlock is a collection of grid-based games"
+HOMEPAGE="http://dozingcat.com/"
+SRC_URI="http://dozingcat.com/Gridlock/${PN/g/G}-gnustep-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+IUSE="${IUSE} doc"
+DEPEND="${GS_DEPEND}"
+RDEPEND="${GS_RDEPEND}"
+
+egnustep_install_domain "Local"
+
+src_install() {
+	egnustep_env
+	egnustep_install || die
+	if use doc
+	then
+		mkdir -p ${D}$(egnustep_install_domain)/Library/Documentation/User/Gridlock
+		cp Resources/readme.html ${D}$(egnustep_install_domain)/Library/Documentation/User/Gridlock
+	fi
+	egnustep_package_config
+}
+
diff --git a/gnustep-apps/gridlock/gridlock-1.9.ebuild b/gnustep-apps/gridlock/gridlock-1.9.ebuild
index 252d95804a15..0fbc1fce3e71 100644
--- a/gnustep-apps/gridlock/gridlock-1.9.ebuild
+++ b/gnustep-apps/gridlock/gridlock-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.9.ebuild,v 1.2 2004/10/17 09:38:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gridlock/gridlock-1.9.ebuild,v 1.3 2004/11/12 03:53:29 fafhrd Exp $
 
 inherit gnustep
 
@@ -22,8 +22,8 @@ src_install() {
 	egnustep_install || die
 	if use doc
 	then
-		mkdir -p ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/User/Gridlock
-		cp Resources/readme.html ${D}${GNUSTEP_SYSTEM_ROOT}/Library/Documentation/User/Gridlock
+		mkdir -p ${D}$(egnustep_prefix)/System/Library/Documentation/User/Gridlock
+		cp Resources/readme.html ${D}$(egnustep_prefix)/System/Library/Documentation/User/Gridlock
 	fi
 	egnustep_package_config
 }