schema fix, closes the mahjongg crashing bugs

8 files changed, 29 insertions, 348 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 2d344fd4f1bd..4548e7880093 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.8 2002/06/20 00:33:37 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.9 2002/06/28 05:42:20 spider Exp $
 
+*gnome-games-2.0.1-r1 (28 Jun 2002)
+  28 Jun 2002; Spider <spider@gentoo.org> gnome-games-2.0.1-r1.ebuild :
+  I had forgotten a schema, something that caused bugs :/
+
+
+  
 *gnome-games-2.0.1 (19 Jun 2002)
   19 Jun 2002; Spider <spider@gentoo.org> gnome-games-2.0.1.ebuild :
   new version, no big changes except depend-tweaks
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-1.92.0 b/gnome-extra/gnome-games/files/digest-gnome-games-1.92.0
deleted file mode 100644
index 08c4acd28972..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-1.92.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e37620aa1d3d45a52f0fd6f82a7d51e gnome-games-1.92.0.tar.bz2 8875987
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-1.93.0 b/gnome-extra/gnome-games/files/digest-gnome-games-1.93.0
deleted file mode 100644
index 48e566151336..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-1.93.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 938638e4a31bb8041b7f0d7996c6204c gnome-games-1.93.0.tar.bz2 8884463
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-1.94.0 b/gnome-extra/gnome-games/files/digest-gnome-games-1.94.0
deleted file mode 100644
index 6e2aae94dc41..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-1.94.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5a04c8c20c154b62ae6cc779c1beb15 gnome-games-1.94.0.tar.bz2 8908509
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.0.1-r1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.0.1-r1
new file mode 100644
index 000000000000..a1f527cd0cc3
--- /dev/null
+++ b/gnome-extra/gnome-games/files/digest-gnome-games-2.0.1-r1
@@ -0,0 +1 @@
+MD5 f70b83d1cc7930530008035a4bb69bf5 gnome-games-2.0.1.tar.bz2 8938175
diff --git a/gnome-extra/gnome-games/gnome-games-1.92.0.ebuild b/gnome-extra/gnome-games/gnome-games-1.92.0.ebuild
deleted file mode 100644
index 5ec9dda085ad..000000000000
--- a/gnome-extra/gnome-games/gnome-games-1.92.0.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Spider  <spider@gentoo.org>
-# Maintainer: Spider <spider@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-1.92.0.ebuild,v 1.1 2002/05/22 22:18:39 spider Exp $
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Games for the Gnome2 desktop"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=dev-libs/glib-2.0.0
-	>=x11-libs/pango-1.0.0
-	>=dev-libs/atk-1.0.0
-	>=x11-libs/gtk+-2.0.0
-	>=x11-libs/libzvt-1.112.0
-	=media-libs/freetype-2*
-	>=dev-libs/libxml2-2.4.17
-	>=app-text/scrollkeeper-0.3.4-r1
-	>=sys-libs/ncurses-5.2-r3
-	>=sys-libs/readline-4.1-r3
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/guile-1.5.4
-	>=gnome-base/libglade-1.99.8-r1
-	>=gnome-base/gconf-1.1.8-r1
-	>=gnome-base/libgnomeui-1.112.1
-	>=gnome-base/libgnome-1.112.1
-	>=gnome-base/gnome-vfs-1.9.10
-	>=gnome-base/ORBit2-2.3.106
-	>=gnome-base/bonobo-activation-0.9.5
-	>=gnome-base/gnome-panel-1.5.12
-	>=gnome-base/libgnomecanvas-1.112.1"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17
-	${RDEPEND}"
-
-
-		
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/lib \
-		--disable-guname-capplet \
-		--enable-gcolorsel-applet \
-		--with-ncurses \
-		--enable-debug=yes || die "configure failure"
-	emake || die "compile failure"
-}
-
-src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		localstatedir=${D}/var/lib \
-		install || die "install failure"
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	dodoc AUTHORS COPYING COPYING-DOCS ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO
-
-	docinto aisleriot
-	cd aisleriot
-	dodoc AUTHORS ChangeLog TODO
-	
-	cd ../freecell
-	docinto freecell
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	cd ../gataxx
-	docinto gataxx
-	dodoc AUTHORS ChangeLog TODO
-	
-	cd ../glines
-	docinto glines
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	cd ../gnect
-	docinto gnect
-	dodoc AUTHORS ChangeLog TODO
-
-	cd ../gnibbles
-	docinto gnibbles
-	dodoc  AUTHORS ChangeLog
-
-	cd ../gnobots2
-	docinto gnobots2
-	dodoc  AUTHORS README
-	
-	cd ../gnome-stones
-	docinto gnome-stones
-	dodoc  ChangeLog README TODO
-	
-	cd ../gnometris
-	docinto gnometris
-	dodoc AUTHORS COPYING  ChangeLog TODO
-
-	cd ../gnomine
-	docinto gnomine 	
-	dodoc AUTHORS ChangeLog README
-	
-	cd ../gnotravex
-	docinto gnotravex
-	dodoc AUTHORS  ChangeLog README
-
-	cd ../gnotski
-	docinto gnotski
-	dodoc AUTHORS ChangeLog README
-
-	cd ../gtali
-	docinto gtali
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-
-	cd ../iagno
-	docinto iagno
-	dodoc  AUTHORS ChangeLog
-
-	cd ../mahjongg
-	docinto mahjongg
-	dodoc ChangeLog NEWS README TODO
-
-	cd ../same-gnome
-	docinto same-gnome
-	dodoc ChangeLog README TODO
-
-	cd ../xbill
-	docinto xbill
-	dodoc AUTHORS COPYING ChangeLog NEWS README README.Ports
-
-	cd ..
-}
-
-pkg_postinst() {
-	echo ">>> Scrollkeeper-update"
-		scrollkeeper-update -p /var/lib/scrollkeeper
-	echo ">>> updating GConf2"
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	for SCHEMA in freecell.schemas gnect.schemas \
-		gnomine.schemas iagno.schemas gataxx.schemas \
-		gnometris.schemas  gtali.schemas same-gnome.schemas ; do
-		echo $SCHEMA
-		/usr/bin/gconftool-2  --makefile-install-rule \
-			/etc/gconf/schemas/${SCHEMA}
-	done
-}	
-
-
diff --git a/gnome-extra/gnome-games/gnome-games-1.94.0.ebuild b/gnome-extra/gnome-games/gnome-games-1.94.0.ebuild
deleted file mode 100644
index 74c9ed7b7af7..000000000000
--- a/gnome-extra/gnome-games/gnome-games-1.94.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-1.94.0.ebuild,v 1.1 2002/06/05 22:09:07 spider Exp $
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-export CFLAGS="${CFLAGS/-fomit-frame-pointer/} -g"
-export CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer/} -g"
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Games for the Gnome2 desktop"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=x11-libs/pango-1.0.2
-	>=dev-libs/atk-1.0.2
-	>=x11-libs/gtk+-2.0.3
-	>=x11-libs/libzvt-1.116.0
-	=media-libs/freetype-2.0*
-	>=dev-libs/libxml2-2.4.22
-	>=app-text/scrollkeeper-0.3.4-r1
-	>=sys-libs/ncurses-5.2
-	>=sys-libs/readline-4.1
-	>=sys-devel/gettext-0.10.40
-	>=dev-util/guile-1.5.4
-	>=gnome-base/libglade-1.99.8-r1
-	>=gnome-base/gconf-1.1.8-r1
-	>=gnome-base/libgnomeui-1.117.1
-	>=gnome-base/libgnome-1.117.1
-	>=gnome-base/gnome-vfs-1.9.10
-	>=gnome-base/ORBit2-2.4.0
-	>=gnome-base/bonobo-activation-0.9.9
-	>=gnome-base/gnome-panel-1.5.23
-	>=gnome-base/libgnomecanvas-1.117.0
-	>=gnome-base/libgnomeui-1.117.2-r1"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.17
-	${RDEPEND}"
-
-
-		
-src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/lib \
-		--disable-guname-capplet \
-		--enable-gcolorsel-applet \
-		--with-ncurses \
-		--enable-debug=yes || die "configure failure"
-	emake || die "compile failure"
-}
-
-src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		localstatedir=${D}/var/lib \
-		install || die "install failure"
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-	dodoc AUTHORS COPYING COPYING-DOCS ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO
-
-	docinto aisleriot
-	cd aisleriot
-	dodoc AUTHORS ChangeLog TODO
-	
-	cd ../freecell
-	docinto freecell
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	cd ../gataxx
-	docinto gataxx
-	dodoc AUTHORS ChangeLog TODO
-	
-	cd ../glines
-	docinto glines
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	cd ../gnect
-	docinto gnect
-	dodoc AUTHORS ChangeLog TODO
-
-	cd ../gnibbles
-	docinto gnibbles
-	dodoc  AUTHORS ChangeLog
-
-	cd ../gnobots2
-	docinto gnobots2
-	dodoc  AUTHORS README
-	
-	cd ../gnome-stones
-	docinto gnome-stones
-	dodoc  ChangeLog README TODO
-	
-	cd ../gnometris
-	docinto gnometris
-	dodoc AUTHORS COPYING  ChangeLog TODO
-
-	cd ../gnomine
-	docinto gnomine 	
-	dodoc AUTHORS ChangeLog README
-	
-	cd ../gnotravex
-	docinto gnotravex
-	dodoc AUTHORS  ChangeLog README
-
-	cd ../gnotski
-	docinto gnotski
-	dodoc AUTHORS ChangeLog README
-
-	cd ../gtali
-	docinto gtali
-	dodoc AUTHORS ChangeLog INSTALL README TODO
-
-	cd ../iagno
-	docinto iagno
-	dodoc  AUTHORS ChangeLog
-
-	cd ../mahjongg
-	docinto mahjongg
-	dodoc ChangeLog NEWS README TODO
-
-	cd ../same-gnome
-	docinto same-gnome
-	dodoc ChangeLog README TODO
-
-	cd ../xbill
-	docinto xbill
-	dodoc AUTHORS COPYING ChangeLog NEWS README README.Ports
-
-	cd ..
-}
-
-pkg_postinst() {
-	echo ">>> Scrollkeeper-update"
-		scrollkeeper-update -p /var/lib/scrollkeeper
-	echo ">>> updating GConf2"
-	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	for SCHEMA in freecell.schemas gnect.schemas \
-		gnomine.schemas iagno.schemas gataxx.schemas \
-		gnometris.schemas  gtali.schemas same-gnome.schemas ; do
-		echo $SCHEMA
-		/usr/bin/gconftool-2  --makefile-install-rule \
-			/etc/gconf/schemas/${SCHEMA}
-	done
-}	
-
-
diff --git a/gnome-extra/gnome-games/gnome-games-1.93.0.ebuild b/gnome-extra/gnome-games/gnome-games-2.0.1-r1.ebuild
index 8b0008ec03c2..94fc358c4aa2 100644
--- a/gnome-extra/gnome-games/gnome-games-1.93.0.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.0.1-r1.ebuild
@@ -1,41 +1,35 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-1.93.0.ebuild,v 1.1 2002/05/29 01:21:17 spider Exp $
-
-# Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
-DEBUG="yes"
-RESTRICT="nostrip"
-# force debug information
-CFLAGS="${CFLAGS} -g"
-CXXFLAGS="${CXXFLAGS} -g"
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.0.1-r1.ebuild,v 1.1 2002/06/28 05:42:20 spider Exp $
 
