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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 34 insertions, 46 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/Manifest b/gnome-base/libgnomecanvas/Manifest
index 94f92da58270..e8a21ccc249b 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,8 +1,16 @@
-DIST libgnomecanvas-2.20.1.1.tar.bz2 583565 RMD160 fe5333c31f385313b2e90deb9710275d61bbc15b SHA1 302a4762b658244828ad1c9f291ffb972b8274c9 SHA256 70f906d52d98b7b45e95fd59ef10f06579b75ee9e70e67edabd30a4f6e5d6fe3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libgnomecanvas-2.26.0.tar.bz2 600470 RMD160 87eb8f61b4ed8c3c3ede4941aeb8b539731d1d9f SHA1 d0429140c3ae8974562f4eb34e89d4f512e8e4ec SHA256 80b480acc33d7303f651e9c5bc8fea51c9e9a9ed59ebfdbbb730dd798bcbc58d
 DIST libgnomecanvas-2.30.1.tar.bz2 583190 RMD160 dafdf8cbf24e664d1be4657ee95e55a130a098f1 SHA1 2837b5a388b2b206481d3cd99762a5a59fa53a12 SHA256 291a436cba73550fc1cc93a2bc99353daa18c0a9fec4cfcff47d9ec38d643166
-EBUILD libgnomecanvas-2.20.1.1.ebuild 903 RMD160 bfff7735a63d97d804a477f00d39f9db47bd6d33 SHA1 cb699982027c099dfc19f03dee03634eb40b9561 SHA256 4dd97e79b6602fce512e5e307aa9f708aa690bdf2016ef959607439b40511cf4
 EBUILD libgnomecanvas-2.26.0.ebuild 830 RMD160 2d17d71f3f6cf3c9608fab7abfca6419379ecc8d SHA1 efc53f87a3d1c71023824ce2bcfd8ea3105cd910 SHA256 628cf88227d6b079a40fb812bc406956b91dffa35ec5e119e8ad3e3792620543
-EBUILD libgnomecanvas-2.30.1.ebuild 1106 RMD160 54d1b8bf63381932124fba9497a2c908d1c4465b SHA1 c2f314805de04220f3dbd5567144bd58f781a490 SHA256 fd84431ad803c1668a5a54ded4b4fd71472cfd2a77e7c58923b95d6bfe2e8d5c
-MISC ChangeLog 14774 RMD160 d19e0d57be21e9e9c248e7a24a367aa4e9321f1a SHA1 cda649334a450ffb69c4bab649831e37b25e3298 SHA256 3706d381965b322f8325857e953146fce389580efdc9b16afed4126f5a452057
+EBUILD libgnomecanvas-2.30.1.ebuild 1122 RMD160 be77a6248413cf137806399679d41ecde84bc17a SHA1 a554f1612e6ab3c066e6e215cf50bd571e9aa03c SHA256 2a423bed82d8c5cbf02bf134d619d71cac14a81641bea37c794b753b6808908c
+MISC ChangeLog 15039 RMD160 15dc7a95aadc5d666baa6c517b63d9eb42eedcd9 SHA1 317cc472bdfa6690d727365b13d11055089b3c71 SHA256 be834206842254d5bd3a75e40f2d38b7ed4dcf548aaea152666514f2feab09b2
 MISC metadata.xml 219 RMD160 6cf937fe513f8fa92b22294ff939ce7896977b29 SHA1 8b1b47cc06fc444b3a8f26ee85994a1ffe38a659 SHA256 e937b1ec46a2cc3662d3f4327ae41d592469c7a245cd8ee820558f57836b22f0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxsUtIACgkQ1fmVwcYIWAaVOwCgvLZ1knFL4h5ledakPGXKZX/n
+l0gAoNICMloQMhLFg6eZtB5eTa3EKbpd
+=eRGG
+-----END PGP SIGNATURE-----
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"
 }
+