Fix locale installation. Add GCONF_DEBUG, bug #268746.

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

4 files changed, 21 insertions, 34 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index 532acd3c3cba..ab76f8ee6798 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/gtk-engines
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.143 2009/05/18 21:30:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.144 2009/08/08 23:13:27 eva Exp $
+
+  08 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gtk-engines-2.18.1.ebuild, gtk-engines-2.18.2.ebuild:
+  Fix locale installation. Add GCONF_DEBUG, bug #268746.
 
 *gtk-engines-2.18.2 (18 May 2009)
 
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index ba04cef8a5a8..dfcbfbe02db9 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST gtk-engines-2.16.1.tar.bz2 588253 RMD160 72d84e5a4d1e32345a40249ead9579d3ee73badb SHA1 d2d3ba7377b72a54cee99cbc546e19b3fc508b41 SHA256 5ce5bd23df9c26444c92d415935622d5f1f7c1c9669ec5165607de05125dc2c1
-DIST gtk-engines-2.18.1.tar.bz2 608460 RMD160 a65e6f1e273fa8f47e8a0ab2c8cf416b8cda12e4 SHA1 81d66e73b4c7126405b142ca349a167605403519 SHA256 d7e2672fcf80f5c35d481c24e0ab5b7d0f6526dcc3d8821ab76468c1816dc3bc
 DIST gtk-engines-2.18.2.tar.bz2 663756 RMD160 014364d551fbc094dcd8fc30ad91a63b7b8255e5 SHA1 6f1fd455b28e8de6156a7d17fb012cf510bbabd3 SHA256 3e43b76e7af008fa0ab5d17f83ec7a98ff39637f0c2c34e51fc9503a633cdd1a
 EBUILD gtk-engines-2.16.1.ebuild 715 RMD160 6b84ee59d056edc716bbe9dc30577a17f0389041 SHA1 c3ecd3238725e4c6275e585c0141db1ba4c5e763 SHA256 d2431df4fbe9768012b07b63e194a223f169315a67bf009b07f432710eee7662
-EBUILD gtk-engines-2.18.1.ebuild 724 RMD160 e9059324f5c3e5369ed52b8119a5dac061b7aff4 SHA1 cd682557848c4b7ee3bd232606ffd5dcc84867e2 SHA256 2faa24dfb98b0938f7d15269bd9744984b041ae8fd70bf01330c5cdbb7a295db
-EBUILD gtk-engines-2.18.2.ebuild 724 RMD160 05966660148e265462d58d0c12034b8ecc3afbc9 SHA1 01b0adaeb8ac691a022411bde8301f7c0141da43 SHA256 ebacdd7730bd5cd96b41d76c74b6f8e5f5b6976bae070c66b549585ab010e83b
-MISC ChangeLog 18312 RMD160 6e2ca1be37381833d8a7d552c2698b53438ff3a6 SHA1 5b03f65019772facf2532d0cbd7a8414e174e7dc SHA256 5f4b2b20a40e33507eb7b03069971efb54cabddd4810c8a2d4bf616ed8864c37
+EBUILD gtk-engines-2.18.2.ebuild 928 RMD160 960db624c016e6b1af583db59380c496443ac6a7 SHA1 54a0e2d2d402f5e3e941e1f09ed48ecac3965e41 SHA256 5297e3dc4e689be164b61ecae1bb88cae3dae0c360e3a9a1e932dcb96a1a0c6d
+MISC ChangeLog 18481 RMD160 6c12d3f772517d66518bf9fd4a3eda687e8a367b SHA1 21b3be9196efa9d3d4f8f0cfc52c74a3d8025eff SHA256 72e920a2ed92951852777679c9684d24205735b8be1d941a76517bd13dad2563
 MISC metadata.xml 568 RMD160 55afc3bd5e963a38ca159fe1855fb86c1d205ed1 SHA1 fefe96510715292236a409394ac78e1b092043bc SHA256 cfae48dc83100358d4370ba22eaa6284c74288b749e2f34525358e3627fa8a89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoR030ACgkQ1fmVwcYIWAYRSQCgyVP6HzZknJHAs5aoB2x/NDHj
-Pr0AoNgcI2j5AU/ZgYNcLYdFxDQCUgEj
-=y0wF
+iEYEARECAAYFAkp+BpwACgkQ1fmVwcYIWAZSbgCfX3cB/OGM7Fzh1PSo7xKPcyDg
+1lUAoIESARL9Ze4cU/UDV28YAO9fzovr
+=MMUD
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines/gtk-engines-2.18.1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.18.1.ebuild
deleted file mode 100644
index dd5fbc239bc8..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.18.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.1.ebuild,v 1.1 2009/05/03 22:44:01 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="GTK+2 standard engines and themes"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility"
-
-RDEPEND=">=x11-libs/gtk+-2.12"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.31
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-animation --enable-lua"
-	use accessibility || G2CONF="${G2CONF} --disable-hc"
-}
diff --git a/x11-themes/gtk-engines/gtk-engines-2.18.2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.18.2.ebuild
index 1ccc845c6ab0..89d31c502692 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.18.2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.18.2.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2.ebuild,v 1.1 2009/05/18 21:30:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2.ebuild,v 1.2 2009/08/08 23:13:27 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
 
 inherit gnome2
 
@@ -23,3 +26,10 @@ pkg_setup() {
 	G2CONF="${G2CONF} --enable-animation --enable-lua"
 	use accessibility || G2CONF="${G2CONF} --disable-hc"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}