use system libs; refine deps a bit more; rebase patch

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

4 files changed, 173 insertions, 59 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index aaa4c3d64ef0..0231252dd484 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,10 @@
 # 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.44 2009/01/17 22:40:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.45 2009/01/19 04:40:40 mr_bones_ Exp $
+
+  19 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  files/gcompris-8.4.8-build.patch, gcompris-8.4.8.ebuild:
+  use system libs; refine deps a bit more; rebase patch
 
   17 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
   gcompris-6.5.3-r1.ebuild, gcompris-8.4.8.ebuild:
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index e5a09f216c12..ff8929278e09 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,7 +1,7 @@
-AUX gcompris-8.4.8-build.patch 5212 RMD160 286b2f45252715f604d25d70df3e752364881eee SHA1 888c0bc21665ba934ab276c7ae058ccafe963e37 SHA256 003d0d81ab28bf55f8d3cb8d1ca54cc318c987e6f468ccc823be70706342d806
+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.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.8.ebuild 1911 RMD160 63dd00b54a874770405e60602fe7729c50fe706f SHA1 325db1a991a68e0bc17ed56bed8dc0c668f1d0c4 SHA256 ffc830c55a30239172bf7bf08fe08a1ab9ca0dc483324840e0ea37439f865c54
-MISC ChangeLog 6606 RMD160 c138c4ca5efe1733ba2f5bf7da2b00dad0d7f203 SHA1 586691455b40927ac7c48126d230c9376e046480 SHA256 3c7451c3d2fc33aa246437b227fd30e07cff216e4a9d3f56a73c4b83a110a188
+EBUILD gcompris-8.4.8.ebuild 1887 RMD160 369e83fda1dd6d789958be532f1cb71c3b008c75 SHA1 92cdfab701c3fe3c71a0b16eed469501048a9242 SHA256 e5b3539111823c7a048c393c1efab38d65317ffe28306feb35cd8cb7ccf8b171
+MISC ChangeLog 6777 RMD160 6c4cc6ddae503009d697e07afdaf08ef6fcdf02c SHA1 e8301d688144cc1a34d3e860838d928280e0c1c9 SHA256 6402930f9eecdcf9da59706c8bd7048671c4e342628208aca4a289f221ddf566
 MISC metadata.xml 256 RMD160 570feef44e7d62ff41eb94fd83a54d9adcfe9a1d SHA1 2719c80bf2b8c87e73d7cd147cd617d8bb85c4d8 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254
diff --git a/games-kids/gcompris/files/gcompris-8.4.8-build.patch b/games-kids/gcompris/files/gcompris-8.4.8-build.patch
index b7e8f4f7fb6c..0918a99abc9f 100644
--- a/games-kids/gcompris/files/gcompris-8.4.8-build.patch
+++ b/games-kids/gcompris/files/gcompris-8.4.8-build.patch
@@ -1,7 +1,48 @@
-diff -Ndur gcompris-8.3.3.orig/configure.in gcompris-8.3.3.patched/configure.in
---- gcompris-8.3.3.orig/configure.in	2007-08-16 01:09:34.000000000 +0200
-+++ gcompris-8.3.3.patched/configure.in	2007-08-22 07:51:31.000000000 +0200
-@@ -258,10 +258,8 @@
+diff -ur gcompris-8.4.8.orig/Makefile.am gcompris-8.4.8/Makefile.am
+--- gcompris-8.4.8.orig/Makefile.am	2008-10-28 17:44:35.000000000 -0400
++++ gcompris-8.4.8/Makefile.am	2009-01-18 23:15:44.000000000 -0500
+@@ -17,7 +17,7 @@
+ endif
+ 
+ 
+-icondir=$(datadir)/pixmaps
++icondir=/usr/share/pixmaps
+ icon_DATA = gcompris.png gcompris-edit.png
+ 
+ if BUILD_MINGW32
+@@ -29,12 +29,10 @@
+ Menu_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
+ 
+-Menudir=$(prefix)/lib/menu
+-Menu_DATA=gcompris
+ endif
+ 
+ @INTLTOOL_DESKTOP_RULE@
+diff -ur gcompris-8.4.8.orig/configure.in gcompris-8.4.8/configure.in
+--- gcompris-8.4.8.orig/configure.in	2008-11-08 15:47:52.000000000 -0500
++++ gcompris-8.4.8/configure.in	2009-01-18 23:15:44.000000000 -0500
+@@ -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.")
@@ -13,7 +54,7 @@ diff -Ndur gcompris-8.3.3.orig/configure.in gcompris-8.3.3.patched/configure.in
  
  dnl WIN32 Specifics
  AC_MSG_CHECKING([for native Win32])
-@@ -330,25 +328,25 @@
+@@ -297,25 +303,25 @@
  if test "x$platform_win32" = "xno" ; then
  
    dnl Set PACKAGE_LOCALE_DIR in config.h.
