Fix translation installation when LINGUAS is set. Remove old

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.29-gentoo-r1 x86_64

5 files changed, 21 insertions, 62 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 5f72abd16ad7..4e42d5b8658e 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.238 2009/04/12 20:52:11 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.239 2009/04/22 03:30:15 leio Exp $
+
+*gnome-desktop-2.24.3-r1 (22 Apr 2009)
+
+  22 Apr 2009; Mart Raudsepp <leio@gentoo.org> gnome-desktop-2.20.3.ebuild,
+  -gnome-desktop-2.24.2.ebuild, -gnome-desktop-2.24.2-r1.ebuild,
+  +gnome-desktop-2.24.3-r1.ebuild:
+  Fix translation installation when LINGUAS is set. Remove old
 
   12 Apr 2009; Friedrich Oslage <bluebird@gentoo.org>
   gnome-desktop-2.24.3.ebuild:
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 1e015765596a..308f4848a1a3 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,12 +1,10 @@
 AUX gnome-desktop-2.24.2-background.patch 886 RMD160 032349d5797ce2333a961a214bf078138ab16010 SHA1 6e271f942e130cf1f5020d1d7ab9f64f81903fc0 SHA256 cbe72e1e9f8b4891cbbe321ab7f6e16ca98fbdf05a5c833dbf5dfb8135173457
 DIST gnome-desktop-2.20.3.tar.bz2 1362861 RMD160 4c01a18cad9dd4965abe1202bccc9bf414e04287 SHA1 6d88e63686acea78e0e64efa9f213271a7ddf32e SHA256 b793ce87b99ba2f9b0eb48a4646128f752a1de2e7c4cd94da9b5e9fd6dcbc36a
 DIST gnome-desktop-2.22.3.tar.bz2 1444103 RMD160 f1bbba787e3924df0fac25c56f3d70334097ad1f SHA1 89d7938a73735e6e2d1309f36d5a4be47eb41cca SHA256 10c087e16c530eb2d09c5794ba5c0d6d2ec6e548860e13f31b2f2375df964dc9
-DIST gnome-desktop-2.24.2.tar.bz2 1509817 RMD160 9ecbf60bbbb6eb1b03d55356d61da12d6a19abed SHA1 c52d4d26bef1353306cbe851ed9a7c659e22a71e SHA256 18148db9750e407507a776641f33e7b7f9a1888300618a89185a2831e3bbbdd2
 DIST gnome-desktop-2.24.3.tar.bz2 1509505 RMD160 b6489965a0baa6056b5c7826418401459ffbf0b9 SHA1 2ebbf2475bb741131b523819fb46e71d4489fa79 SHA256 03b1e08ee1318820f538864e8db492a245848bd727da1412a62de51d4cb76e89
-EBUILD gnome-desktop-2.20.3.ebuild 1291 RMD160 4149e458db6fb702ade8a144de5c44a0222841c3 SHA1 3998dbab52f9758dbb9ebe328c76e7a59e5eaa27 SHA256 8c5147d6bfa584232553daf672d61f6f0b7e4b68191ede1e8d705a4633ca2c92
+EBUILD gnome-desktop-2.20.3.ebuild 1286 RMD160 06b8836da57ea3cda1dd7d36b9f765205802a654 SHA1 64dab06c58c34e555c0b6519aa74092190c84996 SHA256 7be47396f85054896769be0c3b1261a556b99a8ab6a8cea0ce60c0cc345ceef0
 EBUILD gnome-desktop-2.22.3.ebuild 1279 RMD160 1bdc474affc9d48224a7c85a5bd4b3206b867f50 SHA1 a324c88207d17c1652b2f58fc3419ed07aec01e9 SHA256 fb67562f103ec402016dcc919c30567f97ad664701da3bf42219cb15efe40301
