Fix EROOT vs EPREFIX error.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 811ba2a922267574332ec494eb74c734c5ed9311..d7991625e29eb1333b110268b3a1a3bb3c2e3e05 100644 (file)
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.1 2012/01/10 05:49:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.2 2012/01/10 05:53:59 tetromino Exp $
+
+  10 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  cinnamon-1.1.3.ebuild:
+  Fix EROOT vs EPREFIX error.
 
 *cinnamon-1.1.3 (10 Jan 2012)
 

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e4c4e7d77dc34dc7ffdb6ab54f7b2b1211768a0c..3f22cac8feb75fc01c7ebea65eabd1642ec61f73 100644 (file)
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -6,13 +6,13 @@ AUX cinnamon-1.1.3-extensionjs_path.patch 1136 RMD160 8fea3328501f749dcd9e1459b9
 AUX cinnamon-1.1.3-xdg-open.patch 944 RMD160 68cc5eda9affdd83b49b25e09c8bf25ba0ef1621 SHA1 772a75130d50acc66d7bd252e857dc3ffce724ae SHA256 87ec3b57829107e1d3cb56cd75bf3d1125c71193a14087296bfce3f18780b7d5
 DIST cinnamon-1.1.3.tar.gz 2273742 RMD160 37f6cc48c6c46c69c8da16c647af3675ee3c0347 SHA1 fa563ab939d3cc47ab4833f611bfb2904ca32257 SHA256 dc349c4d924503468a34f61513c768d83aaef685811ec388f2ee826e195ff65c
 DIST cinnamon-session_1.0.0_all.deb 1634 RMD160 3420dd6144fe184cd0b049f9a7dc0b033b3cdb5a SHA1 f963e4473dbdb28964357f742119cf1c87c3361f SHA256 720e07da6f3163346db9d01fff1b8771aaf145c2d406a4e88435826a38de0134
-EBUILD cinnamon-1.1.3.ebuild 6843 RMD160 7d1fc0726e94420c345b2589db51dbb1c4f30d43 SHA1 f1fc4e514b2e87902829f410dbe94c41d842fd75 SHA256 084a41438c534bf1c32f137e294f977787708fc083fd49dcfff6976afc52172d
-MISC ChangeLog 558 RMD160 b4b6c14db1c655223fe27a8876396811d7ef8fa3 SHA1 3e4409452d150a8de90b24ff06c234e82e711d5a SHA256 7f17a8b17392a1ec7a6e2d706d3347d1e910d3c9df62c408e19ffc5a27eca92d
+EBUILD cinnamon-1.1.3.ebuild 6846 RMD160 fb2e31f780a44a9779d6dee4f35153e84396a422 SHA1 07053855f3798253d0f0d0ad55e791956b85b655 SHA256 e5e5b3a7fe436d5e0758606ca35a5ccf44b80492b9e854f1b58c0bce61f0b9c2
+MISC ChangeLog 673 RMD160 57397bdbfa69082efbb4eb841cf6644901f1865e SHA1 311246863ea0008d70c3a0988edc31d875046635 SHA256 7396e3122f426107912bbe2c26c33c60f9e61165ee30812f833480b9e7177a20
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8L0VUACgkQdjK8w9WeBnAwKwD/YT2AEj7NTXUqvH/spzfviT3A
-osEUHgxFgbqOYFNVa1QBAK8mrL21isqXcT0KRtR8+/qZYjZHth6ufkFGSSeqzgjM
-=vS43
+iF4EAREIAAYFAk8L0n0ACgkQdjK8w9WeBnCGHQD/YZi68lBkZTKufMYLhvA/kQvL
+IpB3grYkrV+rOLHw+04A/A5ZGYjXq2++FvCelb6YIwmzEZM6J2+Lt28T7w4Jb8m8
+=0u49
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild b/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild
index cfea4c4b6588fb3f72c4d1c7baca680aedecd67d..a4860969b7d85bfb7d11ecc3c8b6bd86d50f12a7 100644 (file)
--- a/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild,v 1.1 2012/01/10 05:49:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.1.3.ebuild,v 1.2 2012/01/10 05:53:59 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -130,7 +130,7 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-1.1.3-xdg-open.patch"
 
        # Gentoo uses /usr/libexec
-       sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EROOT}usr/libexec/gnome-session-check-accelerated:" \
+       sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \
                -i "${WORKDIR}/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 1 failed"
 
        eautoreconf