gnome 2.18.0

Package-Manager: portage-2.1.2.2

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index 046d67b1d9024a7be9a4dfe45bbc03d56becca12..09b28a52f9f6aa370edbadefff0ea9bdb2d23829 100644 (file)
--- 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/Manifest b/gnome-extra/gnome-games/Manifest
index 2a9e7a56f9861137444f20a0b9f52e6ac6aee123..ca4bdb8ebc9d0ba60f62fe4064c90a2819e06a75 100644 (file)
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -9,9 +9,14 @@ AUX gnome-games-2.14.0-no_lazy_bindings.patch 524 RMD160 1829b3f68998e195e4ff865
 MD5 778b004de6841c802a00b6862d73d6a2 files/gnome-games-2.14.0-no_lazy_bindings.patch 524
 RMD160 1829b3f68998e195e4ff865982ff1818063ee604 files/gnome-games-2.14.0-no_lazy_bindings.patch 524
 SHA256 1d77a19b5d940ff23ee3110feb1ccc37a920e722c2cc0304abaf7a745cfab99d files/gnome-games-2.14.0-no_lazy_bindings.patch 524
+AUX gnome-games-2.17.92-guile-switch.patch 2568 RMD160 133305119fae9f881069d70b1558729a9d9c86b7 SHA1 3bce2b11c5eda70944879e4fc37cdaf21ae6fab9 SHA256 7d5dbf1668993784b7de52e0dcf2dcb8dec16126f802be3afa6ca76cc6b7edf2
+MD5 5cd09b7e497feae770d2b69a2e4d282f files/gnome-games-2.17.92-guile-switch.patch 2568
+RMD160 133305119fae9f881069d70b1558729a9d9c86b7 files/gnome-games-2.17.92-guile-switch.patch 2568
+SHA256 7d5dbf1668993784b7de52e0dcf2dcb8dec16126f802be3afa6ca76cc6b7edf2 files/gnome-games-2.17.92-guile-switch.patch 2568
 DIST gnome-games-2.14.2.1.tar.bz2 5057108 RMD160 ef35b8c712d466eefd936aaecb05efa77f748967 SHA1 e1ce2365084abfb0f4a6b8ef38d6e0fdda57bf5e SHA256 2d57e34b28a648f96d41d92252267f6f374d4461f66f781175d006bed653fcd8
 DIST gnome-games-2.16.2.tar.bz2 5257581 RMD160 0d78978f7fd6a254a06f6c8b08950d33958ae6a0 SHA1 e40e10794834c3662f320f90da663d9de3936cac SHA256 a6b20aa2684f223a41521d28c6b6e8a10ef9c9ad0540e5389564404ddd591a25
 DIST gnome-games-2.16.3.tar.bz2 5276299 RMD160 2f2f3dd316a5a11bb18046bed5e1505dc1a08b3f SHA1 38393162ec3ccfa2639e611a478516f6d810d5a7 SHA256 7c32dc59819cbf22787d5ac1fde221a4cd38a20de33831246e12811520294d05
+DIST gnome-games-2.18.0.tar.bz2 6971792 RMD160 86723d086dd01de4ef9d1dc4f739142bd3a2c447 SHA1 50ecd8e30cdc76052ada1b1d6220703a52f43074 SHA256 52dc7345725488c64b23dc4fa6ffe441cb1ead8b1022d400216ffe48159a83ac
 EBUILD gnome-games-2.14.2.1.ebuild 2057 RMD160 77639544e2e376a0832c9b5369db3acd62df633e SHA1 46d343d177569b6df109594aa4cfb750b2451f7b SHA256 e98e270ab405750abd46e668c743c52f6b9f8342c4198dceefdd20ac3afba861
 MD5 24cc6b772619f583ad9bf628897f8f14 gnome-games-2.14.2.1.ebuild 2057
 RMD160 77639544e2e376a0832c9b5369db3acd62df633e gnome-games-2.14.2.1.ebuild 2057
