Removed most translations

doc/changelog.txt

@@ -24,6 +24,7 @@
   * Replaced XChat with HexChat
   * Removed experimental I2P support and JamVM
   * Removed many packages due to shift of project focus
+  * Removed most translations due to shift of project focus
 
   * OVA image creation is fully integrated into build process
   * Removed qemulate.sh script

src/etc/locale.gen

@@ -0,0 +1,15 @@
+# Format of each line: <locale> <charmap>
+# <locale> is a locale in /usr/share/i18n/locales/
+# <charmap> is a charmap in /usr/share/i18n/charmaps/
+#
+# Supported combinations: /usr/share/i18n/SUPPORTED
+# "locale-gen" rebuilds the locales into /usr/lib/locale/locale-archive
+
+en_GB.UTF-8 UTF-8
+en_US.UTF-8 UTF-8
+en_CA.UTF-8 UTF-8
+en_AU.UTF-8 UTF-8
+en_NZ.UTF-8 UTF-8
+
+ru_RU.UTF-8 UTF-8
+ru_UA.UTF-8 UTF-8

src/etc/portage/make.conf

@@ -49,7 +49,8 @@ VIDEO_CARDS="${VIDEO_CARDS} modesetting nouveau virtualbox qxl"
 # Middle-eastern: Arabic, Hebrew
 # African:        Amharic
 # LINGUAS="en en_GB fr de es eu pt it ru uk hi pa kn gu bn te ta si ml zh ja ko th vi ne ar he am"
-LINGUAS="*"
+# (see also: /etc/locale.gen, /root/config/rootfs.includes, /root/helpers/gen-locale-menu)
+LINGUAS="en ru"
 
 # GRUB EFI
 GRUB_PLATFORMS="efi-32 efi-64"

src/etc/portage/package.use/all

@@ -100,5 +100,4 @@ net-wireless/wpa_supplicant     ap p2p
 
 # Internationalization
 app-i18n/uim                    -linguas_*
-app-text/hunspell               -linguas_* linguas_en linguas_ru
 media-fonts/terminus-font       quote ru-dv ru-i

src/root/config/rootfs-cp.excludes

@@ -18,7 +18,7 @@
 /usr/share/info/**
 /usr/share/doc/**
 /usr/share/gtk-doc/**
-/usr/share/gnome/help/**
+/usr/share/help/**
 /usr/share/sgml/docbook/xsl-stylesheets/
 
 # Pruned directories

src/root/config/rootfs.excludes

@@ -7,8 +7,6 @@
 /usr/share/help/
 /usr/share/gtk-doc/
 # (no gnome-extra/yelp with "-gnome")
-/usr/share/gnome/
-/usr/share/gdm/
 
 # Portage directories
 /usr/portage/
@@ -68,7 +66,7 @@
 /usr/share/consoletrans/
 /usr/share/unimaps/
 /usr/share/keymaps/**
-/usr/share/X11/locale/*/
+/usr/share**/locale/*/
 /usr/share/fc-lang/
 /usr/share/mime/packages/
 /usr/share/themes/*/**

src/root/config/rootfs.includes

@@ -21,8 +21,9 @@
 /usr/share/keymaps/include/***
 /usr/share/keymaps/i386/***
 /usr/share/keymaps/mac/***
-/usr/share/X11/locale/C/***
-/usr/share/X11/locale/*.UTF-8/***
+/usr/share**/locale/C/***
+/usr/share**/locale/en*/***
+/usr/share**/locale/ru*/***
 /usr/share/themes/*/index.theme
 /usr/share/themes/*/gtk-*/***
 /usr/share/themes/*/openbox-*/***

src/root/setup

@@ -13,19 +13,6 @@ patch_ebuild() {
     ebuild `awk '{print $2; exit}' "$1"` manifest
 }
 
-rebuild_locales() {
-    grep UTF-8 /usr/share/i18n/SUPPORTED > /etc/locale.gen.new
-    # (#517400), http://comments.gmane.org/gmane.comp.lib.glibc.alpha/31543
-    sed -i '/^bo_/d' /etc/locale.gen.new
-    if cmp -s /etc/locale.gen{.new,}; then
-        rm /etc/locale.gen.new
-    else
-        sinfo "Rebuilding locales"
-        mv /etc/locale.gen{.new,}
-        locale-gen -q
-    fi
-}
-
 
 # Sanity check
 if [ ${PHASE} != src ]; then
@@ -85,11 +72,6 @@ if [ "$1" = fresh  -o  ! -e /usr/src/linux-${kversion}/incremental ]; then
     ${helpdir}/hlp-patch ${HOME}/patches/kernel/overlayfs.v22.patch  -d /usr/src/linux-${kversion} -p1
 
 
-    # Filter locales before remerging libc
-    sinfo "Filtering locales"
-    grep UTF-8 /usr/share/i18n/SUPPORTED > /etc/locale.gen
-
-
     # Some news are delayed until first emerge
     eselect news read all
     eselect news purge
@@ -136,8 +118,6 @@ if [ "$1" = fresh  -o  ! -e /usr/src/linux-${kversion}/incremental ]; then
     sinfo "Rebuilding packages that use old libraries"
     emerge -q @preserved-rebuild
 
-    rebuild_locales
-
     # Also rebuild hardened-sources dependencies (#461848)
     emerge -q sys-devel/bc
 
@@ -225,7 +205,6 @@ revdep-rebuild -qi
 
 rm -f ${protected}
 etc-update
-rebuild_locales
 
 
 sinfo "Listing GLSAs"
@@ -414,7 +393,7 @@ done
 
 
 sinfo "Disabling PaX markings"
-Not necessary for any plugins
+# Not necessary for any plugins
 paxctl-ng -d /usr/lib/firefox/plugin-container