(*) major revamp of ebuilds, upgrading EAPIs

1 files changed, 28 insertions, 17 deletions

diff --git a/gnome-base/libgnome/libgnome-2.32.1.ebuild b/gnome-base/libgnome/libgnome-2.32.1.ebuild
index 7df916e0..2d6cec1c 100644
--- a/gnome-base/libgnome/libgnome-2.32.1.ebuild
+++ b/gnome-base/libgnome/libgnome-2.32.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.ebuild,v 1.6 2011/03/22 19:16:21 ranger Exp $
+# $Header: $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2 eutils
 
@@ -12,43 +14,52 @@ HOMEPAGE="http://library.gnome.org/devel/libgnome/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc esd"
+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"
+
+SRC_URI="${SRC_URI}
+	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
 
 RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.16
+	>=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
-	esd? (
-		>=media-sound/esound-0.2.26
-		>=media-libs/audiofile-0.2.3 )"
+	media-libs/libcanberra"
 
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.17
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 PDEPEND="gnome-base/gvfs"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-static
 		--disable-schemas-install
 		--enable-canberra
-		$(use_enable esd)"
+		--disable-esd"
 	DOCS="AUTHORS ChangeLog NEWS README"
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
+	# Sabayon customization
+	epatch "${FILESDIR}/${PN}-2.32-sabayon-background.patch"
+
 	# Make sure menus have icons. People don't like change
 	epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch"
 
-	# Sabayon customization
-	epatch "${FILESDIR}/${PN}-2.32-sabayon-background.patch"
+	use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch
+
+	# 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
 }
 
 src_install() {
@@ -56,9 +67,9 @@ src_install() {
 
 	if use branding; then
 		# Add gentoo backgrounds
-		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo || die "dodir failed"
+		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo
 		insinto /usr/share/pixmaps/backgrounds/gnome/gentoo
-		doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png || die "doins 1 failed"
-		doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png || die "doins 2 failed"
+		doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png
+		doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png
 	fi
 }