gnome 2.18.0

(Portage version: 2.1.2.2)

4 files changed, 157 insertions, 1 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 046d67b1d902..09b28a52f9f6 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.190 2007/03/19 20:49:35 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.191 2007/03/27 20:32:06 dang Exp $
+
+*gnome-games-2.18.0 (27 Mar 2007)
+
+  27 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-games-2.17.92-guile-switch.patch, +gnome-games-2.18.0.ebuild:
+  gnome 2.18.0
 
   19 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
   gnome-games-2.16.2.ebuild, gnome-games-2.16.3.ebuild:
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.18.0 b/gnome-extra/gnome-games/files/digest-gnome-games-2.18.0
new file mode 100644
index 000000000000..7848cd4487ac
--- /dev/null
+++ b/gnome-extra/gnome-games/files/digest-gnome-games-2.18.0
@@ -0,0 +1,3 @@
+MD5 ef00cec63ca8b4e328c1975377f98f11 gnome-games-2.18.0.tar.bz2 6971792
+RMD160 86723d086dd01de4ef9d1dc4f739142bd3a2c447 gnome-games-2.18.0.tar.bz2 6971792
+SHA256 52dc7345725488c64b23dc4fa6ffe441cb1ead8b1022d400216ffe48159a83ac gnome-games-2.18.0.tar.bz2 6971792
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.17.92-guile-switch.patch b/gnome-extra/gnome-games/files/gnome-games-2.17.92-guile-switch.patch
new file mode 100644
index 000000000000..bfeeece2814f
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.17.92-guile-switch.patch
@@ -0,0 +1,52 @@
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gnome-games-2.17.92.orig/configure.in gnome-games-2.17.92/configure.in
+--- gnome-games-2.17.92.orig/configure.in	2007-02-27 00:12:12.000000000 -0500
++++ gnome-games-2.17.92/configure.in	2007-02-28 17:12:32.000000000 -0500
+@@ -35,23 +35,31 @@ dnl Checking for the header file is basi
+ dnl out if the _development_ files are present. guile-config returns
+ dnl a value regardless of what is actually installed. The problem
+ dnl with this is if the header ever gets moved to a non-default location.
+-AC_CHECK_HEADER([libguile.h], [GUILE_PRESENT=yes], [GUILE_PRESENT=no])
+-if test "$GUILE_PRESENT" = "yes" ; then
+-  GUILE_CFLAGS=`guile-config compile`
+-  GUILE_LDFLAGS=`guile-config link`
+-  AC_SUBST(GUILE_CFLAGS)
+-  AC_SUBST(GUILE_LDFLAGS)
+-  dnl On 64-bit machines guile < 1.6.5 causes a crash in aisleriot.
+-  dnl But since 1.6.5 is only a few months old as I write this we 
+-  dnl will be more lenient with 32-bit machines.
+-  if uname -m | grep 64 ; then
+-     GUILE_TARGET="1.6.5"
+-  else 
+-     GUILE_TARGET="1.6.0"
+-  fi
+-  if test `guile -c '(if (string<? (version) (cadr (command-line))) (display "no") (display "yes")) (newline)' $GUILE_TARGET` != yes ; then 
+-    GUILE_PRESENT="no"
+-    AC_MSG_WARN([Your version of guile is too old, please install a recent guile package (>= $GUILE_TARGET)])
++AC_MSG_CHECKING([whether guile support is requested])
++AC_ARG_ENABLE([guile],
++  AS_HELP_STRING([--enable-guile],[Enable guile use for Aisleriot (default=yes)]),
++  [enable_guile=$enableval],
++  [enable_guile=yes])
++AC_MSG_RESULT([$enable_guile])
++if test x$enable_guile = xyes; then
++  AC_CHECK_HEADER([libguile.h], [GUILE_PRESENT=yes], [GUILE_PRESENT=no])
++  if test "$GUILE_PRESENT" = "yes" ; then
++    GUILE_CFLAGS=`guile-config compile`
++    GUILE_LDFLAGS=`guile-config link`
++    AC_SUBST(GUILE_CFLAGS)
++    AC_SUBST(GUILE_LDFLAGS)
++    dnl On 64-bit machines guile < 1.6.5 causes a crash in aisleriot.
++    dnl But since 1.6.5 is only a few months old as I write this we 
++    dnl will be more lenient with 32-bit machines.
++    if uname -m | grep 64 ; then
++       GUILE_TARGET="1.6.5"
++    else 
++       GUILE_TARGET="1.6.0"
++    fi
++    if test `guile -c '(if (string<? (version) (cadr (command-line))) (display "no") (display "yes")) (newline)' $GUILE_TARGET` != yes ; then 
++      GUILE_PRESENT="no"
++      AC_MSG_WARN([Your version of guile is too old, please install a recent guile package (>= $GUILE_TARGET)])
++    fi
+   fi
+ fi
+ AM_CONDITIONAL([HAVE_GUILE], [test "x$GUILE_PRESENT" = xyes])
diff --git a/gnome-extra/gnome-games/gnome-games-2.18.0.ebuild b/gnome-extra/gnome-games/gnome-games-2.18.0.ebuild
new file mode 100644
index 000000000000..6ecc6390294d
--- /dev/null
+++ b/gnome-extra/gnome-games/gnome-games-2.18.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.18.0.ebuild,v 1.1 2007/03/27 20:32:06 dang Exp $
+
+# make sure games is inherited first so that the gnome2
+# functions will be called if they are not overridden
+inherit games eutils gnome2 autotools
+
+DESCRIPTION="Collection of games for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="artworkextra guile opengl"
+
+RDEPEND=">=gnome-base/libgnomeui-2.16.0
+	>=gnome-base/libgnome-2.16.0
+	>=dev-python/pygtk-2.10
+	>=dev-python/gnome-python-desktop-2.17.3
+	>=x11-libs/gtk+-2.8
+	>=gnome-base/gconf-2
+	>=gnome-base/librsvg-2
+	>=x11-libs/cairo-1
+	>=dev-libs/libxml2-2.4.0
+	>=gnome-base/libglade-2
+	>=dev-libs/glib-2.6.3
+	guile? ( >=dev-scheme/guile-1.6.5 )
+	artworkextra? ( gnome-extra/gnome-games-extra-data )
+	opengl? ( dev-python/pygtkglext )
+	!games-board/glchess"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.53
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.10.40
+	>=gnome-base/gnome-common-2.12.0
+	>=app-text/scrollkeeper-0.3.8"
+
+# Others are installed below; multiples in this package.
+DOCS="HACKING MAINTAINERS"
+
+
+pkg_setup() {
+	# create the games user / group
+	games_pkg_setup
+
+	G2CONF="--with-scores-group=${GAMES_GROUP} \
+		$(use_enable guile)"
+
+	if use guile; then
+		if has_version =guile-1.8*; then
+			local flags="deprecated regex"
+			built_with_use dev-scheme/guile ${flags} || die "guile must be built with \"${flags}\" use flags"
+		fi
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Resolve symbols at execution time in setgid binaries
+	epatch ${FILESDIR}/${PN}-2.14.0-no_lazy_bindings.patch
+
+	# Implement --enable-guile switch
+	epatch ${FILESDIR}/${PN}-2.17.92-guile-switch.patch
+
+	AT_M4DIR="./m4" eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Documentation install for each of the games
+	for game in \
+	$(find . -maxdepth 1 -type d ! -name po ! -name libgames-support); do
+		docinto ${game}
+		for doc in AUTHORS ChangeLog NEWS README TODO; do
+			[ -s ${game}/${doc} ] && dodoc ${game}/${doc}
+		done
+	done
+}
+
+pkg_preinst() {
+	# Avoid overwriting previous .scores files
+	local basefile
+	for scorefile in ${D}/var/lib/games/*.scores; do
+		basefile=$(basename $scorefile)
+		if [ -s "${ROOT}/var/lib/games/${basefile}" ]; then
+			cp "${ROOT}/var/lib/games/${basefile}" \
+			"${D}/var/lib/games/${basefile}"
+		fi
+	done
+}