summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-base/libgnomecanvas/ChangeLog6
-rw-r--r--gnome-base/libgnomecanvas/libgnomecanvas-2.30.2.ebuild15
2 files changed, 14 insertions, 7 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/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
}