+inherit debug
+inherit libtool
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Games for the Gnome2 desktop"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://gnome/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
 
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=x11-libs/pango-1.0.2
+RDEPEND=">=dev-libs/glib-2.0.4
+	>=x11-libs/pango-1.0.3
 	>=dev-libs/atk-1.0.2
-	>=x11-libs/gtk+-2.0.3
-	>=x11-libs/libzvt-1.116.0
+	>=x11-libs/gtk+-2.0.5
+	>=x11-libs/libzvt-2.0.0
 	=media-libs/freetype-2.0*
 	>=dev-libs/libxml2-2.4.22
 	>=app-text/scrollkeeper-0.3.4-r1
 	>=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.1
 	>=sys-devel/gettext-0.10.40
-	>=dev-util/guile-1.5.4
-	>=gnome-base/libglade-1.99.8-r1
-	>=gnome-base/gconf-1.1.8-r1
-	>=gnome-base/libgnomeui-1.117.1
-	>=gnome-base/libgnome-1.117.1
-	>=gnome-base/gnome-vfs-1.9.10
+	>=gnome-base/libglade-2.0.0
+	>=gnome-base/gconf-1.2.0
+	>=gnome-base/gnome-vfs-2.0.0
 	>=gnome-base/ORBit2-2.4.0
