Update ebuild

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 29 insertions, 30 deletions

diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog
index 26fb386799f6..bf75b1eb1fba 100644
--- a/gnome-base/libgnome/ChangeLog
+++ b/gnome-base/libgnome/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/libgnome
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.222 2013/03/29 19:32:55 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.223 2015/01/07 20:01:30 pacho Exp $
+
+  07 Jan 2015; Pacho Ramos <pacho@gentoo.org> libgnome-2.32.1-r1.ebuild:
+  Update ebuild
 
   29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -libgnome-2.32.1.ebuild:
   Clean up old revision.
@@ -813,4 +816,3 @@
 *libgnome-1.117.0 (22 May 2002)
   22 May 2002; Spider <spider@gentoo.org>   libgnome-1.117.0.ebuild :
   part of gnome2 . initial cvs commit
-
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
index a5be8440aac1..b7e040ced4a3 100644
--- a/gnome-base/libgnome/Manifest
+++ b/gnome-base/libgnome/Manifest
@@ -5,13 +5,13 @@ AUX libgnome-2.26.0-branding.patch 839 SHA256 b7bfd8ea5a29e860d291abd3866ade0a0f
 AUX libgnome-2.28.0-menus-have-icons.patch 538 SHA256 55cba8a533b509bf2ae20b7679f4502f3b240f08caf976f99240f57acd111d75 SHA512 4897bd5497fd9cfbf778ab7c815028e5b819d1c1f69d2ad9bedb0f5895e8c7b7b40a918436026e494c83238c694145670046a0d0beeda31c5820bed5867eb1d2 WHIRLPOOL e6d120e7a76b6e7764f75686aea42f6d9ca08b6af24e01d61a29cbbe18e5eade04329b6074b0826b3576e81f2fa39818d0f812c21ad158070a018feb246452c0
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 DIST libgnome-2.32.1.tar.bz2 1776006 SHA256 b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4 SHA512 f94e603255a93e73249e0fd9ed5604d732b44ad46f3cc3065afb46fc6162f6cf29304f49440b5c06303b8e68608b6fd16236076813febb5f1cbdcde4bfc3b3e3 WHIRLPOOL b5d04cbbbf7064fdd6ccf6e140ac89285c585a82a66687fc9ce3ec5d74f50ec52d52416fadfa34bb79946c99188aa3bf6aa0b7d597c8d3d526f6938c74f602a6
-EBUILD libgnome-2.32.1-r1.ebuild 1959 SHA256 1cedb1b42c926db174755bdaea61f1dc239640fc7e747e131ca36410ac5af6e8 SHA512 daac636c678e446e626df5ddb3ad6112061852980882e4be44f7fcd773dcd951c022ae76239c438aec126f84bb534045640414cc5e1ab6ef97ff22c59dc569d3 WHIRLPOOL d06cc4b14126fb700ee9877e789dd286a29ce0f247047609eed8fc31b745b26f1d6b1a88b02c0d6019d35c5f135aec46d4eb0d93c1df17005900c6449ef5d940
-MISC ChangeLog 26665 SHA256 7d76340562a39eb7395a93ad7ed2143c757d734ad4dc14382c0d33f544ad046b SHA512 5ef4350dd8a75802c4693d4f5cf6ad39c081d018acd65a39e3de147a94c85741c06564fe61f59e27200f2250226d17e8e1e390486eb8e5ce652566fcb85e70e1 WHIRLPOOL fdca90ec395df4d7cb437aae268dec043f838b38fe6215c7d5c8a098ee2a407a5e1f5d2d56fb992c12f26753b27751d8caa0675ee558edfee8f9afc70bf01c41
+EBUILD libgnome-2.32.1-r1.ebuild 1787 SHA256 3a8dd91d0e0740d5e4c6e07882d57ba8ff7d545d5a258eff93cc1e585a2cb13b SHA512 d980c3635df8c7afed3df001daca5e0ce5b8b48bcb01702ff4a7a20a7ca8aea157099accc414b256cf7d796d4911f6ba0a11b2a7589724235df5c7f31a7fb127 WHIRLPOOL 2e03ffb6374460d81f91637fcc91aafef1a181c4873bbd6497afc07e43696606c2bd75bd3a593adc39717432204eb365b7402c19cc1a54290565495b685cf5b7
+MISC ChangeLog 26756 SHA256 642548ce354a38a9ad5d160f73362f79bc9e5b3ba1e583df195088723e4e55ce SHA512 e0385fcb126cf8ae60517b52a776a4e6e6bcd28433bb9d394f7c140d460f7662a7db41bf67d9185803dafa7ac93a57c8bd3e39388ff843f93e533f53f62c25fb WHIRLPOOL f02575572f4284be3276bad11c288f3ef06a2b178b2a7054fc449cb06459beab1bdac166633a8329a50760127ccac5e40a503f401e96d5280929056551c55787
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlFV7GgACgkQ1fmVwcYIWAZTWQCfeyYuaRQAQwB/1T8L8/uaYKZG
-TnQAoOX13PI/+KsT2gU2ULFmS6FRDNK0
-=AOzJ
+iEYEAREIAAYFAlStkJsACgkQCaWpQKGI+9SQkQCaAipvMRAYeAZPk68Od9CmOjHA
+wooAn1UxGPwUPkuKM3wcDydUaGeX5cTK
+=D7b3
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
index 0cfde6334dce..eece6ff007a8 100644
--- a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
+++ b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild,v 1.9 2012/07/15 17:24:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild,v 1.10 2015/01/07 20:01:30 pacho Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -15,38 +15,29 @@ HOMEPAGE="http://library.gnome.org/devel/libgnome/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 ~sparc-solaris ~x86-solaris"
-IUSE="branding doc"
+IUSE="branding"
 
 SRC_URI="${SRC_URI}
 	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
 
-RDEPEND=">=gnome-base/gconf-2
+RDEPEND="
+	>=gnome-base/gconf-2
 	>=dev-libs/glib-2.16:2
 	>=gnome-base/gnome-vfs-2.5.3
 	>=gnome-base/libbonobo-2.13
 	>=dev-libs/popt-1.7
-	media-libs/libcanberra"
-
+	media-libs/libcanberra
+"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
+"
 
 PDEPEND="gnome-base/gvfs"
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-install
-		--enable-canberra
-		--disable-esd"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
 src_prepare() {
-	gnome2_src_prepare
-
 	# Make sure menus have icons. People don't like change
 	epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch"
 
@@ -55,8 +46,14 @@ src_prepare() {
 	# Default to Adwaita theme over Clearlooks to proper gtk3 support
 	sed -i -e 's/Clearlooks/Adwaita/' schemas/desktop_gnome_interface.schemas.in.in || die
 
-	# Drop DEPRECATED flags
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' libgnome/Makefile.* || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-canberra \
+		--disable-esd
 }
 
 src_install() {