Enable multilib support, required for gnome-base/libgnomeprintui. Remove useless USE=doc since HTML docs are bundled. Bug #515656.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 92 insertions, 9 deletions

diff --git a/gnome-base/libgnomecanvas/ChangeLog b/gnome-base/libgnomecanvas/ChangeLog
index 67ea17dcebd6..2da237e073b1 100644
--- a/gnome-base/libgnomecanvas/ChangeLog
+++ b/gnome-base/libgnomecanvas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnomecanvas
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/ChangeLog,v 1.150 2013/03/29 19:37:39 eva Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/ChangeLog,v 1.151 2014/06/29 09:45:15 mgorny Exp $
+
+*libgnomecanvas-2.30.3-r1 (29 Jun 2014)
+
+  29 Jun 2014; Michał Górny <mgorny@gentoo.org>
+  +libgnomecanvas-2.30.3-r1.ebuild:
+  Enable multilib support, required for gnome-base/libgnomeprintui. Remove
+  useless USE=doc since HTML docs are bundled. Bug #515656.
 
   29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
   -libgnomecanvas-2.30.1.ebuild, -libgnomecanvas-2.30.2.ebuild:
@@ -594,4 +601,3 @@
 *libgnomecanvas-1.117.0 (22 May 2002)
   22 May 2002; Spider <spider@gentoo.org> libgnomecanvas-1.117.0.ebuild:
   part of gnome2 . initial cvs commit
-
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index 97283d7e4085..284ce8d2d2ef 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,14 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libgnomecanvas-2.30.3.tar.bz2 574139 SHA256 859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
+DIST libgnomecanvas-2.30.3.tar.bz2 574139 SHA256 859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40 SHA512 b5bfa2133f5172abd5228d467db4d980dd4ac125cdbf55dcc1d5055dc3330861320c12cccb52ea63ba7f69824504c9d25781cd78001dc7a92b11c6f7e0c550de WHIRLPOOL a39e49ec6789588fec045501b8b9d72b9de16d86f4abf87a120768152edcf3e396f2c9db1c3b2126c3cc6644cda3bd16be099078094563a2ee352a99b9eeb9a8
+EBUILD libgnomecanvas-2.30.3-r1.ebuild 1825 SHA256 93a9f3eb3c1b2232851994e068687d6b9a4e2c3aadb8a504e657d0d1b2dbaaf1 SHA512 e862df94c05d0cc330d7332306341a188eddaa9de2533ee78dd6cd884fc50389f8234e13020ac923b3ae2baf8ea40f8bc324f7198deea251724a35996f99d820 WHIRLPOOL 36fc1853b7503048533f3bec75f9a8d39b7279e46258d46f3aff8401ff987aed21b383975ddc1102b2d6b633ba248ba6c0996a5100c3db1dfe3b4bd1256fdc41
 EBUILD libgnomecanvas-2.30.3.ebuild 1516 SHA256 6e5f77d7ff028cef3bde40eb5947a7f35f773dff130e797b717fd2132e776b5b SHA512 13fed8b857ab1a1375dacc9e5962554f0943e2b5fdddaa415f0eb02e866fec771e4be0ddac1dc1051ad206ea2927a7dbe9a3339cb127f33f2059032f2c1c17fe WHIRLPOOL beff19d96fa0e1734cb8c7849a4441842e83db51d3468cfde5da88d063a8a2f229f6dbdc42f8041cf44c8db83d5f422e0f61d72035a35c25ac8e5f9feb03366c