@@ -44,9 +85,18 @@ diff -Ndur gcompris-8.3.3.orig/configure.in gcompris-8.3.3.patched/configure.in
    AC_SUBST(PYTHON_PLUGIN_DIR)
  
    dnl System GCompris config directory
-diff -Ndur gcompris-8.3.3.orig/docs/C/Makefile.am gcompris-8.3.3.patched/docs/C/Makefile.am
---- gcompris-8.3.3.orig/docs/C/Makefile.am	2007-06-17 21:23:54.000000000 +0200
-+++ gcompris-8.3.3.patched/docs/C/Makefile.am	2007-08-22 07:35:21.000000000 +0200
+@@ -531,8 +537,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 -ur gcompris-8.4.8.orig/docs/C/Makefile.am gcompris-8.4.8/docs/C/Makefile.am
+--- gcompris-8.4.8.orig/docs/C/Makefile.am	2008-03-12 16:26:23.000000000 -0400
++++ gcompris-8.4.8/docs/C/Makefile.am	2009-01-18 23:15:44.000000000 -0500
 @@ -10,7 +10,7 @@
  	     overview.dia \
  	     $(man_MANS)
@@ -56,9 +106,9 @@ diff -Ndur gcompris-8.3.3.orig/docs/C/Makefile.am gcompris-8.3.3.patched/docs/C/
  
  all: $(doc)
  
-diff -Ndur gcompris-8.3.3.orig/docs/eu/Makefile.am gcompris-8.3.3.patched/docs/eu/Makefile.am
---- gcompris-8.3.3.orig/docs/eu/Makefile.am	2007-06-17 21:23:55.000000000 +0200
-+++ gcompris-8.3.3.patched/docs/eu/Makefile.am	2007-08-22 07:35:21.000000000 +0200
+diff -ur gcompris-8.4.8.orig/docs/eu/Makefile.am gcompris-8.4.8/docs/eu/Makefile.am
+--- gcompris-8.4.8.orig/docs/eu/Makefile.am	2008-10-28 17:36:12.000000000 -0400
++++ gcompris-8.4.8/docs/eu/Makefile.am	2009-01-18 23:15:44.000000000 -0500
 @@ -8,7 +8,7 @@
  	     overview.dia \
  	     gcompris.texi
@@ -68,9 +118,9 @@ diff -Ndur gcompris-8.3.3.orig/docs/eu/Makefile.am gcompris-8.3.3.patched/docs/e
  
  all: $(doc)
  
-diff -Ndur gcompris-8.3.3.orig/docs/fr/Makefile.am gcompris-8.3.3.patched/docs/fr/Makefile.am
---- gcompris-8.3.3.orig/docs/fr/Makefile.am	2007-06-17 21:23:55.000000000 +0200
-+++ gcompris-8.3.3.patched/docs/fr/Makefile.am	2007-08-22 07:35:21.000000000 +0200
+diff -ur gcompris-8.4.8.orig/docs/fr/Makefile.am gcompris-8.4.8/docs/fr/Makefile.am
+--- gcompris-8.4.8.orig/docs/fr/Makefile.am	2008-10-28 17:35:25.000000000 -0400
++++ gcompris-8.4.8/docs/fr/Makefile.am	2009-01-18 23:15:44.000000000 -0500
 @@ -8,7 +8,7 @@
  	     overview.dia \
  	     gcompris.texi
@@ -80,35 +130,9 @@ diff -Ndur gcompris-8.3.3.orig/docs/fr/Makefile.am gcompris-8.3.3.patched/docs/f
  
  all: $(doc)
  
-diff -Ndur gcompris-8.3.3.orig/Makefile.am gcompris-8.3.3.patched/Makefile.am
---- gcompris-8.3.3.orig/Makefile.am	2007-06-17 21:27:17.000000000 +0200
-+++ gcompris-8.3.3.patched/Makefile.am	2007-08-22 07:59:08.000000000 +0200
-@@ -17,7 +17,7 @@
- endif
- 
- 
--icondir=$(datadir)/pixmaps
-+icondir=/usr/share/pixmaps
- icon_DATA = gcompris.png gcompris-edit.png
- 
- if BUILD_MINGW32
-@@ -29,12 +29,10 @@
- Menu_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
- 
--Menudir=$(prefix)/lib/menu
--Menu_DATA=gcompris
- endif
- 
- @INTLTOOL_DESKTOP_RULE@
-diff -Ndur gcompris-8.3.3.orig/po/Makefile.in.in gcompris-8.3.3.patched/po/Makefile.in.in
---- gcompris-8.3.3.orig/po/Makefile.in.in	2007-03-05 11:52:19.000000000 +0100
-+++ gcompris-8.3.3.patched/po/Makefile.in.in	2007-08-22 07:35:21.000000000 +0200
+diff -ur gcompris-8.4.8.orig/po/Makefile.in.in gcompris-8.4.8/po/Makefile.in.in
+--- gcompris-8.4.8.orig/po/Makefile.in.in	2008-11-08 16:02:03.000000000 -0500
++++ gcompris-8.4.8/po/Makefile.in.in	2009-01-18 23:15:44.000000000 -0500
 @@ -34,7 +34,7 @@
  datarootdir = @datarootdir@
  libdir = @libdir@