-EBUILD gnome-desktop-2.24.2-r1.ebuild 1761 RMD160 ba27e80652d8507c3943bbf2c601c3ffa7be7021 SHA1 bc53d432d591c16c236a4ab3049253fd56a3ee23 SHA256 a736ceb3062d771080d7f7e3e613bbbb80b650d6c7c20abb2f01e164cec65b4d
-EBUILD gnome-desktop-2.24.2.ebuild 1622 RMD160 c0cd033d49af949590a3ad1e7bb5f5ff4d0bec48 SHA1 468bee5a132b7441003c48d83453cd888080e119 SHA256 97c119833cc3c362f53a3e31f7b835d9bba13dbf93dc3ce8b8a1a391ec18c69b
+EBUILD gnome-desktop-2.24.3-r1.ebuild 1917 RMD160 9684b272dbbbba4d613949433dcdc4f5137d3aec SHA1 fd9b1a73680906036057e36117f41581c5406e1b SHA256 b9fb59efb6670b7eede2627f7edcbe944435a68e501da4b3abaab74152d1d502
 EBUILD gnome-desktop-2.24.3.ebuild 1764 RMD160 24ea741021cc825b1569e6a7a98f4d95719ed864 SHA1 14a0cb44ea046a7d02a8e5bd445c10c6636bc822 SHA256 a95e94dc7144ee9ce2cd53164bb9d3bd7d481c86ee8b0528915015e7f44803a9
-MISC ChangeLog 30198 RMD160 97d9f6ec5040ce65db9bc2ca0afcf1ad75972f13 SHA1 a444c93ad7704fa2a49b45f1b11af1426cf972af SHA256 c19fc2b0ea5191ee5b41a13cbedf771984272380a59674f80642ee4e4b5bf758
+MISC ChangeLog 30474 RMD160 a868a435f36fbc8cb254aab00ea335408dff0749 SHA1 4041ad943face2c30a55610eda728749db5cd0c0 SHA256 881dab93e73a8acf242c54611b070b6f3a23b63cf3c06deadbb61b217b798f19
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild
index fba13976d937..8cd0ee288a69 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild,v 1.10 2008/11/08 12:59:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.20.3.ebuild,v 1.11 2009/04/22 03:30:16 leio Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
-KEYWORDS="arm ppc64 sh"
+KEYWORDS="arm sh"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/libxml2-2.4.20
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.2.ebuild
deleted file mode 100644
index f7887204ff2f..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.24.2.ebuild
+++ /dev/null
@@ -1,50 +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/gnome-desktop/gnome-desktop-2.24.2.ebuild,v 1.3 2008/12/31 03:26:31 mr_bones_ Exp $
-
-inherit gnome2
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-# FIXME: Python deps are needed for gnome-about but not
-# listed in configure.ac
-RDEPEND=">=dev-libs/libxml2-2.4.20
-	>=x11-libs/gtk+-2.11.3
-	>=dev-libs/glib-2.15.4
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2.6
-	>=x11-libs/startup-notification-0.5
-	>=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.14
-	>=dev-python/libgnome-python-2.22"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.24, please"
-	ewarn "make sure you run revdep-rebuild at the end of the upgrade."
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild
index 664ab902f8bb..2f5cd1affa14 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.24.2-r1.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.24.2-r1.ebuild,v 1.1 2009/01/04 00:20:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.24.3-r1.ebuild,v 1.1 2009/04/22 03:30:16 leio Exp $
 
-inherit eutils gnome2
+inherit eutils autotools gnome2
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
 HOMEPAGE="http://www.gnome.org/"
@@ -47,7 +47,11 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Do not load background if not needed, bug #251350
-	epatch "${FILESDIR}/${P}-background.patch"
+	epatch "${FILESDIR}/${PN}-2.24.2-background.patch"
+
+	# Broken intltool-0.40.6 used for 2.24.3, re-intltoolize
+	intltoolize --force --automake --copy || die "intltoolize failed"
+	eautomake
 }
 
 pkg_postinst() {