From cbce6c4ed0eb1daa602a0547f57d8404d9fa8959 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Sun, 31 May 2009 07:11:56 +0000 Subject: version bump Package-Manager: portage-2.1.6.11/cvs/Linux i686 --- games-kids/gcompris/ChangeLog | 8 +- games-kids/gcompris/Manifest | 5 +- .../gcompris/files/gcompris-8.4.12-build.patch | 240 +++++++++++++++++++++ games-kids/gcompris/gcompris-8.4.12.ebuild | 77 +++++++ 4 files changed, 328 insertions(+), 2 deletions(-) create mode 100644 games-kids/gcompris/files/gcompris-8.4.12-build.patch create mode 100644 games-kids/gcompris/gcompris-8.4.12.ebuild (limited to 'games-kids') diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog index 0231252dd484..fef45a8aee7d 100644 --- a/games-kids/gcompris/ChangeLog +++ b/games-kids/gcompris/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-kids/gcompris # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.45 2009/01/19 04:40:40 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.46 2009/05/31 07:11:55 mr_bones_ Exp $ + +*gcompris-8.4.12 (31 May 2009) + + 31 May 2009; Michael Sterrett + +files/gcompris-8.4.12-build.patch, +gcompris-8.4.12.ebuild: + version bump 19 Jan 2009; Michael Sterrett files/gcompris-8.4.8-build.patch, gcompris-8.4.8.ebuild: diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest index ff8929278e09..310b6fc887ed 100644 --- a/games-kids/gcompris/Manifest +++ b/games-kids/gcompris/Manifest @@ -1,7 +1,10 @@ +AUX gcompris-8.4.12-build.patch 9403 RMD160 c50b64ac6b24ac7747ab26650949693fb2f0c6a4 SHA1 97e557c716073e5392ce30a7719a25cd917e8793 SHA256 ab6796e44b9dfe6e6f80f11f2dce1deee5debf6011c3c5a82d2fdd80fc9901ac AUX gcompris-8.4.8-build.patch 9387 RMD160 30a266f9a21df6d81b59a103323f5c831892263e SHA1 3ecb25bfabeebb79f8421b6048c8dfd1843aba9d SHA256 e6c2034f0206f433b218e26b16d65f5627077a49508a0a945fefe7cef5ae1050 DIST gcompris-6.5.3.tar.gz 43519786 RMD160 7e17a5ad1c2a7f2236b6cf730a7eddadc38281be SHA1 0bcf89cac9c464fcd3cb2dc82b46f49d862f3c1f SHA256 78bc8932160ccd1db78d5431675034a3b0bbe695371276ca01fe6ae49d35ffa1 +DIST gcompris-8.4.12.tar.gz 104355638 RMD160 f5d8129d4c37c97c1f15d0b7fb6865d3477b745e SHA1 55b6619d7e05fcfa0934c8564d8085d5aa880bbe SHA256 55025808dcb4afb3fa9ea8e232684e651da3ac2c673cb36592d6583ebec2d4c7 DIST gcompris-8.4.8.tar.gz 104137003 RMD160 7f56a6ef2d452c3f6c6d30919be559875d83876d SHA1 8281d9e7c4adadffba838e782c8002d93f685414 SHA256 967e13124037d42be83b4dd80edb9ffdb518eef86a0cd5f0541b529b8c480e21 EBUILD gcompris-6.5.3-r1.ebuild 1599 RMD160 0e7e352f1a109e53f4738af8cefa3f27e9073c6d SHA1 311a33e3da55cb4b30fbdf6fbc425a71b54d4f57 SHA256 8b87b51cc50094a67743aa946ce098434d674110c8c5c7460fa6e4705cbf3b81 +EBUILD gcompris-8.4.12.ebuild 1888 RMD160 5aa8bef92747c546984c8c05ba2b6675a895aeec SHA1 5d5bda1671cb13d9c883c616bdd356004a58db96 SHA256 d51fa751ce73409209bfa159e73e55253b0238af81e18391ff85829f337752cf EBUILD gcompris-8.4.8.ebuild 1887 RMD160 369e83fda1dd6d789958be532f1cb71c3b008c75 SHA1 92cdfab701c3fe3c71a0b16eed469501048a9242 SHA256 e5b3539111823c7a048c393c1efab38d65317ffe28306feb35cd8cb7ccf8b171 -MISC ChangeLog 6777 RMD160 6c4cc6ddae503009d697e07afdaf08ef6fcdf02c SHA1 e8301d688144cc1a34d3e860838d928280e0c1c9 SHA256 6402930f9eecdcf9da59706c8bd7048671c4e342628208aca4a289f221ddf566 +MISC ChangeLog 6943 RMD160 5fa5ee24f5616a7a64059e0b9e4a0cff71d08626 SHA1 de20c432421ea5c3ac3019358b1e0d4f94a63d55 SHA256 76cbc89d71d25826e14303b0cd6230c241738f486641f6a9256064fcfe749aac MISC metadata.xml 256 RMD160 570feef44e7d62ff41eb94fd83a54d9adcfe9a1d SHA1 2719c80bf2b8c87e73d7cd147cd617d8bb85c4d8 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254 diff --git a/games-kids/gcompris/files/gcompris-8.4.12-build.patch b/games-kids/gcompris/files/gcompris-8.4.12-build.patch new file mode 100644 index 000000000000..5615c9e7d633 --- /dev/null +++ b/games-kids/gcompris/files/gcompris-8.4.12-build.patch @@ -0,0 +1,240 @@ +diff -ru gcompris-8.4.12.orig/Makefile.am gcompris-8.4.12/Makefile.am +--- gcompris-8.4.12.orig/Makefile.am 2008-12-14 15:30:56.000000000 -0500 ++++ gcompris-8.4.12/Makefile.am 2009-05-31 01:04:35.000000000 -0400 +@@ -17,7 +17,7 @@ + endif + + +-icondir=$(datadir)/pixmaps ++icondir=/usr/share/pixmaps + icon_DATA = gcompris.png gcompris-edit.png + + if BUILD_MINGW32 +@@ -25,7 +25,7 @@ + Applications_in_files = + Applications_DATA = + else +-Applicationsdir = $(datadir)/applications/ ++Applicationsdir = /usr/share/applications + Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in + Applications_DATA = gcompris.desktop gcompris-edit.desktop + endif +diff -ru gcompris-8.4.12.orig/configure.in gcompris-8.4.12/configure.in +--- gcompris-8.4.12.orig/configure.in 2009-03-29 06:35:55.000000000 -0400 ++++ gcompris-8.4.12/configure.in 2009-05-31 01:09:09.000000000 -0400 +@@ -146,6 +146,14 @@ + AC_SUBST(XML_CFLAGS) + AC_SUBST(XML_LIBS) + ++PKG_CHECK_MODULES(LIBGNOMECANVAS, libgnomecanvas-2.0) ++AC_SUBST(LIBGNOMECANVAS_CFLAGS) ++AC_SUBST(LIBGNOMECANVAS_LIBS) ++ ++PKG_CHECK_MODULES(LIBART_LGPL, libart-2.0) ++AC_SUBST(LIBART_LGPL_CFLAGS) ++AC_SUBST(LIBART_LGPL_LIBS) ++ + dnl Freetype2 flags (needed for libgnomecanvas) + PKG_CHECK_MODULES(FT2, freetype2) + AC_SUBST(FT2_CFLAGS) +@@ -225,10 +233,8 @@ + USE_DEBUG="$enableval", USE_DEBUG="no") + if test "x$USE_DEBUG" == "xyes" ; then + AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.") +- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -g" +-else +- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror" + fi ++CFLAGS="$CFLAGS $OSX_CFLAGS -Wall" + + dnl WIN32 Specifics + AC_MSG_CHECKING([for native Win32]) +@@ -297,25 +303,25 @@ + if test "x$platform_win32" = "xno" ; then + + dnl Set PACKAGE_LOCALE_DIR in config.h. +- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory]) ++ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory]) + + dnl Set PACKAGE_DATA_DIR + PACKAGE_DATA_DIR="boards" + AC_SUBST(PACKAGE_DATA_DIR) +- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory]) ++ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory]) + + dnl Set PACKAGE_HELP_DIR +- PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help" ++ PACKAGE_HELP_DIR="${datadir}/${PACKAGE}/help" + AC_SUBST(PACKAGE_HELP_DIR) + + dnl Plugin Directory + my_libdir=`eval echo "${libdir}"` +- AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory]) ++ AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory]) + plugindir=$libdir/gcompris + AC_SUBST(plugindir) + + dnl Python plugin Directory +- PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python" ++ PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python" + AC_SUBST(PYTHON_PLUGIN_DIR) + + dnl System GCompris config directory +@@ -545,8 +551,6 @@ + src/boards/python/gcompris/utils/Makefile + src/boards/python/connect4p/Makefile + src/boards/python/admin/Makefile +-src/libart_lgpl/Makefile +-src/libgnomecanvas/Makefile + po/Makefile.in + docs/Makefile + docs/C/Makefile +diff -ru gcompris-8.4.12.orig/docs/C/Makefile.am gcompris-8.4.12/docs/C/Makefile.am +--- gcompris-8.4.12.orig/docs/C/Makefile.am 2008-03-12 16:26:23.000000000 -0400 ++++ gcompris-8.4.12/docs/C/Makefile.am 2009-05-31 01:09:44.000000000 -0400 +@@ -10,7 +10,7 @@ + overview.dia \ + $(man_MANS) + +-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C ++gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C + + all: $(doc) + +diff -ru gcompris-8.4.12.orig/docs/eu/Makefile.am gcompris-8.4.12/docs/eu/Makefile.am +--- gcompris-8.4.12.orig/docs/eu/Makefile.am 2008-10-28 17:36:12.000000000 -0400 ++++ gcompris-8.4.12/docs/eu/Makefile.am 2009-05-31 01:10:09.000000000 -0400 +@@ -8,7 +8,7 @@ + overview.dia \ + gcompris.texi + +-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu ++gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu + + all: $(doc) + +diff -ru gcompris-8.4.12.orig/docs/fr/Makefile.am gcompris-8.4.12/docs/fr/Makefile.am +--- gcompris-8.4.12.orig/docs/fr/Makefile.am 2008-10-28 17:35:25.000000000 -0400 ++++ gcompris-8.4.12/docs/fr/Makefile.am 2009-05-31 01:10:17.000000000 -0400 +@@ -8,7 +8,7 @@ + overview.dia \ + gcompris.texi + +-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr ++gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr + + all: $(doc) + +diff -ru gcompris-8.4.12.orig/po/Makefile.in.in gcompris-8.4.12/po/Makefile.in.in +--- gcompris-8.4.12.orig/po/Makefile.in.in 2009-03-29 06:39:29.000000000 -0400 ++++ gcompris-8.4.12/po/Makefile.in.in 2009-05-31 01:10:51.000000000 -0400 +@@ -34,7 +34,7 @@ + datarootdir = @datarootdir@ + libdir = @libdir@ + DATADIRNAME = @DATADIRNAME@ +-itlocaledir = $(prefix)/$(DATADIRNAME)/locale ++itlocaledir = /usr/share/locale + subdir = po + install_sh = @install_sh@ + # Automake >= 1.8 provides @mkdir_p@. +diff -ru gcompris-8.4.12.orig/src/Makefile.am gcompris-8.4.12/src/Makefile.am +--- gcompris-8.4.12.orig/src/Makefile.am 2007-05-22 16:15:05.000000000 -0400 ++++ gcompris-8.4.12/src/Makefile.am 2009-05-31 01:11:02.000000000 -0400 +@@ -1,3 +1,3 @@ + ## Process this file with automake to produce Makefile.in + +-SUBDIRS = libart_lgpl libgnomecanvas gcompris boards ++SUBDIRS = gcompris boards +diff -ru gcompris-8.4.12.orig/src/boards/Makefile.am gcompris-8.4.12/src/boards/Makefile.am +--- gcompris-8.4.12.orig/src/boards/Makefile.am 2009-03-16 17:59:02.000000000 -0400 ++++ gcompris-8.4.12/src/boards/Makefile.am 2009-05-31 01:12:45.000000000 -0400 +@@ -80,6 +80,8 @@ + -I$(top_srcdir)/src \ + $(GCOMPRIS_CFLAGS) \ + $(XML_CFLAGS) \ ++ $(LIBART_LGPL_CFLAGS) \ ++ $(LIBGNOMECANVAS_CFLAGS) \ + $(PYTHON_CFLAGS) \ + $(PYGTK_CFLAGS) \ + $(sqlite_cflags) \ +@@ -110,7 +112,7 @@ + libclockgame_la_SOURCES = clockgame.c + + +-libshapegame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) ++libshapegame_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) + libshapegame_la_LIBADD = + libshapegame_la_SOURCES = shapegame.c + +@@ -154,12 +156,12 @@ + libmemory_la_SOURCES = memory.c + + +-libimageid_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) ++libimageid_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) + libimageid_la_LIBADD = + libimageid_la_SOURCES = imageid.c + + +-libmissingletter_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) ++libmissingletter_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) + libmissingletter_la_LIBADD = + libmissingletter_la_SOURCES = missingletter.c missingletter_config.c + +@@ -208,7 +210,7 @@ + libcanal_lock_la_LIBADD = + libcanal_lock_la_SOURCES = canal_lock.c + +-libadvanced_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) ++libadvanced_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) + libadvanced_colors_la_LIBADD = + libadvanced_colors_la_SOURCES = advanced_colors.c + +@@ -216,7 +218,7 @@ + libsuperbrain_la_LIBADD = + libsuperbrain_la_SOURCES = superbrain.c + +-libread_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) ++libread_colors_la_LDFLAGS = $(shared) $(no_undefined) -module -avoid-version $(gc_libs) $(XML_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) + libread_colors_la_LIBADD = + libread_colors_la_SOURCES = read_colors.c + +diff -ru gcompris-8.4.12.orig/src/gcompris/Makefile.am gcompris-8.4.12/src/gcompris/Makefile.am +--- gcompris-8.4.12.orig/src/gcompris/Makefile.am 2009-02-04 18:26:53.000000000 -0500 ++++ gcompris-8.4.12/src/gcompris/Makefile.am 2009-05-31 01:13:41.000000000 -0400 +@@ -51,6 +51,8 @@ + $(GCOMPRIS_CFLAGS) \ + $(GNOME_INCLUDEDIR) \ + $(XML_CFLAGS) \ ++ $(LIBART_LGPL_CFLAGS) \ ++ $(LIBGNOMECANVAS_CFLAGS) \ + -DGNOME_DISABLE_DEPRECATED \ + $(sqlite_cflags) \ + $(GNET_CFLAGS) \ +@@ -120,12 +122,11 @@ + wordlist.h + + gcompris_LDFLAGS = \ +- -export-dynamic $(top_builddir)/src/libgnomecanvas/libgnomecanvas-2.a \ +- $(top_builddir)/src/libart_lgpl/libart_lgpl_2.a ++ -export-dynamic + + + gcompris_LDADD = \ +- $(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) \ ++ $(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(GNET_LIBS) $(LIBART_LGPL_LIBS) $(LIBGNOMECANVAS_LIBS) \ + $(INTLLIBS) $(NSBUNDLE_LDFLAGS) $(XF86VM_LIBS) + + EXTRA_DIST = \ +diff -ru gcompris-8.4.12.orig/src/gcompris/gcompris.c gcompris-8.4.12/src/gcompris/gcompris.c +--- gcompris-8.4.12.orig/src/gcompris/gcompris.c 2009-02-19 16:51:20.000000000 -0500 ++++ gcompris-8.4.12/src/gcompris/gcompris.c 2009-05-31 01:14:27.000000000 -0400 +@@ -1158,7 +1158,7 @@ + properties->package_locale_dir = gbr_find_locale_dir(PACKAGE_LOCALE_DIR); + properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL); + properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python", NULL); +- properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL); ++ properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL); + g_free(pkg_data_dir); + g_free(pkg_clib_dir); + } diff --git a/games-kids/gcompris/gcompris-8.4.12.ebuild b/games-kids/gcompris/gcompris-8.4.12.ebuild new file mode 100644 index 000000000000..479ade3cd301 --- /dev/null +++ b/games-kids/gcompris/gcompris-8.4.12.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-8.4.12.ebuild,v 1.1 2009/05/31 07:11:55 mr_bones_ Exp $ + +EAPI=2 +inherit autotools eutils python games + +DESCRIPTION="full featured educational application for children from 2 to 10" +HOMEPAGE="http://gcompris.net/" +SRC_URI="mirror://sourceforge/gcompris/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug gnet python sqlite" + +RDEPEND="x11-libs/gtk+:2 + media-libs/gstreamer:0.10 + media-libs/gst-plugins-good + media-plugins/gst-plugins-ogg + media-plugins/gst-plugins-vorbis + media-libs/libart_lgpl + >=gnome-base/libgnomecanvas-2.3.6 + media-libs/sdl-mixer + media-libs/libsdl + dev-libs/libxml2 + dev-libs/popt + virtual/libintl + games-board/gnuchess + gnet? ( net-libs/gnet:2 ) + python? ( + dev-lang/python[threads] + dev-python/pygtk + sqlite? ( dev-python/pysqlite:2 ) + ) + sqlite? ( dev-db/sqlite:3 )" +DEPEND="${RDEPEND} + dev-perl/XML-Parser + sys-devel/gettext + sys-apps/texinfo + app-text/texi2html + dev-util/pkgconfig" +RDEPEND="${RDEPEND} + media-gfx/tuxpaint + sci-electronics/gnucap" + +src_prepare() { + epatch "${FILESDIR}"/${P}-build.patch + cp /usr/share/gettext/config.rpath . + eautoreconf +} + +src_configure() { + python_version + GNUCHESS="${GAMES_BINDIR}"/gnuchess \ + egamesconf \ + --disable-dependency-tracking \ + --datarootdir="${GAMES_DATADIR}" \ + --datadir="${GAMES_DATADIR}" \ + --localedir=/usr/share/locale \ + --infodir=/usr/share/info \ + --enable-xf86vidmode \ + $(use_with python python /usr/bin/python${PYVER}) \ + $(use_enable debug) \ + $(use_enable gnet) \ + $(use_enable sqlite) +} + +src_compile() { + emake -j1 || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog NEWS README THANKS TODO + prepgamesdirs +} -- cgit v1.2.3-65-gdbad