@@ -118,10 +142,99 @@ diff -Ndur gcompris-8.3.3.orig/po/Makefile.in.in gcompris-8.3.3.patched/po/Makef
  subdir = po
  install_sh = @install_sh@
  # Automake >= 1.8 provides @mkdir_p@.
-diff -Ndur gcompris-8.3.3.orig/src/gcompris/gcompris.c gcompris-8.3.3.patched/src/gcompris/gcompris.c
---- gcompris-8.3.3.orig/src/gcompris/gcompris.c	2007-06-19 00:19:49.000000000 +0200
-+++ gcompris-8.3.3.patched/src/gcompris/gcompris.c	2007-08-22 07:35:21.000000000 +0200
-@@ -1120,7 +1120,7 @@
+diff -ur gcompris-8.4.8.orig/src/Makefile.am gcompris-8.4.8/src/Makefile.am
+--- gcompris-8.4.8.orig/src/Makefile.am	2007-05-22 16:15:05.000000000 -0400
++++ gcompris-8.4.8/src/Makefile.am	2009-01-18 23:15:44.000000000 -0500
+@@ -1,3 +1,3 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = libart_lgpl libgnomecanvas gcompris boards
++SUBDIRS = gcompris boards
+diff -ur gcompris-8.4.8.orig/src/boards/Makefile.am gcompris-8.4.8/src/boards/Makefile.am
+--- gcompris-8.4.8.orig/src/boards/Makefile.am	2008-10-28 17:34:35.000000000 -0400
++++ gcompris-8.4.8/src/boards/Makefile.am	2009-01-18 23:15:44.000000000 -0500
+@@ -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
+ 
+@@ -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 -ur gcompris-8.4.8.orig/src/gcompris/Makefile.am gcompris-8.4.8/src/gcompris/Makefile.am
+--- gcompris-8.4.8.orig/src/gcompris/Makefile.am	2008-10-28 17:33:46.000000000 -0400
++++ gcompris-8.4.8/src/gcompris/Makefile.am	2009-01-18 23:16:00.000000000 -0500
+@@ -51,6 +51,8 @@
+ 	$(GCOMPRIS_CFLAGS) \
+ 	$(GNOME_INCLUDEDIR) \
+ 	$(XML_CFLAGS) \
++	$(LIBART_LGPL_CFLAGS) \
++	$(LIBGNOMECANVAS_CFLAGS) \
+ 	-DGNOME_DISABLE_DEPRECATED \
+         $(sqlite_cflags) \
+ 	$(GNET_CFLAGS) \
+@@ -119,12 +121,10 @@
+ 	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 -ur gcompris-8.4.8.orig/src/gcompris/gcompris.c gcompris-8.4.8/src/gcompris/gcompris.c
+--- gcompris-8.4.8.orig/src/gcompris/gcompris.c	2008-10-25 15:11:51.000000000 -0400
++++ gcompris-8.4.8/src/gcompris/gcompris.c	2009-01-18 23:15:44.000000000 -0500
+@@ -1156,7 +1156,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);
diff --git a/games-kids/gcompris/gcompris-8.4.8.ebuild b/games-kids/gcompris/gcompris-8.4.8.ebuild
index 79a7ace8086e..4c813411d142 100644
--- a/games-kids/gcompris/gcompris-8.4.8.ebuild
+++ b/games-kids/gcompris/gcompris-8.4.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.3 2009/01/17 23:39:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-8.4.8.ebuild,v 1.4 2009/01/19 04:40:40 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils python games
@@ -19,6 +19,7 @@ RDEPEND="x11-libs/gtk+:2
 	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
@@ -29,10 +30,8 @@ RDEPEND="x11-libs/gtk+:2
 	gnet? ( net-libs/gnet:2 )
 	python? (
 		dev-lang/python[threads]
-		dev-python/gnome-python
 		dev-python/pygtk
-		dev-python/pyxml
-		dev-python/pysqlite:2
+		sqlite? ( dev-python/pysqlite:2 )
 	)
 	sqlite? ( dev-db/sqlite:3 )"
 DEPEND="${RDEPEND}
@@ -46,8 +45,7 @@ RDEPEND="${RDEPEND}
 	sci-electronics/gnucap"
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-build.patch
 	cp /usr/share/gettext/config.rpath .
 	eautoreconf
 }
@@ -65,8 +63,7 @@ src_configure() {
 		$(use_with python python /usr/bin/python${PYVER}) \
 		$(use_enable debug) \
 		$(use_enable gnet) \
-		$(use_enable sqlite) \
-		|| die
+		$(use_enable sqlite)
 }
 
 src_compile() {