Renamed the ru patch from $P to $PN and added it to emerald-0.8.2 since it's still required.

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

5 files changed, 18 insertions, 8 deletions

diff --git a/x11-wm/emerald/ChangeLog b/x11-wm/emerald/ChangeLog
index e41f72e4ec71..0ec49037a016 100644
--- a/x11-wm/emerald/ChangeLog
+++ b/x11-wm/emerald/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/emerald
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.23 2009/04/04 13:30:45 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/ChangeLog,v 1.24 2009/04/07 18:16:25 jmbsvicetto Exp $
+
+  07 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -files/emerald-0.7.8-ru.po.patch, +files/emerald-ru.po.patch,
+  emerald-0.7.8.ebuild, emerald-0.8.2.ebuild:
+  Renamed the ru patch from to and added it to emerald-0.8.2 since it's
+  still required.
 
   04 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   emerald-0.8.2.ebuild:
diff --git a/x11-wm/emerald/Manifest b/x11-wm/emerald/Manifest
index b8bbbff1eb02..840a4d9bd92f 100644
--- a/x11-wm/emerald/Manifest
+++ b/x11-wm/emerald/Manifest
@@ -1,9 +1,9 @@
-AUX emerald-0.7.8-ru.po.patch 1249 RMD160 aa828c7708a374a2a485e9be6eb69240447da6b4 SHA1 0563de3159e536989d289300c1ada9b86727ccd2 SHA256 6f2d9cf0c5ce840cecb8cdaecf11736fb1468c8025fc513f2e38bb1de8c97ac0
+AUX emerald-ru.po.patch 1249 RMD160 aa828c7708a374a2a485e9be6eb69240447da6b4 SHA1 0563de3159e536989d289300c1ada9b86727ccd2 SHA256 6f2d9cf0c5ce840cecb8cdaecf11736fb1468c8025fc513f2e38bb1de8c97ac0
 DIST emerald-0.5.2.tar.bz2 521776 RMD160 31449885afa9b1b667d1df24c3408be478080b1a SHA1 deefc2e92ea8581588e74194fbb2727a83ef9c64 SHA256 540cf76f70f8a08c19e5407d9e686d7a90fc2f8d3fa44be716a5fd8337ff6fd9
 DIST emerald-0.7.8.tar.bz2 516307 RMD160 1a29f931a49172d28cace9886cd25d48616cd63d SHA1 ca42f3699ba87930bfc1a067b10c24aaf56b412e SHA256 5e7a52cd2a019fb20a6a2c2b89c9b648798788babb95b7b5c33537a7a449e94f
 DIST emerald-0.8.2.tar.bz2 524512 RMD160 03abecd6f146e549ef08f9d41d4204adc3879a02 SHA1 07df4dbd93cd6007c0efc310a6ece673f051640c SHA256 1b17308fe1708a3d1a5d2b379ec8fe1c3d8bfd3fd87cffdcc4a0298e27e50f39
 EBUILD emerald-0.5.2.ebuild 591 RMD160 66c3114d60a870b277f32a541cc1ebd482f5699f SHA1 a968a5907d96a85e874f7e6c0b45008ebf7696d6 SHA256 7bd0d84234bdb794b7d321914cf7d70aed0be106e2104de980b3cc09e12cf17d
-EBUILD emerald-0.7.8.ebuild 913 RMD160 8df287438d01578d89a383144adf038fc655171c SHA1 63902292f6ec6054a3aba45a6d519fad1605da61 SHA256 8196dac6c45d0de2e85a117734648132ab64781a12967453ec63614ff8d4e373
-EBUILD emerald-0.8.2.ebuild 846 RMD160 4a00f92027beb79fde1814dd4a5159454db01e8c SHA1 dc96e266aefc29b2ed59bc743055c0f456d028f3 SHA256 e9c07f7995e33b6e717465a95ed6add339d400af1e3ca81fe4c50f1978fe15ee
-MISC ChangeLog 3454 RMD160 a73029b4e9068e002a1bdbc3c6453bca39ea9083 SHA1 0c9aed37c24fd5f73fe815d0d39922f408cec6b3 SHA256 43ab431b85e467d6fb1ecbff8915a313ec1c471d61a7c8589a613d9e7af9c691
+EBUILD emerald-0.7.8.ebuild 914 RMD160 920270f1573d8362e6b2dc1dd840a196d8e66dc5 SHA1 5ae712a8befb74bab9f9df51e16230284b0199b2 SHA256 92039ecff5897fb4b0cd9314f52a61b8d35afde1bf3c5208acdc69f832ce0513
+EBUILD emerald-0.8.2.ebuild 905 RMD160 56f318ad063d3cd43ae72e95b6a2d18033a7f99c SHA1 5661c06fdc0e0c095c802500149699e02c0d6ebd SHA256 ed20aa19946bc61353d9b22fe5d3aa98a82b5bdd087bfe96271ff879c30cebd5
+MISC ChangeLog 3722 RMD160 cae33bbc04fd1df88b2c7aa7196d53cfa342c146 SHA1 b349a2eaef66a324aab26ca02a2620b243228595 SHA256 0cb664421eb40aff2d40060e5cd468f9afe5915dbc06af461bfc9a5c53f1a717
 MISC metadata.xml 294 RMD160 4e679fcbec940438f4c6918c047a4703a9edf7f7 SHA1 a10877882be8eb3e6b2cde8df9aad51f39ecd4a4 SHA256 3f2e1d5e049bf839f1dce07e7680ebf64c7e7713c0dadd799c9b7e49b701a98e
diff --git a/x11-wm/emerald/emerald-0.7.8.ebuild b/x11-wm/emerald/emerald-0.7.8.ebuild
index 63ebdc86f67b..3e0b94b8724c 100644
--- a/x11-wm/emerald/emerald-0.7.8.ebuild
+++ b/x11-wm/emerald/emerald-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.7.8.ebuild,v 1.4 2009/01/22 01:56:18 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.7.8.ebuild,v 1.5 2009/04/07 18:16:25 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.15"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-ru.po.patch"
+	epatch "${FILESDIR}/${PN}-ru.po.patch"
 }
 
 src_configure() {
diff --git a/x11-wm/emerald/emerald-0.8.2.ebuild b/x11-wm/emerald/emerald-0.8.2.ebuild
index 83368d73aaa9..73f57a25c376 100644
--- a/x11-wm/emerald/emerald-0.8.2.ebuild
+++ b/x11-wm/emerald/emerald-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.2.ebuild,v 1.2 2009/04/04 13:30:45 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/emerald/emerald-0.8.2.ebuild,v 1.3 2009/04/07 18:16:25 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.19
 	>=sys-devel/gettext-0.15"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-ru.po.patch"
+}
+
 src_configure() {
 	econf --disable-mime-update || die "econf failed"
 }
diff --git a/x11-wm/emerald/files/emerald-0.7.8-ru.po.patch b/x11-wm/emerald/files/emerald-ru.po.patch
index ee007b10d295..ee007b10d295 100644
--- a/x11-wm/emerald/files/emerald-0.7.8-ru.po.patch
+++ b/x11-wm/emerald/files/emerald-ru.po.patch