-	>=gnome-base/bonobo-activation-0.9.9
-	>=gnome-base/gnome-panel-1.5.23
-	>=gnome-base/libgnomecanvas-1.117.0"
+	>=gnome-base/bonobo-activation-1.0.0
+	>=gnome-base/gnome-panel-2.0.0
+	>=gnome-base/libgnome-2.0.1
+	>=gnome-base/libgnomecanvas-2.0.1
+	>=gnome-base/libgnomeui-2.0.1"
 
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.17
@@ -44,14 +38,13 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 
 		
 src_compile() {
+	elibtoolize
 	./configure --host=${CHOST} \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--localstatedir=/var/lib \
-		--disable-guname-capplet \
-		--enable-gcolorsel-applet \
 		--with-ncurses \
 		--enable-debug=yes || die "configure failure"
 	emake || die "compile failure"
@@ -145,9 +138,10 @@ pkg_postinst() {
 		scrollkeeper-update -p /var/lib/scrollkeeper
 	echo ">>> updating GConf2"
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-	for SCHEMA in freecell.schemas gnect.schemas \
-		gnomine.schemas iagno.schemas gataxx.schemas \
-		gnometris.schemas  gtali.schemas same-gnome.schemas ; do
+	for SCHEMA in same-gnome.schemas mahjongg.schemas \
+		iagno.schemas gtali.schemas gnomine.schemas \
+		gnometris.schemas gnect.schemas \
+		gataxx.schemas freecell.schemas ; do 
 		echo $SCHEMA
 		/usr/bin/gconftool-2  --makefile-install-rule \
 			/etc/gconf/schemas/${SCHEMA}