version bump

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 222 insertions, 2 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index f13dcbf33e08..7a85c7bec3f5 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.77 2012/07/16 06:41:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.78 2012/07/16 15:58:58 mr_bones_ Exp $
+
+*gcompris-12.05 (16 Jul 2012)
+
+  16 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gcompris-12.05-build.patch, +gcompris-12.05.ebuild:
+  version bump
 
 *gcompris-12.01-r1 (16 Jul 2012)
 
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index d737f52a8e35..2b3f982180e8 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,6 +1,9 @@
 AUX gcompris-12.01-build.patch 4199 SHA256 49eb23b9a26b6b2dac67fff46a349d95bfe7e4277b089360f41144242a744dc2 SHA512 6b8b990214fa8c68d9820945494e4805d6381f5260c3f19dfeefe8b647debee1dfb8847f75799cc2a0f9f8102e550f1cf54a7bd27e86833dad93dc63518450d7 WHIRLPOOL 1537fca461a46faf0d9f962c27a52b85ce16ba7ef9a865c1bfb154c45c1091a3738fd658e6cb3fa69a358749026c988e0f4222faa902348c30af256e6e971bd7
+AUX gcompris-12.05-build.patch 4273 SHA256 b863a732cbf5bd3f026c1e0ae3fd58000f79549edf5f27f0de106160b0890c27 SHA512 42e95d83871b2e9ce8f47eccdf501d1af587306162115efa1f0bf35a61f29b8e00d308a94bcae0794ea75f7ab019a9a83d9edb02cc56ff506f8ab703bd346136 WHIRLPOOL d5163900398670a5f40da489b6475f3567d0cb703584d7a5a7802d61cf733f3dc481815f50b652e221ab4badd8e9c68e3009c8fa38b91575d41a16f78fffc6db
 DIST gcompris-12.01.tar.gz 149465806 SHA256 77e5a4901550dfcad632277437b6895a65a553225224c8a78f2bd5b7b459aa91 SHA512 00a016c66965a8607048ad54e08902ce26dbb0cb424fda8a7b6f5dd8f25a44db94f0b0ea4d60e5a0e2eb575449a9a80893a5bf8f9baf927d27a87f5db067940e WHIRLPOOL 44c37f372b9fbe2b5432d459102c01dd723df0b321f03d0cb84a508f99906ad1f245a5ff8912a3eff33f286d506ebdf1a7d52078a2abaf2ca5830c6c91ba685b
+DIST gcompris-12.05.tar.bz2 152545527 SHA256 a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0 SHA512 65ecc6746e02adcc7158dff61f236b5b776a0032bb9c30d24cc41388f242f59a98d5e14c41aa27299c711ebf1569323b846a648ccb5e5b64c58440dac3fee77a WHIRLPOOL cc0ba912efbfd4be5dbb7125bf4594b7270715bfea15b0e20ee7697acb84876741931f167c53c9d4b822480662f405c77f045c199084733164da1275789b2e4a
 EBUILD gcompris-12.01-r1.ebuild 2142 SHA256 2dd85fe3fb7f8f4c60b7ff4dbd6e5909e2997cc821db7d45dd09ce980303aec0 SHA512 0b1f07b8b6302f834af4e2b4b674a36f130756729a127b3f96fadfe2295d54aaffd1ab0870bc772d87a2411d9e01052eeb907c4ea1d9fd082f7fb58fc80c2198 WHIRLPOOL 0b35cf9eaf970b045f009706e5f381b10a6501ddf715a652d7c169777a7c28b2508578b0e841ab0ee5e04653d56da2954ef7a8ab41f03380dd35bd8d29276960
 EBUILD gcompris-12.01.ebuild 2228 SHA256 67b0a5f72e8009721419ad01426688d3cf95733f6a9ae6c407f16985c0cc01ae SHA512 ddddc82465872cadf1ff629a36f0f28b0229c81d32b746feefd644b9bbe4654974e18c2792cd9be961ca03e98569677a750c17a8a549f0ae1ab482c6c3f18030 WHIRLPOOL 158ed177afb5a941cb3d7046212ba59543c86bf1bd916e21736598345d2e06e0a4616a592a10380f617c457d64da36be885fc346759b33702ec27aac1ed0408b
