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

6 files changed, 86 insertions, 77 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
+}
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index 9a446757f138..ec505e7b3625 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST libgnomecanvas-2.14.0.tar.bz2 612330 RMD160 5d511f65c8860032e2b88bf11bd997920ba6ba7b SHA1 9a3fe0cfaa6361f67b3b5ba86324bf8edb8724a0 SHA256 5ceadd704327c2967868b3c0c81b5e600e1c6fd4f8efcbaaf89f9b18aa8bb5cf
 DIST libgnomecanvas-2.20.1.1.tar.bz2 583565 RMD160 fe5333c31f385313b2e90deb9710275d61bbc15b SHA1 302a4762b658244828ad1c9f291ffb972b8274c9 SHA256 70f906d52d98b7b45e95fd59ef10f06579b75ee9e70e67edabd30a4f6e5d6fe3
-EBUILD libgnomecanvas-2.14.0.ebuild 755 RMD160 396ee0386976e466bc9c1d4d3bed3587539dcd80 SHA1 a5854d58f2ebe2b7d5f9be41800ce27c01b41455 SHA256 a961827bd2dae6d0a6f96549dcef265a49b97a73ef6077cce5b48c8ef4a51001
+DIST libgnomecanvas-2.26.0.tar.bz2 600470 RMD160 87eb8f61b4ed8c3c3ede4941aeb8b539731d1d9f SHA1 d0429140c3ae8974562f4eb34e89d4f512e8e4ec SHA256 80b480acc33d7303f651e9c5bc8fea51c9e9a9ed59ebfdbbb730dd798bcbc58d
 EBUILD libgnomecanvas-2.20.1.1.ebuild 938 RMD160 54c4fd451be346a4bf873505aa99dba430a2e31b SHA1 d140e228e4eaf4b6ee3605d01adde829bea6f2dd SHA256 af30f0890412ffeb67c75c52753b4fa575a97fbfb3a634bef25063dc857544fe
-MISC ChangeLog 12962 RMD160 5fd04a23cd9d488497841f7f3f7e4f8b4eae356b SHA1 9a24a377122a2970e57ae8785cbec51f25370907 SHA256 fbf93b311afd71b5b269ba271624afead711bd34b5488be420c7b9f2f4806ccd
+EBUILD libgnomecanvas-2.26.0.ebuild 844 RMD160 23ec1bc01d22cfeac77af5755062e4a613994bf5 SHA1 b956780bb122fa6c6d61093787d258083be8b22f SHA256 13cbd20af655e873b23c1856f700778e217ca95c5d1eac8d88c29dc464a9ec8e
+MISC ChangeLog 13195 RMD160 e60deefaa458489bad53213f396acc685b81fd2d SHA1 a89348751d13e9ef8499b710359c78f67e88870c SHA256 cb58cfda0d81cfc81eb697efed671ee630a7d8eda9343ec49e20e0b88285ac08
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkgicywACgkQiqiDRvmkBmIRygCgo1b5xBt6wvy6/9TBgcQqD3NV
-ZR0An3OgE5Bg8EMmeET2cfAiqTpmvGfg
-=XSu7
+iEYEARECAAYFAkoHH1kACgkQ1fmVwcYIWAbGlACgqhDTS6RTWdzXu80i8Dq5yhRr
+YrAAn2unlQu2RGqHyTTx4rcmr39YLT+z
+=zkry
 -----END PGP SIGNATURE-----