Version bump, bug #157472

Package-Manager: portage-2.1.2.2

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 6112f4b125d5cfe40f4bf84bea5281cdd7664596..bf5d6a1ffeafa99892cc0ffd14b5cf28639afb05 100644 (file)
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.32 2007/01/06 02:36:28 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.33 2007/03/10 10:54:19 nyhm Exp $
+
+*gcompris-8.2.2 (10 Mar 2007)
+
+  10 Mar 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/gcompris-8.2.2-build.patch, +gcompris-8.2.2.ebuild:
+  Version bump, bug #157472
 
   06 Jan 2007; Tristan Heaven <nyhm@gentoo.org> gcompris-8.2.ebuild:
   Set WANT_AUTOCONF and WANT_AUTOMAKE

diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 31e15db82afebcd0b36b67561939f804c6742351..6c51d501210f99e44c050dafc0a8690285ac9590 100644 (file)
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,20 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gcompris-8.2.2-build.patch 4019 RMD160 09da5c67e43685da0e8b5021fd8f54016fdcf330 SHA1 f7f93d82161a6e0ca0bfe7fc4327b0436d4d8f32 SHA256 3e40b4e5ae11fa036285b2107e4b48045e70e5abc11a60a17fd2d5e24793e29b
+MD5 83735d47a6bfcc6bd648f0b268becefd files/gcompris-8.2.2-build.patch 4019
+RMD160 09da5c67e43685da0e8b5021fd8f54016fdcf330 files/gcompris-8.2.2-build.patch 4019
+SHA256 3e40b4e5ae11fa036285b2107e4b48045e70e5abc11a60a17fd2d5e24793e29b files/gcompris-8.2.2-build.patch 4019
 DIST gcompris-6.5.3.tar.gz 43519786 RMD160 7e17a5ad1c2a7f2236b6cf730a7eddadc38281be SHA1 0bcf89cac9c464fcd3cb2dc82b46f49d862f3c1f SHA256 78bc8932160ccd1db78d5431675034a3b0bbe695371276ca01fe6ae49d35ffa1
+DIST gcompris-8.2.2.tar.gz 79037459 RMD160 5baf13fe72dd7810e3da160ea4ccaa37912dc092 SHA1 26cf33262311c292df5931a1d15fe4c06709d7b8 SHA256 4d5e6fc993ef0be753782c0fc0b35277e8369d25db83108db313437b55cea44d
 DIST gcompris-8.2.tar.gz 79157620 RMD160 20be5f509f203bbf3cb781a472b65e6d4b433cda SHA1 14cc6ac9c01eaa3c07e5566aaa672536bf7d1cc1 SHA256 fa38b319c34708701f6b5cc53630348bbf27d2150873353541bd781c58dbb997
 EBUILD gcompris-6.5.3-r1.ebuild 1575 RMD160 ef05347516707c5d09799b2983d87e7bbb9a2504 SHA1 b0dc633672cb3376b543d126e24878c4eef9d288 SHA256 e00f7e39ccc7872fd6c9c93589d6640f9dba0503d262be323530464404fabc96
 MD5 958932f039845f5b9391681f170cea6c gcompris-6.5.3-r1.ebuild 1575
 RMD160 ef05347516707c5d09799b2983d87e7bbb9a2504 gcompris-6.5.3-r1.ebuild 1575
 SHA256 e00f7e39ccc7872fd6c9c93589d6640f9dba0503d262be323530464404fabc96 gcompris-6.5.3-r1.ebuild 1575
+EBUILD gcompris-8.2.2.ebuild 1608 RMD160 4da6b1ba68cd9f1e38e93a7e63dd6c28df38e981 SHA1 8516fcf95bb98b1469b3772be4968b5266745961 SHA256 d1aaf2675deff5d13983bfa5ce28448262d37d4d7bfe2bf4c6910ea33c895733
+MD5 c5c6b3c13a64ed798749b6acfdd079e6 gcompris-8.2.2.ebuild 1608
+RMD160 4da6b1ba68cd9f1e38e93a7e63dd6c28df38e981 gcompris-8.2.2.ebuild 1608
+SHA256 d1aaf2675deff5d13983bfa5ce28448262d37d4d7bfe2bf4c6910ea33c895733 gcompris-8.2.2.ebuild 1608
 EBUILD gcompris-8.2.ebuild 1691 RMD160 e02296b9c980521bc8abe1a2c185c50c35f5de0a SHA1 7ec732a4f0fbc2b25a4015f204984f4278d828f7 SHA256 c36b77edb12d4676d7a66b85e8e8940567f44ef8e17b6bfd59b2638ba0c3b357
 MD5 4e67ad4cb21c02f2cab2c64cb7fe6a84 gcompris-8.2.ebuild 1691
 RMD160 e02296b9c980521bc8abe1a2c185c50c35f5de0a gcompris-8.2.ebuild 1691
 SHA256 c36b77edb12d4676d7a66b85e8e8940567f44ef8e17b6bfd59b2638ba0c3b357 gcompris-8.2.ebuild 1691
