Don't build demos that are not even installed, bug #226299; bump to eapi3, update homepage.

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

3 files changed, 20 insertions, 13 deletions

diff --git a/gnome-base/libgnomecanvas/ChangeLog b/gnome-base/libgnomecanvas/ChangeLog
index f848f0a5e165..09ad57d65e25 100644
--- a/gnome-base/libgnomecanvas/ChangeLog
+++ b/gnome-base/libgnomecanvas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgnomecanvas
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/ChangeLog,v 1.134 2011/01/19 21:23:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/ChangeLog,v 1.135 2011/01/27 12:35:06 pacho Exp $
+
+  27 Jan 2011; Pacho Ramos <pacho@gentoo.org> libgnomecanvas-2.30.2.ebuild:
+  Don't build demos that are not even installed, bug #226299; bump to eapi3,
+  update homepage.
 
   19 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
   libgnomecanvas-2.30.2.ebuild:
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index d9de134e236f..55a6b0426bf0 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST libgnomecanvas-2.30.1.tar.bz2 583190 RMD160 dafdf8cbf24e664d1be4657ee95e55a130a098f1 SHA1 2837b5a388b2b206481d3cd99762a5a59fa53a12 SHA256 291a436cba73550fc1cc93a2bc99353daa18c0a9fec4cfcff47d9ec38d643166
 DIST libgnomecanvas-2.30.2.tar.bz2 563360 RMD160 f5fb88a60d0f297cb36b8e3706fb1a58b4881ce4 SHA1 084d8c928206f0b5bdd6ba0096c1366b8cfccf01 SHA256 a74edb1054cd394ea7514c6abdf7539b0b4c6d62a34c2ab5e30ba231af1f13f9
 EBUILD libgnomecanvas-2.30.1.ebuild 1300 RMD160 74671852d5242ddb964307a696ceba2350514e86 SHA1 7bba795f73676804765c5982ccfe69df47203e92 SHA256 03af70a2ff320c30affc5726d2e3791e2ca784fa3253ae5fbde4735e611d68f8
-EBUILD libgnomecanvas-2.30.2.ebuild 1307 RMD160 e88bbbae764d06ffc28604cafe6563c7442b7879 SHA1 7eaebae48ea200046bd206872103269242f3df6f SHA256 2bb197f26ff88f8410a0c510e11349915e2be98e81ca3f451cb3cdd0394afdcc
-MISC ChangeLog 16124 RMD160 188ae6cff83fc46bae0d0f5031c7026906d23a4f SHA1 15302d4caea1a54230070259422ee1bf04581e5e SHA256 0d994d900ebc0c29345c7d474f437a188a22a4a470c681cf6ada3db512cdcc58
+EBUILD libgnomecanvas-2.30.2.ebuild 1497 RMD160 b3e00ec1b33a896a83b3b83155b23bb868e406d6 SHA1 a5ea8742856ffdf528494013f5dca9ea71a0b89e SHA256 77168c71ec883fdf922dc69087239df3cfbe683f80b040b8d9836cf4c927058a
+MISC ChangeLog 16294 RMD160 119c1a06cdf6aa7d1e4e1701ecf15a12a626affb SHA1 76179a61a597b0579064a181eaaf5d2e9b1b9034 SHA256 7d99de375cc6656a204e43cc06ba407dd7d3fa08b57ee1130041a4e2a4641d06
 MISC metadata.xml 219 RMD160 6cf937fe513f8fa92b22294ff939ce7896977b29 SHA1 8b1b47cc06fc444b3a8f26ee85994a1ffe38a659 SHA256 e937b1ec46a2cc3662d3f4327ae41d592469c7a245cd8ee820558f57836b22f0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk03Vg4ACgkQ9/cejkQaxBDlsACfa/rwpM84BWQCp2Rc2ucpbW6/
-zsAAniQYBdC3+NLb9xzoRWFsJee+mkAW
-=hbKR
+iEYEARECAAYFAk1BZn8ACgkQCaWpQKGI+9T0dQCeI0wtQIL9HI0ISg/deJFZeIkk
+NjwAn1wrramGDVj9UMZLXM9gqhGyjG7n
+=6XNk
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.2.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.2.ebuild
index c0cfb0d57f11..75bb0e7c1c4f 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.2.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.30.2.ebuild,v 1.3 2011/01/19 21:23:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.30.2.ebuild,v 1.4 2011/01/27 12:35:06 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
 
 inherit gnome2 multilib virtualx
 
 DESCRIPTION="The Gnome 2 Canvas library"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="http://library.gnome.org/devel/libgnomecanvas/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -28,9 +28,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.18
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF} $(use_enable glade) --disable-static"
 }
 
@@ -40,6 +39,10 @@ src_prepare() {
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
 		|| die "sed failed"
+
+	# Don't build demos that are not even installed, bug #226299
+	sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "sed 2 failed"
 }
 
 src_install() {
@@ -47,7 +50,7 @@ src_install() {
 
 	if use glade; then
 		# libglade doesn't need .la files
-		find "${D}/usr/$(get_libdir)/libglade/2.0" -name "*.la" -delete || die
+		find "${ED}/usr/$(get_libdir)/libglade/2.0" -name "*.la" -delete || die
 	fi
 }