commit: 7bf2a4bfcce99a266676debaae489da6cea426e5
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 00:33:11 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 00:33:11 2015 +0000
URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=7bf2a4bf
Cycle make.conf correctly to bring build steps in line with
desktop-amd64-uclibc-hardened.
core/etc/portage/make.conf.CYCLE.1 | 5 -----
core/etc/portage/make.conf.CYCLE.2 | 3 +++
core/etc/portage/{make.conf.CYCLE.2 => make.conf.CYCLE.3} | 0
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/core/etc/portage/make.conf.CYCLE.1
b/core/etc/portage/make.conf.CYCLE.1
index cf316a2..35b4f44 100644
--- a/core/etc/portage/make.conf.CYCLE.1
+++ b/core/etc/portage/make.conf.CYCLE.1
@@ -3,8 +3,3 @@ CXXFLAGS="${CFLAGS}"
CHOST="x86_64-pc-linux-gnu"
MAKEOPTS="-j17"
PAX_MARKINGS="XT"
-
-LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be
be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia
ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR
dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY
es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE
eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl
gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia
id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR
kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml
ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL
nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR
pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU
shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavi
an sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic
sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th
th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA
ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi
zh zh_CN zh_HK zh_TW zu"
-
-USE="-cups -tk"
-USE_ORDER="env:conf:pkg:defaults:pkginternal:repo:env.d"
diff --git a/core/etc/portage/make.conf.CYCLE.2
b/core/etc/portage/make.conf.CYCLE.2
index 3c2fd49..cf316a2 100644
--- a/core/etc/portage/make.conf.CYCLE.2
+++ b/core/etc/portage/make.conf.CYCLE.2
@@ -5,3 +5,6 @@ MAKEOPTS="-j17"
PAX_MARKINGS="XT"
LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be
be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia
ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR
dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY
es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE
eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl
gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia
id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR
kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml
ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL
nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR
pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU
shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavi
an sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic
sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th
th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA
ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi
zh zh_CN zh_HK zh_TW zu"
+
+USE="-cups -tk"
+USE_ORDER="env:conf:pkg:defaults:pkginternal:repo:env.d"
diff --git a/core/etc/portage/make.conf.CYCLE.2
b/core/etc/portage/make.conf.CYCLE.3
similarity index 100%
copy from core/etc/portage/make.conf.CYCLE.2
copy to core/etc/portage/make.conf.CYCLE.3