-MISC ChangeLog 4655 RMD160 65cb3bb6b96e33af044fc34eac1862ebb0952aa6 SHA1 1f6ed7cdbc27409596dfb7381de88461281ed1da SHA256 93df1212c26d4130a6ec6f2eaaad22782115ad641ed689f5dc90b271c7b75046
-MD5 5974000346f17c4df3e7d2bf8d19750d ChangeLog 4655
-RMD160 65cb3bb6b96e33af044fc34eac1862ebb0952aa6 ChangeLog 4655
-SHA256 93df1212c26d4130a6ec6f2eaaad22782115ad641ed689f5dc90b271c7b75046 ChangeLog 4655
+MISC ChangeLog 4824 RMD160 e468a9fdda4829ae2212feaec02db70a86b586b0 SHA1 11d6dc6b1b58ceaf89aaa95c6cadf3c139aa9e1f SHA256 411c1028fc9b04e0ce9fdb5bcf9803abf6393d05571b3ef326e3001057bcd0cb
+MD5 b4b5476c074d0bddc6e94cd778db9f02 ChangeLog 4824
+RMD160 e468a9fdda4829ae2212feaec02db70a86b586b0 ChangeLog 4824
+SHA256 411c1028fc9b04e0ce9fdb5bcf9803abf6393d05571b3ef326e3001057bcd0cb ChangeLog 4824
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -25,10 +34,13 @@ SHA256 8b740648bc2fa23cf97996558d05b7dc8f152c64e872fbc0dfb3c6f3bb7da5d9 files/di
 MD5 a8439425113758c25131b09294d896f1 files/digest-gcompris-8.2 244
 RMD160 c5bdc47243aea52ebab51a1df45c6d901f0fad63 files/digest-gcompris-8.2 244
 SHA256 f707a0f760f77a0556cdb20bf1d9fa93bb26c4bcad418e0061b8ef87c926eee5 files/digest-gcompris-8.2 244
+MD5 b9ba3ed48c01bfda2787a4d13fde95f6 files/digest-gcompris-8.2.2 250
+RMD160 e3fe2ded9a0c2433156c4edf07f3136070c9f771 files/digest-gcompris-8.2.2 250
+SHA256 5558936b86573c2da6e5346cca7e3d75ee094894b2b853bbba7ea2cd08629d5e files/digest-gcompris-8.2.2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFnws0dz7hIScOURERAtONAJ9RWF6wfIttRe7M4gkuIIHv6HKAIwCglMBT
-Fdt3npVEO5pAmDxIjCGw7i8=
-=lUkk
+iD8DBQFF8o5tdz7hIScOURERAnGjAJ4qUlsxHIgjkdDvIhTH3DQ4qRxNSQCfSZUO
+HzJqx32TOl6zTLioC7b4R68=
+=va9L
 -----END PGP SIGNATURE-----

diff --git a/games-kids/gcompris/files/digest-gcompris-8.2.2 b/games-kids/gcompris/files/digest-gcompris-8.2.2
new file mode 100644 (file)
index 0000000..31e9bd6
--- /dev/null
+++ b/games-kids/gcompris/files/digest-gcompris-8.2.2
@@ -0,0 +1,3 @@
+MD5 297d6507ed9a4c6558f8bce6b6f81406 gcompris-8.2.2.tar.gz 79037459
+RMD160 5baf13fe72dd7810e3da160ea4ccaa37912dc092 gcompris-8.2.2.tar.gz 79037459
+SHA256 4d5e6fc993ef0be753782c0fc0b35277e8369d25db83108db313437b55cea44d gcompris-8.2.2.tar.gz 79037459

