From b625a23d34fae9e82953ffd90483c2d34572b831 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Thu, 14 Jan 2010 23:02:17 +0000 Subject: New version for Gnome 2.28. Package-Manager: portage-2.2_rc61/cvs/Linux x86_64 --- gnome-extra/gnome-games/ChangeLog | 12 +- gnome-extra/gnome-games/Manifest | 19 ++- ...2.28.1-conflicting-types-libgames-support.patch | 33 ++++ gnome-extra/gnome-games/gnome-games-2.24.3.ebuild | 6 +- .../gnome-games/gnome-games-2.26.2-r1.ebuild | 172 ------------------- gnome-extra/gnome-games/gnome-games-2.28.2.ebuild | 184 +++++++++++++++++++++ 6 files changed, 245 insertions(+), 181 deletions(-) create mode 100644 gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch delete mode 100644 gnome-extra/gnome-games/gnome-games-2.26.2-r1.ebuild create mode 100644 gnome-extra/gnome-games/gnome-games-2.28.2.ebuild diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog index 789c87fd26fb..d6de44230a85 100644 --- a/gnome-extra/gnome-games/ChangeLog +++ b/gnome-extra/gnome-games/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/gnome-games -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.281 2009/12/03 17:27:47 ranger Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.282 2010/01/14 23:02:16 eva Exp $ + +*gnome-games-2.28.2 (14 Jan 2010) + + 14 Jan 2010; Gilles Dartiguelongue + gnome-games-2.24.3.ebuild, -gnome-games-2.26.2-r1.ebuild, + +files/gnome-games-2.28.1-conflicting-types-libgames-support.patch, + +gnome-games-2.28.2.ebuild: + New version for Gnome 2.28. 03 Dec 2009; Brent Baude ChangeLog: Marking gnome-games-2.26.3-r1 ppc64 stable for bug 281427 diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest index 9a7e3a20b61d..c0ca03d0010a 100644 --- a/gnome-extra/gnome-games/Manifest +++ b/gnome-extra/gnome-games/Manifest @@ -1,12 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX gnome-games-2.14.0-no_lazy_bindings.patch 524 RMD160 1829b3f68998e195e4ff865982ff1818063ee604 SHA1 d63f49e339ce3d146920f7ac081c927145267eb0 SHA256 1d77a19b5d940ff23ee3110feb1ccc37a920e722c2cc0304abaf7a745cfab99d AUX gnome-games-2.26.2-parallel-make.patch 12693 RMD160 6a856fbf555ff9a9c5d998762f9d6a171ba2fc88 SHA1 e3dc134eb42b52a839f05d6705d370890c68e83e SHA256 6791aa96a17ca8869832fd89aa79f8d4e2d17d4e08f2cc0f93bfc43f7fa3e884 AUX gnome-games-2.26.3-gtali-invalid-pointer.patch 1145 RMD160 905fa0574296c70a4653914b81cf391205a660d8 SHA1 7384fecdd16fc3b6bf7e10bdd950ab2f8df877ce SHA256 b75190460f701c1830a8eae85c46de23a3735329f840d21383a60ca4445adac0 AUX gnome-games-2.26.3-implicit-declaration.patch 319 RMD160 c6d868784160c6e10c046d6e117ce6206e1dd49f SHA1 1fa72d174f676b594c61dabb232a9e3a3b98b726 SHA256 7a113e54b4fe50a0d49c5b7b842a03b7f8c494e9f4ee42e9f0ae883dd1bfddcb +AUX gnome-games-2.28.1-conflicting-types-libgames-support.patch 1038 RMD160 e9c63e9881adbb43cf462a3387d9d0275e1f3598 SHA1 e3b3c30bd32e786bc767fbcee4006a99fea05095 SHA256 074718266310ccdc0ed29affee2dcd28c6e51e557b4db84a320c2e6223f55b8e DIST gnome-games-2.24.3.tar.bz2 19195003 RMD160 705f075e37c46e652e42e222aea82fa657a2b948 SHA1 f5de0d20bd51f188a9ac1e5f1ceaaa82d8f85882 SHA256 6ad3c849ea10f47c76cbf9c34a5e413b2549c919c5c388be0c42c59bcf3a388d -DIST gnome-games-2.26.2.tar.bz2 23124681 RMD160 9d2bea14db0dcf63dee42677584e20a37be778c5 SHA1 c7de7b61431a10fbe287431b08d23c9e67c069fb SHA256 b7fb95a945453795aeccd91525a40d0c517220cc392f093113407e707d019429 DIST gnome-games-2.26.3.tar.bz2 24664606 RMD160 54ae263d943e2cf7dad2f1e160d7a2756e0ca573 SHA1 0b859be03e6f25a43ed4ad41d6022b9bc83635fc SHA256 f29849507bd2a29a747b73f412fcbc8c74f3a9b5bf38d4b763b4242ac84cf46f -EBUILD gnome-games-2.24.3.ebuild 3861 RMD160 6c457c066a26b8b89903b9cbec11a395a1fe96fb SHA1 c6f93a7fc6d14e56527c4945f0a2830b49ccda59 SHA256 e18a52ef00b3f2c69e5287f367df4253f5694efa88a6cfbe13aa0e65c714b497 -EBUILD gnome-games-2.26.2-r1.ebuild 4476 RMD160 e7b4ac49b07952c12ff2eee83f8d83b100788738 SHA1 5995da89f4258de96b5539890b5dd906860e0a02 SHA256 3bb69c6994865ccc7aa0557e54ef3d33dcec1b36152605baf608bc61ce310758 +DIST gnome-games-2.28.2.tar.bz2 25498433 RMD160 03c9ca6e899bcc44436b232b126f22a0946dff43 SHA1 c2be79044175df51e610edf4c9fd6fba270c02bf SHA256 7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899 +EBUILD gnome-games-2.24.3.ebuild 3804 RMD160 e90ffc1fb86b8b8748baa2706f9ebece465baa2e SHA1 be5090cae9eb8b79c33ddea3a1f4d14f6e209754 SHA256 6b72b475a5f7fc7eb7ce8f4875f7bcd74b1217f610b85799e935ba5df7235ebb EBUILD gnome-games-2.26.3-r1.ebuild 4732 RMD160 05008ea9cff81b1849c841099bbc123e243696f1 SHA1 9664164b3e6c1ff1848925260389c691ff738892 SHA256 885c46cc7efc65ade68b833fb7d999fd12f2a1965792f85d3cd8da9c03d0e784 -MISC ChangeLog 37569 RMD160 f0f0f42e3c3203e9a48938b3547adb4fbd121e76 SHA1 127638d1c432cbb795fe5ba7a21e4b303a045ff2 SHA256 49a9718e3cee8e0e5c431c27e6ea21b5a49faf0aff7878c3249d971a7d2afcc6 +EBUILD gnome-games-2.28.2.ebuild 4919 RMD160 323511a4fd5989f2f1690b59bf5c0cfd41272b59 SHA1 13eb987660b58e83200587399bb937176d01684a SHA256 59b2e76a1f4b6f1ce19afede33fe00db2a13a18c17d434a8409ede0130d084a2 +MISC ChangeLog 37846 RMD160 2ed9d2c7e54ae5d7a49a06627daa3ab25abf18c4 SHA1 d00f27a4d329b0d8a988d7e0067608a0236bad27 SHA256 19fbb5ebec10db970c8a23edf2a4e68fa8e3917cd5521abc91e54974fae128c5 MISC metadata.xml 246 RMD160 f99719fd9820b6c6943b2d0072f01177246a027b SHA1 68e2e7a60349b9a89beaa2d3bcb8d82bf1da4a8d SHA256 a21e910d2b0b2cfed695a77d8c5ccff533decd21ae4b46e8c57d0d3368f8e140 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAktPooAACgkQ1fmVwcYIWAYqjwCfV4QKCSzkND6JFIVKc1DSdNRx +amcAniCMLHHz09EWl7ThOYaJp9ztCvZ/ +=rAJF +-----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch b/gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch new file mode 100644 index 000000000000..d8fbe4e05a01 --- /dev/null +++ b/gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch @@ -0,0 +1,33 @@ +From: Romain Perier +Date: Sun, 8 Nov 2009 19:27:56 +0100 +Subject: Fix conflicting types for games_sound_init + +The problem was caused by two differents functions, matching the same name, +but without the same proto. +Usually the commonly way is to prefix static functions by a '_' because this is useful only +for the implementation. + +--- + libgames-support/games-sound.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +--- a/libgames-support/games-sound.c ++++ b/libgames-support/games-sound.c +@@ -157,7 +157,7 @@ games_sound_canberra_play (const char *sound_name, + + /* Initializes the games-sound support */ + static void +-games_sound_init (void) ++_games_sound_init (void) + { + const int audio_rate = MIX_DEFAULT_FREQUENCY; + const int audio_format = MIX_DEFAULT_FORMAT; +@@ -272,7 +272,7 @@ games_sound_play_for_screen (const gchar * sound_name, + if (!sound_enabled) + return; + if (!sound_init) +- games_sound_init (); ++ _games_sound_init (); + + games_sound_sdl_play (sound_name); + #endif diff --git a/gnome-extra/gnome-games/gnome-games-2.24.3.ebuild b/gnome-extra/gnome-games/gnome-games-2.24.3.ebuild index 8a6ca99e9da3..3d793ded317c 100644 --- a/gnome-extra/gnome-games/gnome-games-2.24.3.ebuild +++ b/gnome-extra/gnome-games/gnome-games-2.24.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.24.3.ebuild,v 1.14 2009/05/04 14:58:05 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.24.3.ebuild,v 1.15 2010/01/14 23:02:16 eva Exp $ GCONF_DEBUG="no" @@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/GnomeGames/" LICENSE="GPL-2 FDL-1.1" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" +KEYWORDS="hppa sh" IUSE="artworkextra guile opengl" # sh doesn't have bug-buddy-python because gdb is broken. diff --git a/gnome-extra/gnome-games/gnome-games-2.26.2-r1.ebuild b/gnome-extra/gnome-games/gnome-games-2.26.2-r1.ebuild deleted file mode 100644 index d4f524f48ffe..000000000000 --- a/gnome-extra/gnome-games/gnome-games-2.26.2-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2009 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.26.2-r1.ebuild,v 1.1 2009/05/31 12:40:33 eva Exp $ - -EAPI="2" -GCONF_DEBUG="no" -WANT_AUTOMAKE="1.10" - -# make sure games is inherited first so that the gnome2 -# functions will be called if they are not overridden -inherit games games-ggz eutils gnome2 python virtualx autotools - -DESCRIPTION="Collection of games for the GNOME desktop" -HOMEPAGE="http://live.gnome.org/GnomeGames/" - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="artworkextra guile opengl test +gstreamer" - -RDEPEND=">=dev-python/pygtk-2.10 - dev-python/pygobject - >=x11-libs/gtk+-2.14 - >=dev-libs/dbus-glib-0.75 - - >=dev-python/gconf-python-2.17.3 - !sh? ( >=dev-python/bug-buddy-python-2.17.3 ) - >=dev-python/libgnomeprint-python-2.17.3 - - >=x11-libs/cairo-1 - >=dev-python/pycairo-1 - >=gnome-base/gconf-2 - >=dev-libs/libxml2-2.4.0 - >=gnome-base/librsvg-2.14 - gstreamer? ( >=media-libs/gstreamer-0.10.11 ) - !gstreamer? ( - media-libs/libsdl - media-libs/sdl-mixer[vorbis] ) - >=gnome-base/libglade-2 - >=dev-libs/glib-2.6.3 - >=dev-games/libggz-0.0.14 - >=dev-games/ggz-client-libs-0.0.14 - - guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] ) - artworkextra? ( gnome-extra/gnome-games-extra-data ) - opengl? ( - dev-python/pygtkglext - >=dev-python/pyopengl-3 ) - !games-board/glchess - x11-libs/libSM" - -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.53 - >=dev-util/pkgconfig-0.15 - >=dev-util/intltool-0.40.4 - >=sys-devel/gettext-0.10.40 - >=gnome-base/gnome-common-2.12.0 - >=app-text/scrollkeeper-0.3.8 - >=app-text/gnome-doc-utils-0.10 - test? ( >=dev-libs/check-0.9.4 )" - -# Others are installed below; multiples in this package. -DOCS="AUTHORS HACKING MAINTAINERS TODO" - -# dang make-check fails on docs with -j > 1. Restrict them for the moment until -# it can be chased down. -RESTRICT="test" - -_omitgame() { - G2CONF="${G2CONF},${1}" -} - -pkg_setup() { - # create the games user / group - games_pkg_setup - - # Decide the sound backend to use - GStreamer gets preference over SDL - if use gstreamer; then - G2CONF="${G2CONF} --with-sound=gstreamer" - else - G2CONF="${G2CONF} --with-sound=sdl_mixer" - fi - - # Needs "seed", which needs gobject-introspection, libffi, etc. - #$(use_enable clutter) - #$(use_enable clutter staging) - G2CONF="${G2CONF} - --disable-card-themes-installer - --with-scores-group=${GAMES_GROUP} - --enable-noregistry=\"${GGZ_MODDIR}\" - --with-platform=gnome - --with-card-theme-formats=all - --with-smclient - --enable-omitgames=none" # This line should be last for _omitgame - - # Needs clutter, always disable till we can have that - #if ! use clutter; then - _omitgame lightsoff - #fi - - if ! use guile; then - ewarn "USE='-guile' implies that Aisleriot won't be installed" - _omitgame aisleriot - fi - - if ! use opengl; then - ewarn "USE=-opengl implies that glchess won't be installed" - _omitgame glchess - fi -} - -src_prepare() { - gnome2_src_prepare - - # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile - - # Fix parallel make install issue for setgid, bug #267041 - epatch "${FILESDIR}/${PN}-2.26.2-parallel-make.patch" - - # If calling eautoreconf, this ebuild uses libtool-2 - eautomake -} - -src_test() { - Xemake check || die "tests 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 -} - -pkg_preinst() { - gnome2_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 -} - -pkg_postinst() { - games_pkg_postinst - games-ggz_update_modules - gnome2_pkg_postinst - python_need_rebuild - python_mod_optimize $(python_get_sitedir)/gnome_sudoku - if use opengl; then - python_mod_optimize $(python_get_sitedir)/glchess - fi -} - -pkg_postrm() { - games-ggz_update_modules - gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{gnome_sudoku,glchess} - python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/glchess -} diff --git a/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild new file mode 100644 index 000000000000..6e4e73ca9992 --- /dev/null +++ b/gnome-extra/gnome-games/gnome-games-2.28.2.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2010 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.28.2.ebuild,v 1.1 2010/01/14 23:02:16 eva Exp $ + +EAPI="2" +GCONF_DEBUG="no" +WANT_AUTOMAKE="1.11" + +# make sure games is inherited first so that the gnome2 +# functions will be called if they are not overridden +inherit games games-ggz eutils gnome2 python virtualx autotools + +DESCRIPTION="Collection of games for the GNOME desktop" +HOMEPAGE="http://live.gnome.org/GnomeGames/" + +LICENSE="GPL-2 FDL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="artworkextra guile opengl sdl test" # introspection + +# Introspection support needs +# media-libs/clutter +# >=dev-libs/gobject-introspection 0.6.3 +# and generates GnomeGames...gir +RDEPEND=" + >=dev-games/libggz-0.0.14 + >=dev-games/ggz-client-libs-0.0.14 + >=dev-libs/dbus-glib-0.75 + >=dev-libs/glib-2.6.3 + >=dev-libs/libxml2-2.4.0 + >=dev-python/gconf-python-2.17.3 + >=dev-python/pygobject-2 + >=dev-python/pygtk-2.14 + >=dev-python/pycairo-1 + >=gnome-base/gconf-2 + >=gnome-base/librsvg-2.14 + >=x11-libs/cairo-1 + >=x11-libs/gtk+-2.16 + x11-libs/libSM + + !sdl? ( media-libs/libcanberra[gtk] ) + sdl? ( + media-libs/libsdl + media-libs/sdl-mixer[vorbis] ) + guile? ( >=dev-scheme/guile-1.6.5[deprecated,regex] ) + artworkextra? ( gnome-extra/gnome-games-extra-data ) + opengl? ( + dev-python/pygtkglext + >=dev-python/pyopengl-3 ) + !games-board/glchess" + +DEPEND="${RDEPEND} + >=sys-devel/autoconf-2.53 + >=dev-util/pkgconfig-0.15 + >=dev-util/intltool-0.40.4 + >=sys-devel/gettext-0.10.40 + >=gnome-base/gnome-common-2.12.0 + >=app-text/scrollkeeper-0.3.8 + >=app-text/gnome-doc-utils-0.10 + test? ( >=dev-libs/check-0.9.4 )" + +# Others are installed below; multiples in this package. +DOCS="AUTHORS HACKING MAINTAINERS TODO" + +# dang make-check fails on docs with -j > 1. Restrict them for the moment until +# it can be chased down. +RESTRICT="test" + +_omitgame() { + G2CONF="${G2CONF},${1}" +} + +pkg_setup() { + # create the games user / group + games_pkg_setup + + # Decide the sound backend to use - GStreamer gets preference over SDL + if use sdl; then + G2CONF="${G2CONF} --with-sound=sdl_mixer" + else + G2CONF="${G2CONF} --with-sound=libcanberra" + fi + + # Needs "seed", which needs gobject-introspection, libffi, etc. + #$(use_enable clutter) + #$(use_enable clutter staging) + #$(use_enable introspection) + G2CONF="${G2CONF} + $(use_enable test tests) + --disable-introspection + --disable-card-themes-installer + --with-scores-group=${GAMES_GROUP} + --enable-noregistry=\"${GGZ_MODDIR}\" + --with-platform=gnome + --with-card-theme-formats=all + --with-smclient + --enable-omitgames=none" # This line should be last for _omitgame + + # Needs clutter, always disable till we can have that + #if ! use clutter; then + _omitgame lightsoff + _omitgame gnometris + _omitgame same-gnome-clutter + #fi + + if ! use guile; then + ewarn "USE='-guile' implies that Aisleriot won't be installed" + _omitgame aisleriot + fi + + if ! use opengl; then + ewarn "USE=-opengl implies that glchess won't be installed" + _omitgame glchess + fi +} + +src_prepare() { + gnome2_src_prepare + + # disable pyc compiling + mv py-compile py-compile.orig + ln -s $(type -P true) py-compile + + # Fix implicit declaration of yylex. + epatch "${FILESDIR}/${PN}-2.26.3-implicit-declaration.patch" + + # Fix bug #281718 -- *** glibc detected *** gtali: free(): invalid pointer + epatch "${FILESDIR}/${PN}-2.26.3-gtali-invalid-pointer.patch" + + # Fix build failure, conflicting types for 'games_sound_init', + # in libgames-support/games_sound.c. + epatch "${FILESDIR}/${PN}-2.28.1-conflicting-types-libgames-support.patch" + + # If calling eautoreconf, this ebuild uses libtool-2 + eautomake +} + +src_test() { + Xemake check || die "tests 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 +} + +pkg_preinst() { + gnome2_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 +} + +pkg_postinst() { + games_pkg_postinst + games-ggz_update_modules + gnome2_pkg_postinst + python_need_rebuild + python_mod_optimize $(python_get_sitedir)/gnome_sudoku + if use opengl; then + python_mod_optimize $(python_get_sitedir)/glchess + fi +} + +pkg_postrm() { + games-ggz_update_modules + gnome2_pkg_postrm + python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/{gnome_sudoku,glchess} + python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/glchess +} -- cgit v1.2.3-65-gdbad