-MISC ChangeLog 11695 SHA256 d43d16551af4af02ca7ab221d368f73ce9012a8ff60db800b25d971efb38c072 SHA512 6126ac9a617d584f6af01d9b1a258b9a1fb57389ff9e7baa6c7d8850e8a1605a2cb2b8bada55fef6a5753fbc90955fbfd0f6bcbb2f9327c9eaf39cfdefb7b38d WHIRLPOOL cb1e21d913d2213ee7e86622ce8a60a315320d2a92e9b3fa7fe3f51d00e740b69e2df24e8dbfffd9b577e1402295f687bdf10446ff08af5912246cb0bebe1ec1
+EBUILD gcompris-12.05.ebuild 2139 SHA256 07655c35d6a875ce59cdc1439befd0e4641eda90a468618841bb01073e4553b9 SHA512 f9bfc49e1c3874493786ef0986b4d4414fa54a816ad5c61b915ad4f4ba0d7dfa5e1238d7011ed004520d4e470a353a72de7849b4527471064368e68230001a8d WHIRLPOOL d1ccf3d0b7bf7a49117f442ad9ce1f096726d3daf030791aa711321b9552d06d8e425c84f06f1994d80f7e62db0e711cd6a19990c6db3ae1cfae872556d80fb5
+MISC ChangeLog 11858 SHA256 c64bbb579e0ab36977e2285bc3f3003a4fe4b82d549fafeedfd031c320bf2270 SHA512 4a6495cc0a38bcc8c5c4369ced6cbbe6d6e338ccb1578c5fddda302a80c3774bc9ef9d0796b0dbc76834aeaa9e86d636809b9a4d0348981167ca74abea98ca9c WHIRLPOOL 7077f47e3285bf49c95cde38b5798b95948a1b5831ebe203ce527d066a43f575dc69e34505f9c28411d18d1759895365ed3d228fa0e0a935394fe78f40619d5a
 MISC metadata.xml 256 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254 SHA512 75b73342197d34f6a4b77728ceb8371062b6808b3d9c8a2b6500fe000b04155b722c5dbddcbc1f14d48d07ae2454cb1c0934cb7628db0d7db3ac2eebf12a3421 WHIRLPOOL f3f15efa43561035966de1a90e156ee4ab7de13f601b193e30db57b64dbd6bbb05441a7a5407ca957c62f909b5565c1bb777ed88a1550eac71ce17a1d0f316f2
diff --git a/games-kids/gcompris/files/gcompris-12.05-build.patch b/games-kids/gcompris/files/gcompris-12.05-build.patch
new file mode 100644
index 000000000000..5e78f9cb66c2
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-12.05-build.patch
@@ -0,0 +1,123 @@
+--- gcompris-12.05.orig/Makefile.am
++++ gcompris-12.05/Makefile.am
+@@ -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
+--- gcompris-12.05.orig/configure.ac
++++ gcompris-12.05/configure.ac
+@@ -204,10 +204,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 -g"
+-else
+-    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
+ fi
++CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
+ 
+ dnl disable activation code
+ AC_ARG_ENABLE(disable-activation-code,
+@@ -338,28 +336,28 @@
+   fi
+ else
+   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 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
+   AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_DIR, "/etc", [System GCompris config directory])
+ 
+   dnl Test for gnuchess
+-  AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH])
++  AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/games/bin:/usr/bin:/usr/games:/usr/local/bin:$PATH])
+   if test x$GNUCHESS = xno; then
+     AC_MSG_ERROR([Couldn't find gnuchess, please install the gnuchess package version]
+                  [ 5 or above or define the environment variable GNUCHESS.])
+--- gcompris-12.05.orig/docs/C/Makefile.am
++++ gcompris-12.05/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)
+ 
+--- gcompris-12.05.orig/docs/eu/Makefile.am
++++ gcompris-12.05/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)
+ 
+--- gcompris-12.05.orig/docs/fr/Makefile.am
++++ gcompris-12.05/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)
+ 
+--- gcompris-12.05.orig/po/Makefile.in.in
++++ gcompris-12.05/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@.
+--- gcompris-12.05.orig/src/gcompris/gcompris.c
++++ gcompris-12.05/src/gcompris/gcompris.c
+@@ -1341,7 +1341,7 @@
+     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);
+     properties->menu_dir = g_strdup(properties->package_data_dir);
+     g_free(pkg_data_dir);
+     g_free(pkg_clib_dir);
diff --git a/games-kids/gcompris/gcompris-12.05.ebuild b/games-kids/gcompris/gcompris-12.05.ebuild
new file mode 100644
index 000000000000..2b8289895897
--- /dev/null
+++ b/games-kids/gcompris/gcompris-12.05.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-12.05.ebuild,v 1.1 2012/07/16 15:58:58 mr_bones_ Exp $
+
+EAPI=2
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite threads"
+
+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.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gnet"
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/librsvg[gtk]
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-good
+	media-plugins/gst-plugins-ogg
+	media-plugins/gst-plugins-alsa
+	media-plugins/gst-plugins-vorbis
+	media-libs/sdl-mixer
+	media-libs/libsdl
+	dev-libs/libxml2
+	dev-libs/popt
+	virtual/libintl
+	games-board/gnuchess
+	dev-db/sqlite:3
+	gnet? ( net-libs/gnet:2 )
+	dev-python/pygtk"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	dev-perl/XML-Parser
+	sys-devel/gettext
+	sys-apps/texinfo
+	app-text/texi2html
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-gfx/tuxpaint
+	sci-electronics/gnucap"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	# Drop DEPRECATED flags, bug #387817
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		src/gcompris/Makefile.am src/gcompris/Makefile.in \
+		src/goocanvas/src/Makefile.am src/goocanvas/src/Makefile.in \
+		|| die
+
+	epatch "${FILESDIR}"/${P}-build.patch
+	cp /usr/share/gettext/config.rpath .
+	eautoreconf
+}
+
+src_configure() {
+	GNUCHESS="${GAMES_BINDIR}"/gnuchess \
+	egamesconf \
+		--disable-dependency-tracking \
+		--datarootdir="${GAMES_DATADIR}" \
+		--datadir="${GAMES_DATADIR}" \
+		--localedir=/usr/share/locale \
+		--infodir=/usr/share/info \
+		--with-python="$(PYTHON -a)" \
+		$(use_enable gnet) \
+		--enable-sqlite \
+		--enable-py-build-only
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	prepgamesdirs
+}