Add missing dependency. Remove useless src_prepare. Do not install static lib and remove .la file for libglade-2 usage. Remove old revision.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 22 insertions, 42 deletions

diff --git a/gnome-base/libgnomecanvas/ChangeLog b/gnome-base/libgnomecanvas/ChangeLog
index a231935208d7..431854ab97f4 100644
--- a/gnome-base/libgnomecanvas/ChangeLog
+++ b/gnome-base/libgnomecanvas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnomecanvas
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/ChangeLog,v 1.124 2010/08/03 01:19:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/ChangeLog,v 1.125 2010/08/18 21:38:09 eva Exp $
+
+  18 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgnomecanvas-2.20.1.1.ebuild, libgnomecanvas-2.30.1.ebuild:
+  Add missing dependency. Remove useless src_prepare. Do not install static
+  lib and remove .la file for libglade-2 usage. Remove old revision.
 
   03 Aug 2010; Jeroen Roovers <jer@gentoo.org>
   libgnomecanvas-2.20.1.1.ebuild, libgnomecanvas-2.26.0.ebuild,
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.20.1.1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.20.1.1.ebuild
deleted file mode 100644
index ad3e91c9d74b..000000000000
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.20.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.20.1.1.ebuild,v 1.11 2010/08/03 01:19:58 jer Exp $
-
-inherit virtualx gnome2
-
-DESCRIPTION="The Gnome 2 Canvas library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-# gail dep at 1.19.6 to ensure both gail and libgnomecanvas aren't providing GailCanvas (got moved to here with gail-1.19.6)
-RDEPEND=">=x11-libs/gtk+-2.13.0
-	>=media-libs/libart_lgpl-2.3.8
-	>=x11-libs/pango-1.0.1
-	>=gnome-base/libglade-2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.18
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_test() {
-	Xmake check || die "Test phase failed"
-}
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.1.ebuild
index cee1828f8f24..4eff21ec098b 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.30.1.ebuild,v 1.4 2010/08/03 01:19:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.30.1.ebuild,v 1.5 2010/08/18 21:38:09 eva Exp $
 
-EAPI=2
-inherit virtualx gnome2
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib virtualx
 
 DESCRIPTION="The Gnome 2 Canvas library"
 HOMEPAGE="http://www.gnome.org/"
@@ -13,7 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="doc glade"
 
-RDEPEND=">=x11-libs/gtk+-2.13
+RDEPEND=">=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.13
 	>=media-libs/libart_lgpl-2.3.8
 	>=x11-libs/pango-1.0.1
 	glade? ( >=gnome-base/libglade-2 )"
@@ -28,16 +31,19 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable glade)"
+	G2CONF="${G2CONF} $(use_enable glade) --disable-static"
 }
 
-src_prepare() {
-	# Fix intltoolize broken file, see upstream #577133
-	# TODO: report upstream their translations are broken (intltool)
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
+src_install() {
+	gnome2_src_install
+
+	if use glade; then
+		# libglade doesn't need .la files
+		find "${D}/usr/$(get_libdir)/libglade/2.0" -name "*.la" -delete || die
+	fi
 }
 
 src_test() {
 	Xmake check || die "Test phase failed"
 }
+