Version bump for Cinnamon 2.4, bug #529876.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)

2 files changed, 18 insertions, 13 deletions

diff --git a/gnome-extra/cinnamon-translations/ChangeLog b/gnome-extra/cinnamon-translations/ChangeLog
index 77f6a7013bab..0f5d623616d2 100644
--- a/gnome-extra/cinnamon-translations/ChangeLog
+++ b/gnome-extra/cinnamon-translations/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/cinnamon-translations
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/ChangeLog,v 1.7 2014/12/19 13:37:56 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/ChangeLog,v 1.8 2015/01/11 16:58:35 eva Exp $
+
+*cinnamon-translations-2.4.2 (11 Jan 2015)
+
+  11 Jan 2015; Gilles Dartiguelongue <eva@gentoo.org>
+  -cinnamon-translations-2.2.3.ebuild, +cinnamon-translations-2.4.2.ebuild:
+  Version bump for Cinnamon 2.4, bug #529876.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org>
   cinnamon-translations-2.2.4.ebuild:
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.2.ebuild
index c335aee421ad..06de269bbbdc 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/cinnamon-translations-2.2.3.ebuild,v 1.3 2014/07/23 15:17:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.2.ebuild,v 1.1 2015/01/11 16:58:35 eva Exp $
 
 EAPI=5
 
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en_AU en_CA en_GB en@shaw eo es es_AR et eu fa fi fil fo fr fr_CA ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en_AU en_CA en_GB en@shaw eo es es_AR et eu fa fi fil fo fr fr_CA ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
 
 inherit eutils l10n
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -22,20 +22,19 @@ RDEPEND=""
 RESTRICT="test" # tests are for upstream translators and need network access
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/mo-export" "" ""
 	epatch_user
 }
 
 src_configure() { :; }
 
-src_compile() { :; }
-
 src_install() {
+	# Cannot run before since locales are not in the expected place for this to work
+	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+
 	install_locale() {
-		# Cinnamon components use LOCALEDIR=$datadir/cinnamon/locale
-		dodir "/usr/share/cinnamon/locale"
-		insinto "/usr/share/cinnamon/locale"
-		doins -r "mo-export/${1}"
+		dodir /usr/share/locale
+		insinto /usr/share/locale
+		doins -r usr/share/locale/${1}
 	}
 	l10n_for_each_locale_do install_locale
 }