-MISC ChangeLog 18288 SHA256 5054adf1f1a24beec36fa266699b5a8425d15336b9b2bf9912b01c5725fbf917 SHA512 bec05855b891951d4bdaca3e1008eb9ac483f1c9076a3fdf94a7fb4903d1013eb0d4f87e88ecb374e9b1a9f50a79f7c4b3fc6e15964df9d89c8deb6141074801 WHIRLPOOL a665f2e0fad8bd7e64d85b4be6ad386a0972b9ad17d79d7605d907e8add974a9e01241dfeea4d436c99b8269b9fb365442fc3b3df197969bffba2b8d885f0fc0
+MISC ChangeLog 18553 SHA256 ba06b9a0366d6ec5333735f9410d770cf2c80f638ea36d76f125f84cefb17a53 SHA512 d724e1bdb250dfc43da83d3b4e9b5651f666726dde3bc28b975049b8c83b35f69b944e6570ce2c88f8f1370e87441ecb6b449df349b2025e6f884bfa11a3cf0f WHIRLPOOL 33fda1349996b16a0da64ff13defe3598711755ebab6169038a6ba77c6dfb81c717616e0a2b92531588a292364ffdca691f412fef55d555f831ffcf59eed2c86
 MISC metadata.xml 219 SHA256 e937b1ec46a2cc3662d3f4327ae41d592469c7a245cd8ee820558f57836b22f0 SHA512 fbe18b0d5ec8b043f6f20dc89252000fe187de5a1f4e5e0533c80dd811acd01d473aaef2a573619f9d77c1d7579d5c5a5aa191a23bcfe910503b698bb529d9e7 WHIRLPOOL 0029c4a61abf3986f3613a1c6c513da02752b900747eaf1ecd74650f8ecdf472c9ae48429c946abb28e398f95084835c04f14eb40b14347ad6466ef9bfd07344
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlFV7YQACgkQ1fmVwcYIWAbkpACdHslrnUkZ2lUCUpv2RqPONPRr
-sNUAoNYtf340TO8E0WxhEED0KtelZgac
-=CIdW
+iQJ8BAEBCABmBQJTr+AsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLc4P/i1y7XUSxgWv9kpfegpCJeC7
+ipDXFQ5ZOtxIozZE7thG0m5e5D+Wqe4iPc5+uqc6/F9hY8QtjnQl7HJ2QDHjImgA
+2pjYEyWo7LfftlBOha7dhtkYnIGHEsqupHQ6Rtt19GbNhs+tpVDh6ubPxS3nYfBA
+cKaqKq1bch4/05tShg/zoSZZnViF2ik7fEPfxP2tHPhhAZVrLhG/1+z3uexyP+CE
+lNdmcDqvS86i8aophbPNvgleaI0XG7NEi/+sTKKDR0K/0neE0qZuqdgWYze0qQA7
+hPe7NOh8rer8UXUA6mTjnjYTnvQirXa7rphYZPZ5U4ECxocC75iRX7HgEVMDHJS0
+qJGSXZ173O+6oWCJygSwIlCZUN3J2wSP5nvCOYk3QDtoNddiKfgUesjmpmaJjDQK
+O+xM7u7WnCtQaX9sHeSrqsGleX6H44lcr7rAExuKnOhDq/v7+mvQlpKFhmy1F1Y2
+dKiH1ILLhQO3c0qGfQo7MW/TyGG42YOVCcdt78XezrqU5Mf+ART8bfKPik7v38OT
+gIs9MkhUlEEeOOvrf08EK2YS15dGE93xVE1yJloe21naez/SQ+wBJmh3iZ4mI50t
+Hh8xJbMY5sOHFck7ty8/wyacUzei+rsODwhpd+vzsQE4LH+HBR7iUZfzo3Z/fovt
+cbFWA65dEHm7t6I5EN4b
+=md6U
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
new file mode 100644
index 000000000000..3f2dcd1cc70b
--- /dev/null
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild,v 1.1 2014/06/29 09:45:15 mgorny Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib multilib-minimal virtualx
+
+DESCRIPTION="The Gnome 2 Canvas library"
+HOMEPAGE="http://library.gnome.org/devel/libgnomecanvas/stable/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="glade"
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+	>=media-libs/libart_lgpl-2.3.21-r2[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+	glade? ( >=gnome-base/libglade-2.6.4-r1:2.0[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	gnome2_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"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(use_enable glade) \
+		--disable-static
+
+	ln -s "${S}"/docs/reference/html docs/reference/html || die
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	einstalldocs
+}
+
+multilib_src_test() {
+	Xemake check || die "Test phase failed"
+}