Default to Adwaita theme over Clearlooks to proper gtk3 support, otherwise people still get ugly gtk3 theme if they don't manually set Adwaita. Drop DEPRECATED flags and disable esd support as esound will go away. Remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 30 insertions, 80 deletions

diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog
index a906b89733aa..6aa439532a1c 100644
--- a/gnome-base/libgnome/ChangeLog
+++ b/gnome-base/libgnome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/libgnome
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.211 2011/04/10 12:41:37 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.212 2012/01/05 22:15:01 pacho Exp $
+
+*libgnome-2.32.1-r1 (05 Jan 2012)
+
+  05 Jan 2012; Pacho Ramos <pacho@gentoo.org> +libgnome-2.32.1-r1.ebuild,
+  -libgnome-2.30.0.ebuild, -libgnome-2.32.0.ebuild:
+  Default to Adwaita theme over Clearlooks to proper gtk3 support, otherwise
+  people still get ugly gtk3 theme if they don't manually set Adwaita. Drop
+  DEPRECATED flags and disable esd support as esound will go away. Remove old.
 
   10 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> libgnome-2.32.1.ebuild:
   Punt useless static libraries and libtool files.
diff --git a/gnome-base/libgnome/libgnome-2.30.0.ebuild b/gnome-base/libgnome/libgnome-2.30.0.ebuild
deleted file mode 100644
index a47b0b93fa2f..000000000000
--- a/gnome-base/libgnome/libgnome-2.30.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.30.0.ebuild,v 1.8 2010/10/17 15:09:03 armin76 Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-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="branding doc esd"
-
-SRC_URI="${SRC_URI}
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.16
-	>=gnome-base/gnome-vfs-2.5.3
-	>=gnome-base/libbonobo-2.13
-	>=dev-libs/popt-1.7
-	esd? (
-		>=media-sound/esound-0.2.26
-		>=media-libs/audiofile-0.2.3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome-base/gvfs"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)"
-}
-
-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"
-
-	use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch
-
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use branding; then
-		# Add gentoo backgrounds
-		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"
-	fi
-}
diff --git a/gnome-base/libgnome/libgnome-2.32.0.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
index c267a652c3bc..e2cadc49a07f 100644
--- a/gnome-base/libgnome/libgnome-2.32.0.ebuild
+++ b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
@@ -1,32 +1,31 @@
-# Copyright 1999-2010 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.0.ebuild,v 1.3 2010/12/11 22:34:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild,v 1.1 2012/01/05 22:15:01 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2 eutils
 
 DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="http://www.gnome.org/"
+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="branding doc esd"
+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
@@ -38,9 +37,10 @@ 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"
 }
 
@@ -51,6 +51,12 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.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() {
@@ -58,9 +64,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
 }