New release: 2.12.0. New revision: 2.10.1-r1 (bug #104952).
authorLeonardo Boshell <leonardop@gentoo.org>
Wed, 7 Sep 2005 19:54:53 +0000 (19:54 +0000)
committerLeonardo Boshell <leonardop@gentoo.org>
Wed, 7 Sep 2005 19:54:53 +0000 (19:54 +0000)
Package-Manager: portage-2.0.51.22-r2

gnome-extra/gnome-games/ChangeLog
gnome-extra/gnome-games/Manifest
gnome-extra/gnome-games/files/digest-gnome-games-2.10.1-r1 [new file with mode: 0644]
gnome-extra/gnome-games/files/digest-gnome-games-2.11.5 [deleted file]
gnome-extra/gnome-games/files/digest-gnome-games-2.12.0 [new file with mode: 0644]
gnome-extra/gnome-games/files/gnome-games-2.10.1-no_esd.patch [new file with mode: 0644]
gnome-extra/gnome-games/files/gnome-games-2.12.0-guile_switch.patch [new file with mode: 0644]
gnome-extra/gnome-games/files/gnome-games-2.12.0-no_lazy_bindings.patch [new file with mode: 0644]
gnome-extra/gnome-games/gnome-games-2.10.1-r1.ebuild [moved from gnome-extra/gnome-games/gnome-games-2.11.5.ebuild with 85% similarity]
gnome-extra/gnome-games/gnome-games-2.12.0.ebuild [new file with mode: 0644]

index ab2c72f815e253ab998aa9ca9cb9b70cf5a1e201..50cbe2bfec769e0aba9fbdd36ab8062389a484d6 100644 (file)
@@ -1,6 +1,23 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.121 2005/08/26 01:22:34 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.122 2005/09/07 19:54:53 leonardop Exp $
+
+*gnome-games-2.12.0 (07 Sep 2005)
+
+  07 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/gnome-games-2.12.0-guile_switch.patch,
+  +files/gnome-games-2.12.0-no_lazy_bindings.patch,
+  -gnome-games-2.11.5.ebuild, +gnome-games-2.12.0.ebuild:
+  New version. Added patch to apply the 'guile' USE flag properly. Added
+  patch to pass security-related LDFLAGS; removed outdated message from
+  pkg_postinst(). Handle the scores group in pkg_setup().
+
+*gnome-games-2.10.1-r1 (07 Sep 2005)
+
+  07 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/gnome-games-2.10.1-no_esd.patch,
+  +gnome-games-2.10.1-r1.ebuild:
+  Added patch to fix compilation if esound is not present (bug #104952).
 
 *gnome-games-2.11.5 (26 Aug 2005)
 
index f5533b42c3ba5d60a93e9120bac6a021f61c9bba..08a0af2f5fc4cd1c6e25c8b43be3969959b10d53 100644 (file)
@@ -1,12 +1,17 @@
+MD5 062885a701a7fa4a54b69a8944e85520 ChangeLog 15075
 MD5 f02a05514168bad80a360c1c3211900f gnome-games-1.4.0.3-r3.ebuild 1272
-MD5 eb63eab37adca3710bf147a7c501b319 gnome-games-2.10.0.ebuild 2055
-MD5 d2ad49c658a964c7742cb077741bc64f gnome-games-2.11.5.ebuild 2086
 MD5 3665a69da9bfbc224b55dc39a503381b gnome-games-2.10.1.ebuild 2057
-MD5 36e8c6f612a70848e17504ebbc054532 ChangeLog 14381
+MD5 39b6c85952667352a387afb7a50ebef3 gnome-games-2.10.1-r1.ebuild 2184
+MD5 345183dc40aa3e60e8878b7f7b900680 gnome-games-2.12.0.ebuild 2161
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 eb63eab37adca3710bf147a7c501b319 gnome-games-2.10.0.ebuild 2055
 MD5 2301a09a3e02fd7e40f6ee5a7e79e95c files/digest-gnome-games-1.4.0.3-r3 72
-MD5 05ba368f9e9d4b208ecf3e839ffba4a0 files/gnome-games-2.9.6-nohowl.patch 953
 MD5 a6d5477575722e3b5bec6c15356eb4a1 files/gnome-games-2.11.4-nohowl.patch 922
+MD5 372ffee341289fdafeae705e94970666 files/gnome-games-2.10.1-no_esd.patch 1379
+MD5 c33cfe151eccd5d14201388ceb3f4adc files/digest-gnome-games-2.10.1-r1 72
+MD5 8d91691165ace5474d7a892378aa82aa files/digest-gnome-games-2.12.0 72
+MD5 ef2396fd605d03087c2f3a8c836b10e5 files/gnome-games-2.12.0-guile_switch.patch 1466
+MD5 1b0d6fcbf8e59a0343dc7cb3ccfd4b45 files/gnome-games-2.12.0-no_lazy_bindings.patch 702
 MD5 d12063544c92d2ed0dff801d3d593707 files/digest-gnome-games-2.10.0 72
+MD5 05ba368f9e9d4b208ecf3e839ffba4a0 files/gnome-games-2.9.6-nohowl.patch 953
 MD5 c33cfe151eccd5d14201388ceb3f4adc files/digest-gnome-games-2.10.1 72
-MD5 77a2a630762e9428f8c1b4a6acd8ae86 files/digest-gnome-games-2.11.5 72
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.10.1-r1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.10.1-r1
new file mode 100644 (file)
index 0000000..742c0ab
--- /dev/null
@@ -0,0 +1 @@
+MD5 b7d21e5e12de80c50266e8735e04577c gnome-games-2.10.1.tar.bz2 5372474
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.11.5 b/gnome-extra/gnome-games/files/digest-gnome-games-2.11.5
deleted file mode 100644 (file)
index 1c95f11..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7e55c2cce68886b48b81a513175956cb gnome-games-2.11.5.tar.bz2 4967289
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.12.0 b/gnome-extra/gnome-games/files/digest-gnome-games-2.12.0
new file mode 100644 (file)
index 0000000..cceb401
--- /dev/null
@@ -0,0 +1 @@
+MD5 f837a95f29008837c91481b0a5619166 gnome-games-2.12.0.tar.bz2 4929461
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.10.1-no_esd.patch b/gnome-extra/gnome-games/files/gnome-games-2.10.1-no_esd.patch
new file mode 100644 (file)
index 0000000..7c53feb
--- /dev/null
@@ -0,0 +1,42 @@
+diff -NurdB gnome-games-2.10.1/configure.in gnome-games-2.10.1-patched/configure.in
+--- gnome-games-2.10.1/configure.in    2005-04-12 10:25:33.000000000 +0000
++++ gnome-games-2.10.1-patched/configure.in    2005-09-06 22:48:34.031127752 +0000
+@@ -107,7 +107,9 @@
+   GNOME_GAMES_CFLAGS="-std=gnu89 $GNOME_GAMES_CFLAGS"
+ fi
+ 
+-PKG_CHECK_MODULES(ESD, esound, , [ CFLAGS="$CFLAGS -DNO_ESD" ])
++PKG_CHECK_MODULES(ESD, esound, , [
++  CFLAGS="$CFLAGS -DNO_ESD"
++  CXXFLAGS="$CXXFLAGS -DNO_ESD" ])
+ AC_SUBST(ESD_CFLAGS)
+ AC_SUBST(ESD_LIBS)
+ 
+diff -NurdB gnome-games-2.10.1/gnome-stones/sound.c gnome-games-2.10.1-patched/gnome-stones/sound.c
+--- gnome-games-2.10.1/gnome-stones/sound.c    2004-07-18 04:27:04.000000000 +0000
++++ gnome-games-2.10.1-patched/gnome-stones/sound.c    2005-09-06 22:47:23.730815024 +0000
+@@ -20,7 +20,9 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <esd.h>
++#ifndef NO_ESD
++# include <esd.h>
++#endif
+ #include <gnome.h>
+ #include "sound.h"
+ 
+diff -NurdB gnome-games-2.10.1/gnometris/sound.cpp gnome-games-2.10.1-patched/gnometris/sound.cpp
+--- gnome-games-2.10.1/gnometris/sound.cpp     2004-10-19 06:57:33.000000000 +0000
++++ gnome-games-2.10.1-patched/gnometris/sound.cpp     2005-09-06 22:47:23.731814872 +0000
+@@ -21,7 +21,9 @@
+  */
+ 
+ #include <gnome.h>
+-#include <esd.h>
++#ifndef NO_ESD
++# include <esd.h>
++#endif
+ 
+ #include "sound.h"
+ 
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.12.0-guile_switch.patch b/gnome-extra/gnome-games/files/gnome-games-2.12.0-guile_switch.patch
new file mode 100644 (file)
index 0000000..ed176a7
--- /dev/null
@@ -0,0 +1,36 @@
+diff -NurdB gnome-games-2.12.0/configure.in gnome-games-2.12.0-patched/configure.in
+--- gnome-games-2.12.0/configure.in    2005-09-05 02:30:33.000000000 -0500
++++ gnome-games-2.12.0-patched/configure.in    2005-09-07 13:17:22.000000000 -0500
+@@ -28,7 +28,22 @@
+ 
+ dnl We could use the guile.m4 macros, but this is in fact simpler
+ dnl for what we want.
+-AC_CHECK_PROG(GUILE_PRESENT, guile-config, yes, no) 
++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_PROG(GUILE_PRESENT, guile-config, yes, no)
++  if test "$GUILE_PRESENT" = "no" ; then
++    AC_MSG_ERROR([Guile not found.])
++  fi
++else
++  GUILE_PRESENT="no"
++fi
++
+ if test "$GUILE_PRESENT" = "yes" ; then
+   GUILE_CFLAGS=`guile-config compile`
+   GUILE_LDFLAGS=`guile-config link`
+@@ -44,7 +59,7 @@
+   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_ERROR([Your version of guile is too old, please install a recent guile package (>= $GUILE_TARGET)])
+   fi
+ fi
+ AM_CONDITIONAL([HAVE_GUILE], [test "x$GUILE_PRESENT" = xyes])
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.12.0-no_lazy_bindings.patch b/gnome-extra/gnome-games/files/gnome-games-2.12.0-no_lazy_bindings.patch
new file mode 100644 (file)
index 0000000..8380d33
--- /dev/null
@@ -0,0 +1,11 @@
+diff -NurdB gnome-games-2.12.0/configure.in gnome-games-2.12.0-patched/configure.in
+--- gnome-games-2.12.0/configure.in    2005-09-05 02:30:33.000000000 -0500
++++ gnome-games-2.12.0-patched/configure.in    2005-09-07 13:47:56.000000000 -0500
+@@ -101,6 +101,7 @@
+ GNOME_GAMES_CXXFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CXXFLAGS"
+ GNOME_GAMES_CFLAGS="$GNOME_GAMES_CFLAGS -I\$(top_srcdir)/libgames-support $WARN_CFLAGS"
+ GNOME_GAMES_LIBS="$GNOME_GAMES_LIBS \$(top_builddir)/libgames-support/libgames-support.la"
++GNOME_GAMES_LIBS="$GNOME_GAMES_LIBS -Wl,-z,now"
+ 
+ ## Use a separate set of flags for C++ (so we can exclude -std=gnu89 for
+ ## example, it doesn't make sense under C++).
similarity index 85%
rename from gnome-extra/gnome-games/gnome-games-2.11.5.ebuild
rename to gnome-extra/gnome-games/gnome-games-2.10.1-r1.ebuild
index 96ca38b5dacb7e9a119472045add7ce3d507e10e..961d01a9543af0a6fc089166108820cc6db64b31 100644 (file)
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.11.5.ebuild,v 1.1 2005/08/26 01:22:35 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.10.1-r1.ebuild,v 1.1 2005/09/07 19:54:53 leonardop Exp $
 
-inherit gnome2 eutils flag-o-matic
+inherit eutils flag-o-matic gnome2
 
 DESCRIPTION="Collection of games for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -30,15 +30,19 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 
-pkg_setup() {
 
-       G2CONF="${G2CONF} `use_enable howl` --disable-setgid"
+pkg_setup() {
+       G2CONF="$(use_enable howl) --disable-setgid"
 }
 
 src_unpack() {
-       unpack ${A}
-       cd ${S}
-       epatch ${FILESDIR}/${PN}-2.11.4-nohowl.patch
+       unpack "${A}"
+       cd "${S}"
+
+       # Fix compilation if esound is not installed (bug #104952).
+       epatch ${FILESDIR}/${P}-no_esd.patch
+
+       epatch ${FILESDIR}/${PN}-2.9.6-nohowl.patch
 
        autoconf || die "autoconf failed"
 }
diff --git a/gnome-extra/gnome-games/gnome-games-2.12.0.ebuild b/gnome-extra/gnome-games/gnome-games-2.12.0.ebuild
new file mode 100644 (file)
index 0000000..8283306
--- /dev/null
@@ -0,0 +1,82 @@
+# Copyright 1999-2005 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.12.0.ebuild,v 1.1 2005/09/07 19:54:53 leonardop Exp $
+
+inherit eutils gnome2
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="artworkextra guile howl static"
+
+RDEPEND=">=gnome-base/gconf-2
+       >=gnome-base/libgnomeui-2
+       >=gnome-base/libgnome-2
+       >=x11-libs/gtk+-2.5.4
+       >=gnome-base/librsvg-2
+       >=gnome-base/libglade-2
+       >=dev-libs/glib-2
+       >=gnome-base/gnome-vfs-2
+       guile? ( >=dev-util/guile-1.6.5 )
+       artworkextra? ( gnome-extra/gnome-games-extra-data )
+       howl? ( >=net-misc/howl-0.9.6 )"
+
+DEPEND="${RDEPEND}
+       >=dev-util/pkgconfig-0.9
+       >=dev-util/intltool-0.29
+       >=sys-devel/gettext-0.10.40
+       >=app-text/scrollkeeper-0.3.8"
+
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+
+pkg_setup() {
+       GAMES_GROUP=${GAMES_GROUP:-games}
+       enewgroup "${GAMES_GROUP}"
+
+       G2CONF="--with-scores-group=${GAMES_GROUP} \
+               $(use_enable howl) \
+               $(use_enable static) \
+               $(use_enable guile)"
+}
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+
+       # Fix compilation if esound is not installed (bug #104952).
+       epatch ${FILESDIR}/${PN}-2.10.1-no_esd.patch
+       # Implement --enable-guile switch
+       epatch ${FILESDIR}/${P}-guile_switch.patch
+       # Resolve symbols at execution time in setgid binaries
+       epatch ${FILESDIR}/${P}-no_lazy_bindings.patch
+
+       epatch ${FILESDIR}/${PN}-2.11.4-nohowl.patch
+
+       autoconf || die "autoconf failed"
+}
+
+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
+
+       # 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
+                       rm ${scorefile}
+               fi
+       done
+}