| 1 |
commit: 7b08b93c96d3b33bf92dddb65ff8b3b07b3c46de |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 4 21:51:56 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 4 21:51:56 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=7b08b93c |
| 7 |
|
| 8 |
Restore python3.4 because of app-portage/grs. |
| 9 |
|
| 10 |
core/etc/grs/world.conf | 2 +- |
| 11 |
core/etc/portage/make.conf.CYCLE.1 | 1 + |
| 12 |
core/etc/portage/make.conf.CYCLE.2 | 1 + |
| 13 |
scripts/cycle.1.sh | 2 ++ |
| 14 |
4 files changed, 5 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf |
| 17 |
index c37b166..63df540 100644 |
| 18 |
--- a/core/etc/grs/world.conf |
| 19 |
+++ b/core/etc/grs/world.conf |
| 20 |
@@ -6284,7 +6284,7 @@ package.use/net-irc_shadowircd_0 : net-irc/shadowircd:0 -debug -largenet ipv6 ss |
| 21 |
package.use/net-irc_weechat_0 : net-irc/weechat:0 -doc -nls -test alias charset exec fifo guile irc logger lua perl python relay ruby scripts spell ssl tcl trigger xfer |
| 22 |
|
| 23 |
[net-irc/znc:0] |
| 24 |
-package.use/net-irc_znc_0 : net-irc/znc:0 -daemon -debug ipv6 perl python sasl ssl tcl |
| 25 |
+package.use/net-irc_znc_0 : net-irc/znc:0 -daemon -debug ipv6 perl python sasl ssl tcl python_targets_python3_3 |
| 26 |
|
| 27 |
[net-libs/daq:0] |
| 28 |
package.use/net-libs_daq_0 : net-libs/daq:0 -ipq -nfq afpacket dump ipv6 pcap static-libs |
| 29 |
|
| 30 |
diff --git a/core/etc/portage/make.conf.CYCLE.1 b/core/etc/portage/make.conf.CYCLE.1 |
| 31 |
index b403319..2706b1e 100644 |
| 32 |
--- a/core/etc/portage/make.conf.CYCLE.1 |
| 33 |
+++ b/core/etc/portage/make.conf.CYCLE.1 |
| 34 |
@@ -3,6 +3,7 @@ CXXFLAGS="${CFLAGS}" |
| 35 |
CHOST="x86_64-gentoo-linux-uclibc" |
| 36 |
MAKEOPTS="-j17" |
| 37 |
PAX_MARKINGS="XT" |
| 38 |
+PYTHON_TARGETS="python2_7 python3_4" |
| 39 |
|
| 40 |
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 |
| 41 |
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" |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/core/etc/portage/make.conf.CYCLE.2 b/core/etc/portage/make.conf.CYCLE.2 |
| 45 |
index 74720a7..844a47f 100644 |
| 46 |
--- a/core/etc/portage/make.conf.CYCLE.2 |
| 47 |
+++ b/core/etc/portage/make.conf.CYCLE.2 |
| 48 |
@@ -3,5 +3,6 @@ CXXFLAGS="${CFLAGS}" |
| 49 |
CHOST="x86_64-gentoo-linux-uclibc" |
| 50 |
MAKEOPTS="-j17" |
| 51 |
PAX_MARKINGS="XT" |
| 52 |
+PYTHON_TARGETS="python2_7 python3_4" |
| 53 |
|
| 54 |
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 |
| 55 |
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" |
| 56 |
|
| 57 |
diff --git a/scripts/cycle.1.sh b/scripts/cycle.1.sh |
| 58 |
index d77df0d..37caa55 100644 |
| 59 |
--- a/scripts/cycle.1.sh |
| 60 |
+++ b/scripts/cycle.1.sh |
| 61 |
@@ -2,6 +2,8 @@ |
| 62 |
|
| 63 |
source /etc/profile |
| 64 |
env-update |
| 65 |
+emerge -b1q portage |
| 66 |
+emerge -b1q =app-portage/grs-9999 |
| 67 |
install-worldconf |
| 68 |
emerge -bevq --keep-going --with-bdeps=y @world |
| 69 |
clean-worldconf |
Archives