@@ -24,10 +29,14 @@ EBUILD gnome-games-2.16.3.ebuild 2472 RMD160 51fe097bc61663c7cbe86c144d29991405e
 MD5 c14d7e677250bdafff7ac759ad1675c3 gnome-games-2.16.3.ebuild 2472
 RMD160 51fe097bc61663c7cbe86c144d29991405e6e8f9 gnome-games-2.16.3.ebuild 2472
 SHA256 27e48a53bb4442e2c7dd8a37d71e110ef670eaeee5d2ca1beb116d6c2fe91804 gnome-games-2.16.3.ebuild 2472
-MISC ChangeLog 24447 RMD160 92e2507f21613b462e1878e77f38d8a513670071 SHA1 b61e42961ec08b9bb3a4429bfda2951297a88d67 SHA256 0c30d1ad571dcaa76211b806693009a90af182fbcdb9265e99b217034e2032f7
-MD5 f00452afff1072b22b2fdfa187c935a5 ChangeLog 24447
-RMD160 92e2507f21613b462e1878e77f38d8a513670071 ChangeLog 24447
-SHA256 0c30d1ad571dcaa76211b806693009a90af182fbcdb9265e99b217034e2032f7 ChangeLog 24447
+EBUILD gnome-games-2.18.0.ebuild 2552 RMD160 cc360aaaf90d0a99747d22932263cd10406cbecd SHA1 8e4809896561235fcab6f06d0d565a65d0d32b12 SHA256 07f692295dc2f22ca28dcd1e0b3f75ccadcbe96338c7a40fef348bbb0c503b7a
+MD5 e7cf09c883f1a627fce910be3c4e22e0 gnome-games-2.18.0.ebuild 2552
+RMD160 cc360aaaf90d0a99747d22932263cd10406cbecd gnome-games-2.18.0.ebuild 2552
+SHA256 07f692295dc2f22ca28dcd1e0b3f75ccadcbe96338c7a40fef348bbb0c503b7a gnome-games-2.18.0.ebuild 2552
+MISC ChangeLog 24626 RMD160 e0ae33645689aa544e8cd70741b7d79e28a3b688 SHA1 90d4ba542a11337ab6b5e40c8b7478f0097b6d82 SHA256 3b68ec31c84c070b99332af48fda7a3514d8f1091fa77132d351e3734214c1cb
+MD5 f8a211ac17119ccf6c8a6593b2ffd84c ChangeLog 24626
+RMD160 e0ae33645689aa544e8cd70741b7d79e28a3b688 ChangeLog 24626
+SHA256 3b68ec31c84c070b99332af48fda7a3514d8f1091fa77132d351e3734214c1cb ChangeLog 24626
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -41,10 +50,13 @@ SHA256 ba829260fc5376e8889755123624c53d707c8d25665f357b6226027ffac9ebbe files/di
 MD5 e231c387b716a5f3ce2cdb58e8aba6de files/digest-gnome-games-2.16.3 262
 RMD160 cd260ae84ca317128ed5a5fb864e3196197b2b77 files/digest-gnome-games-2.16.3 262
 SHA256 da66ebc27e3fff1bf25f4d4d2cce39bbe85a1dfe72227c6b719cff251450fd11 files/digest-gnome-games-2.16.3 262
+MD5 2b7c9b6b99eb19f0c7262b193d1946a1 files/digest-gnome-games-2.18.0 262
+RMD160 1e37677f50ec80ad4e4cf098bf85fd80111df1b7 files/digest-gnome-games-2.18.0 262
+SHA256 5d2d67168b86ce82e010a12493da9a68eb2817efed94bc308ae6cbd85f51a8c3 files/digest-gnome-games-2.18.0 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF/vdhomPajV0RnrERAkAHAJ42yjEWoVK3NUDvD68ykRMFwImuaQCdHH79
-OH5jTd/0n4UcaY5/E8OSHS0=
-=o+8i
+iD8DBQFGCX7jomPajV0RnrERAs3qAJ9L3EisY75ouX3gN2ahsiPhhdgkkACgg+x9
+mXDyt8K1NBi/3wsx7myJ+Mw=
+=r1Jc
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..7848cd4
--- /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 (file)
index 0000000..bfeeece
--- /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 (file)
index 0000000..6ecc639
--- /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
+}