Fixing errors with languages

Package-Manager: portage-2.1.1-r2

3 files changed, 30 insertions, 17 deletions

diff --git a/x11-wm/emerald/ChangeLog b/x11-wm/emerald/ChangeLog
index a01bb95dc8aa..030a5119c7aa 100644
--- a/x11-wm/emerald/ChangeLog
+++ b/x11-wm/emerald/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/emerald
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.6 2006/12/28 19:59:31 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.7 2006/12/29 01:05:57 tsunam Exp $
+
+  29 Dec 2006; Joshua Jackson <tsunam@gentoo.org> emerald-0.1.4.ebuild:
+  fix for languages causing failures, bug #159412
 
 *emerald-0.1.4 (28 Dec 2006)
 
diff --git a/x11-wm/emerald/Manifest b/x11-wm/emerald/Manifest
index 439a69b41a4a..82d41cd7dbd9 100644
--- a/x11-wm/emerald/Manifest
+++ b/x11-wm/emerald/Manifest
@@ -7,14 +7,14 @@ EBUILD emerald-0.1.3.ebuild 632 RMD160 88f647d6e83d95e2d228062dc468a3c801d9d3bd
 MD5 7cec8fa3dddded28cc8c07c7ae294fab emerald-0.1.3.ebuild 632
 RMD160 88f647d6e83d95e2d228062dc468a3c801d9d3bd emerald-0.1.3.ebuild 632
 SHA256 fa5611d9000dd6831573b4a82b8ebe60682a5752676ef132070a074c107528d3 emerald-0.1.3.ebuild 632
-EBUILD emerald-0.1.4.ebuild 631 RMD160 f6e48b47f1ba6886d3a5e1efb6833b85e3fe17a1 SHA1 a60b6d9da1ae971cc401a52e342ef8584a63bc1c SHA256 c3462911fbd50dd226bcda28c7581e01a91f2bf4cd93ad9c8c4185980cb8f903
-MD5 16314685f74cbb3b54bd80c99aafda1b emerald-0.1.4.ebuild 631
-RMD160 f6e48b47f1ba6886d3a5e1efb6833b85e3fe17a1 emerald-0.1.4.ebuild 631
-SHA256 c3462911fbd50dd226bcda28c7581e01a91f2bf4cd93ad9c8c4185980cb8f903 emerald-0.1.4.ebuild 631
-MISC ChangeLog 1100 RMD160 0e2bda1a77f923fc0215f8fc256af40a032c0bf7 SHA1 dfed6993f40a55575da036d1ea8a3e031ef14f8b SHA256 dcae381f6af27f5cca5bec7ce7376e7626a67dc326d9b51142afa823494925dc
-MD5 ae6c046b44be9c6d8a854ac59ecaa6f9 ChangeLog 1100
-RMD160 0e2bda1a77f923fc0215f8fc256af40a032c0bf7 ChangeLog 1100
-SHA256 dcae381f6af27f5cca5bec7ce7376e7626a67dc326d9b51142afa823494925dc ChangeLog 1100
+EBUILD emerald-0.1.4.ebuild 857 RMD160 76b56e330061d2a206929f37db6980e1c19776a6 SHA1 4082ecc226c03b163f95594b4752b8f4ca252835 SHA256 947269b4ff68d4ab8bca4e085122ac853dfc8df4c68e6bdf4b2a6651c6d5f378
+MD5 7481cc4020250ad1b37f80146d43e119 emerald-0.1.4.ebuild 857
+RMD160 76b56e330061d2a206929f37db6980e1c19776a6 emerald-0.1.4.ebuild 857
+SHA256 947269b4ff68d4ab8bca4e085122ac853dfc8df4c68e6bdf4b2a6651c6d5f378 emerald-0.1.4.ebuild 857
+MISC ChangeLog 1223 RMD160 517d6b6f285fb2f744b991cfa8713df0922dad0f SHA1 95dbfd5141339d8f8d7c6f5898434206f60ed8fa SHA256 100a449f8e6966fe99411e69197153284b3d6a85fcf721a90e49ea1b6a9f55db
+MD5 eb6cdadb3eddff7f532dbf1922d323f9 ChangeLog 1223
+RMD160 517d6b6f285fb2f744b991cfa8713df0922dad0f ChangeLog 1223
+SHA256 100a449f8e6966fe99411e69197153284b3d6a85fcf721a90e49ea1b6a9f55db ChangeLog 1223
 MISC metadata.xml 434 RMD160 1b84006949daa403ed95b6470d8002450da7c13a SHA1 c57eefbd5a0b1beaf4af6d589371368df32d314a SHA256 cd82113dc1764ae8bb715ceac8b943f4c896adb7f4670060b4d6d9b94bb5a015
 MD5 308c7c1f3212baf6824ccc6db6534552 metadata.xml 434
 RMD160 1b84006949daa403ed95b6470d8002450da7c13a metadata.xml 434
@@ -28,7 +28,7 @@ SHA256 b0a00f933c4c25f09a81375199ce2ba7d2663bf658fd9acf2a373917a9d38dda files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFlCIs2ZWR0Jhg/EsRAp8SAJ4ts8uM42zBfcAFBeXm8Yj6YpVxPACcDejQ
-LgxpxAw9vAH3yCQ9vI8n/+I=
-=l8Ei
+iD8DBQFFlGn92ZWR0Jhg/EsRAtRDAJwJmEfQ4dN96hCqNQZzHfpYK0nDewCfbg8J
+LDHfTaBXnHO/OOK0tx3kijU=
+=ZNe3
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/emerald/emerald-0.1.4.ebuild b/x11-wm/emerald/emerald-0.1.4.ebuild
index f312a929d9fa..eb7e80866363 100644
--- a/x11-wm/emerald/emerald-0.1.4.ebuild
+++ b/x11-wm/emerald/emerald-0.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.1.4.ebuild,v 1.1 2006/12/28 19:59:32 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.1.4.ebuild,v 1.2 2006/12/29 01:05:57 tsunam Exp $
 
 inherit gnome2 
 
@@ -14,12 +14,22 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 PDEPEND="=x11-themes/emerald-themes-${PV}"
-
-DEPEND=">=x11-libs/gtk+-2.8.0
+RDEPEND="x11-libs/pango
+	>=x11-libs/gtk+-2.8.0
 	>=x11-libs/libwnck-2.14.2
+	>=x11-libs/libXrender-0.8.4
 	=x11-wm/beryl-core-${PV}"
 
+DEPEND="${RDEPENDS}
+	>=dev-util/pkgconfig-0.19
+	>=sys-devel/gettext-0.15
+	>=dev-util/intltool-0.35"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-mine-update"
+}
 
-src_compile() {
-	gnome2_src_compile --disable-mime-update
+src_unpack() {
+	gnome2_src_unpack
+	intltoolize --force || die "intltool failed"
 }