New version for GNOME 2.26. Code cleanup and translation updates. Branding patch by dang. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 79 insertions, 70 deletions

diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog
index 23dc226b4c5e..a2ced199252d 100644
--- a/gnome-base/libgnome/ChangeLog
+++ b/gnome-base/libgnome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/libgnome
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.174 2009/04/28 14:35:37 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.175 2009/05/10 18:34:54 eva Exp $
+
+*libgnome-2.26.0 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgnome-2.20.1.1.ebuild, -libgnome-2.22.0.ebuild,
+  +libgnome-2.26.0.ebuild, +files/libgnome-2.26.0-branding.patch:
+  New version for GNOME 2.26. Code cleanup and translation updates. Branding
+  patch by dang. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> libgnome-2.24.1.ebuild:
   sh stable
diff --git a/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch b/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch
new file mode 100644
index 000000000000..2cab351e6b23
--- /dev/null
+++ b/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in
+--- libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in	2009-03-17 10:42:05.000000000 -0400
++++ libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in	2009-04-24 14:57:59.000000000 -0400
+@@ -29,7 +29,7 @@
+         <applyto>/desktop/gnome/background/picture_filename</applyto>
+         <owner>gnome</owner>
+         <type>string</type>
+-	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
++	<default>@datadir@/pixmaps/backgrounds/gnome/gentoo/gentoo-emergence.png</default>
+         <locale name="C">
+         <short>Picture Filename</short>
+         <long>File to use for the background image.</long>
diff --git a/gnome-base/libgnome/libgnome-2.20.1.1.ebuild b/gnome-base/libgnome/libgnome-2.20.1.1.ebuild
deleted file mode 100644
index b9609b1cddd6..000000000000
--- a/gnome-base/libgnome/libgnome-2.20.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.20.1.1.ebuild,v 1.8 2008/04/20 01:35:59 vapier Exp $
-
-inherit gnome2
-
-DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc esd"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.8
-	>=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.35
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)"
-}
diff --git a/gnome-base/libgnome/libgnome-2.22.0.ebuild b/gnome-base/libgnome/libgnome-2.22.0.ebuild
deleted file mode 100644
index e12e19cb47f7..000000000000
--- a/gnome-base/libgnome/libgnome-2.22.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.22.0.ebuild,v 1.7 2008/11/13 19:07:54 ranger Exp $
-
-inherit gnome2
-
-DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc esd"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.8
-	>=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.35
-	>=dev-util/pkgconfig-0.17
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)"
-}
diff --git a/gnome-base/libgnome/libgnome-2.26.0.ebuild b/gnome-base/libgnome/libgnome-2.26.0.ebuild
new file mode 100644
index 000000000000..26d7ca041160
--- /dev/null
+++ b/gnome-base/libgnome/libgnome-2.26.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.26.0.ebuild,v 1.1 2009/05/10 18:34:54 eva Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils
+
+DESCRIPTION="Essential Gnome Libraries"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+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/gvfs
+	>=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 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	use branding && epatch "${FILESDIR}"/${P}-branding.patch
+}
+
+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
+}