diff --git a/games-kids/gcompris/files/gcompris-8.2.2-build.patch b/games-kids/gcompris/files/gcompris-8.2.2-build.patch
new file mode 100644 (file)
index 0000000..1a21363
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-8.2.2-build.patch
@@ -0,0 +1,140 @@
+--- configure.in
++++ configure.in
+@@ -149,10 +149,8 @@
+           USE_DEBUG="$enableval", USE_DEBUG="no")
+ if test "x$USE_DEBUG" == "xyes" ; then
+     AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
+-    CFLAGS="$CFLAGS -Wall -Werror -g"
+-else
+-    CFLAGS="$CFLAGS -Wall -Werror"
+ fi
++CFLAGS="$CFLAGS -Wall"
+ 
+ dnl WIN32 Specifics
+ AC_MSG_CHECKING([for native Win32])
+@@ -219,25 +217,25 @@
+ dnl
+ 
+ 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 Test for gnuchess
+--- docs/C/Makefile.am
++++ docs/C/Makefile.am
+@@ -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)
+ 
+--- docs/eu/Makefile.am
++++ docs/eu/Makefile.am
+@@ -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)
+ 
+--- docs/fr/Makefile.am
++++ docs/fr/Makefile.am
+@@ -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)
+ 
+--- Makefile.am
++++ Makefile.am
+@@ -8,15 +8,13 @@
+ 
+ SUBDIRS = po src boards $(DOCS_SUBDIR) autopackage
+ 
+-icondir=$(datadir)/pixmaps
++icondir=/usr/share/pixmaps
+ icon_DATA = gcompris.png gcompris-edit.png
+ 
+-Applicationsdir = $(datadir)/applications/
++Applicationsdir = /usr/share/applications
+ Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
+ Applications_DATA = gcompris.desktop gcompris-edit.desktop
+ 
+-Menudir=$(prefix)/lib/menu
+-Menu_DATA=gcompris
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -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@.
+--- src/gcompris/gcompris.c
++++ src/gcompris/gcompris.c
+@@ -1117,7 +1117,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);
+     }
+--- src/gcompris/Makefile.am
++++ src/gcompris/Makefile.am
+@@ -69,7 +69,7 @@
+ 
+ libgcomprisincludedir = $(includedir)/libgcompris-1.0/libgcompris
+ 
+-libgcomprisinclude_HEADERS =                  \
++noinst_HEADERS =                      \
+       about.h \
+       anim.h \
+       binreloc.h \
+@@ -97,7 +97,7 @@
+       $(cairo_h)
+ 
+ libgcompris_1_la_SOURCES =                    \
+-      $(libgcomprisinclude_HEADERS)   \
++      $(noinst_HEADERS)       \
+       about.c \
+       anim.c \
+       bar.c \

diff --git a/games-kids/gcompris/gcompris-8.2.2.ebuild b/games-kids/gcompris/gcompris-8.2.2.ebuild
new file mode 100644 (file)
index 0000000..b9ba21f
--- /dev/null
+++ b/games-kids/gcompris/gcompris-8.2.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-8.2.2.ebuild,v 1.1 2007/03/10 10:54:19 nyhm Exp $
+
+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-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug gnet python sqlite"
+
+RDEPEND="=x11-libs/gtk+-2*
+       gnome-base/libgnomecanvas
+       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-python/gnome-python
+               dev-python/pygtk
+               dev-python/pyxml
+               >=dev-python/pysqlite-2
+       )
+       sqlite? ( dev-db/sqlite )"
+DEPEND="${RDEPEND}
+       sys-devel/gettext
+       sys-apps/texinfo
+       app-text/texi2html
+       dev-util/pkgconfig"
+RDEPEND="${RDEPEND}
+       media-gfx/tuxpaint
+       sci-electronics/gnucap"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-build.patch
+       cp /usr/share/gettext/config.rpath .
+       eautoreconf
+}
+
+src_compile() {
+       python_version
+       GNUCHESS=${GAMES_BINDIR}/gnuchess \
+       egamesconf \
+               --disable-dependency-tracking \
+               --enable-xf86vidmode \
+               --disable-cairo \
+               $(use_with python python /usr/bin/python${PYVER}) \
+               $(use_enable debug) \
+               $(use_enable gnet) \
+               $(use_enable sqlite) \
+               || die
+       emake -j1 || die "emake failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "emake install failed"
+       dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+       prepgamesdirs
+}