old

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

4 files changed, 6 insertions, 220 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index ba2384129cae..8e3c7c53ea6d 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,10 @@
 # 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.75 2012/05/03 03:26:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.76 2012/05/26 03:02:48 mr_bones_ Exp $
+
+  26 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/gcompris-9.6.1-build.patch, -gcompris-9.6.1.ebuild:
+  old
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gcompris-9.6.1.ebuild,
   gcompris-12.01.ebuild:
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index cf7298a9978b..bc952930e162 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,8 +1,5 @@
 AUX gcompris-12.01-build.patch 4199 RMD160 cd9630500391f6ce927d34310df57220afbee7e9 SHA1 7793000ebee5bef7f4454003febe98606f79012a SHA256 49eb23b9a26b6b2dac67fff46a349d95bfe7e4277b089360f41144242a744dc2
-AUX gcompris-9.6.1-build.patch 4199 RMD160 cd9630500391f6ce927d34310df57220afbee7e9 SHA1 7793000ebee5bef7f4454003febe98606f79012a SHA256 49eb23b9a26b6b2dac67fff46a349d95bfe7e4277b089360f41144242a744dc2
 DIST gcompris-12.01.tar.gz 149465806 RMD160 ce578e8ca494b85300fe0046d1fd111c79a1084d SHA1 c1e3a98e1e2ac7397a8da6bc176c112008008dbe SHA256 77e5a4901550dfcad632277437b6895a65a553225224c8a78f2bd5b7b459aa91
-DIST gcompris-9.6.1.tar.gz 145196483 RMD160 de8e3b530f97307fa6d745facf785204886b452d SHA1 b0a410ad87cdf087e5f238bcfc0ed87a0ce7ab5c SHA256 ffc3c127ff628c57f6a113bb1c568541bf4fc2f1e4242315d8a3fa7a5111f4e9
 EBUILD gcompris-12.01.ebuild 2228 RMD160 33a1fb248105781ddab4571f8ecab49e33237f1e SHA1 a3cda63e1eb8545ff54dddff916e74b3790bb5f9 SHA256 67b0a5f72e8009721419ad01426688d3cf95733f6a9ae6c407f16985c0cc01ae
-EBUILD gcompris-9.6.1.ebuild 2228 RMD160 3235d06581178241de7283109cdb31b69d799ae8 SHA1 80774bbfd327e82e4681b2f6c44f58caefd9939b SHA256 3d5c90878416742b9a212a87f65bab52d31eb10f4e865b23fc61681d9200ac61
-MISC ChangeLog 11353 RMD160 d576b7c267861f1b5cd56360dcec4e3ee18fe7c1 SHA1 5e0116a105ebc60a8a5852ae97ef315a2c247821 SHA256 e4f8bd28690dc8b5d7ff2f7c3a435144c1ac41265c250ab0001447ebe60ebfdc
+MISC ChangeLog 11479 RMD160 11e65c7421d1a957c4af4c90f46149c84f8535af SHA1 4e370e14365b78617e00d5635d075bd76bfdd199 SHA256 651ce9c5d5f326e79380ec20fa93c3fd76c8c12d314b6e32ce3e3c437f68fc66
 MISC metadata.xml 256 RMD160 570feef44e7d62ff41eb94fd83a54d9adcfe9a1d SHA1 2719c80bf2b8c87e73d7cd147cd617d8bb85c4d8 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254
diff --git a/games-kids/gcompris/files/gcompris-9.6.1-build.patch b/games-kids/gcompris/files/gcompris-9.6.1-build.patch
deleted file mode 100644
index 07be210e0a50..000000000000
--- a/games-kids/gcompris/files/gcompris-9.6.1-build.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- gcompris-9.5.orig/Makefile.am
-+++ gcompris-9.5/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-9.5.orig/configure.ac
-+++ gcompris-9.5/configure.ac
-@@ -203,10 +203,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 -O2"
- fi
-+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
- 
- dnl disable activation code
- AC_ARG_ENABLE(disable-activation-code,
-@@ -337,28 +335,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)
-   fi
---- gcompris-9.5.orig/docs/C/Makefile.am
-+++ gcompris-9.5/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-9.5.orig/docs/eu/Makefile.am
-+++ gcompris-9.5/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-9.5.orig/docs/fr/Makefile.am
-+++ gcompris-9.5/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-9.5.orig/po/Makefile.in.in
-+++ gcompris-9.5/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-9.5.orig/src/gcompris/gcompris.c
-+++ gcompris-9.5/src/gcompris/gcompris.c
-@@ -1308,7 +1308,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-9.6.1.ebuild b/games-kids/gcompris/gcompris-9.6.1.ebuild
deleted file mode 100644
index bbdafec16bb3..000000000000
--- a/games-kids/gcompris/gcompris-9.6.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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-9.6.1.ebuild,v 1.7 2012/05/03 03:26:38 jdhore Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="python? 2:2.6"
-PYTHON_USE_WITH_OPT="python"
-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.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnet python"
-
-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 )
-	python? ( 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() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-	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 \
-		$(use_with python 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
-}