Удалены проверки условий i686 из формирования world

4 years ago · 750ecfdca9
parent bc8752084d
commit 750ecfdca9
39 changed files with 7 additions and 200 deletions
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-crypt
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-crypt
@ -11,10 +11,6 @@
 !!kali-archive-keyring:0
 !!seahorse-sharing:0
 !!sign:0
-#?os_arch_machine==i686#
-# not compiled
-!!efitools:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB3)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-editors
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-editors
@ -1,12 +1,10 @@
 # Calculate name=world format=world

 #?in(os_linux_pkglist, CB1)!=#
-ee
-okteta
-#?os_arch_machine==x86_64#
 #atom
+ee
 kile
-#os_arch_machine#
+okteta
 #in#

 #?in(os_linux_pkglist, CB3)!=#
@ -19,11 +17,6 @@ kile
 # not compiled
 !!levee:0
 !!ng:0
-#?os_arch_machine==i686#
-# not compiled
-!!emacs:23
-!!texworks:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CBS)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-emulation
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-emulation
@ -15,12 +15,10 @@
 #in#

 #?in(os_linux_pkglist, CB3)!=#
-qemu-guest-agent
-#?os_arch_machine==x86_64#
 docker-compose
 docker-runc
+qemu-guest-agent
 virtualbox-bin
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB4)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-i18n
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-i18n
@ -7,8 +7,4 @@
 !!tomoe:0
 !!tomoe-gtk:0
 !!uim-tomoe-gtk:0
-#?os_arch_machine==i686#
-# not compiled
-!!multiskkserv:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-office
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-office
@ -20,10 +20,6 @@ skrooge
 !!libreoffice-bin-debug:0
 !!libreoffice-voikko:0
 !!openoffice-bin:0
-#?os_arch_machine==i686#
-# not compiled
-!!gnucash:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB4)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-text
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-text
@ -17,10 +17,6 @@
 !!glosung:0
 !!llpp:0
 !!ots:0
-#?os_arch_machine==i686#
-# not compiled
-!!kbibtex:5
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB2)!=#
@ -28,9 +24,7 @@ agrep
 bibus
 hd2u
 tidy-html5
-#?os_arch_machine==x86_64#
 zathura-pdf-mupdf
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB3)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-db
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-db
@ -20,11 +20,6 @@ tinycdb
 !!oracle-instantclient-odbc:0
 !!oracle-instantclient-sqlplus:0
 !!sqldeveloper:0
-
-#?os_arch_machine==i686#
-# not compiled
-!!mysql-workbench:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CBS)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-embedded
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-embedded
@ -2,7 +2,4 @@

 #?in(os_linux_pkglist, CB4)!=#
 #-world(#-cl_pass_file-#)-#
-#?os_arch_machine==i686#
-!!picp:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-games
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-games
@ -2,7 +2,4 @@

 #?in(os_linux_pkglist, CB3)!=#
 #-world(#-cl_pass_file-#)-#
-#?os_arch_machine==i686#
-!!clanlib:2.3
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-haskell
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-haskell
@ -2,11 +2,4 @@

 #?in(os_linux_pkglist, CB4)!=#
 #-world(#-cl_pass_file-#)-#
-#?os_arch_machine==i686#
-!!hlint:0
-!!idna:0
-!!publicsuffixlist:0
-!!stringprep:0
-!!text-icu:0
-#?os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-java
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-java
@ -11,12 +11,6 @@
 !!commons-math:2
 !!ant-eclipse-ecj:4.2

-#?os_arch_machine==i686#
-# not compiled
-!!ant-eclipse-ecj:4.4
-!!eclipse-ecj:4.4
-#os_arch_machine#
-
 # need to download
 !!bndlib:0
 !!httpcomponents-client:4.5
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-lang
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-lang
@ -9,13 +9,6 @@
 !!mercury-extras:0
 !!scala-bin:0
 !spark:0
-
-#?os_arch_machine==i686#
-#not compiled
-!!mozart:0
-!!mozart-stdlib:0
-!!xsb:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CBS)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-libs
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-libs
@ -1,9 +1,7 @@
 # Calculate name=world format=world

 #?in(os_linux_pkglist, CB1)!=#
-#?os_arch_machine==x86_64#
 sink
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB4)!=#
@ -23,10 +21,6 @@ sink

 # not compiled
 !!cloog:0
-
-#?os_arch_machine==i686#
-!!icu-layoutex:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CBS)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-lisp
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-lisp
@ -5,8 +5,4 @@
 !!clisp:2
 # not compiled
 !!gcl:0
-#?os_arch_machine==i686#
-!!clozurecl:0
-!!cmucl:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-python
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-python
@ -81,10 +81,8 @@ smmap
 !!flexx:0
 !!rpy:0

-#?os_arch_machine==x86_64#
 # not compiled
 !!dynd-python:0
-#os_arch_machine#

 !!basemap:0
 !!bashate:0
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util
@ -22,13 +22,11 @@
 !!ddd:0
 !!eric:6
 !!sel:0
-#?os_arch_machine==x86_64#
 !!nvidia-cuda-sdk:0
 !!nvidia-cuda-toolkit:0
 # not compiled
 !!bazel:0
 !!electron:2.0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB3)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/games-action
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/games-action
@ -17,8 +17,4 @@
 !!intrusion2:0
 !!solar2:0
 !!swordandsworcery:0
-# not compiled
-#?os_arch_machine==i686#
-!!supermariowar:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/games-board
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/games-board
@ -13,8 +13,4 @@ gnugo
 !!tablebase-syzygy:0
 # need to download
 !!tablebase-syzygy:nofetch
-#?os_arch_machine==i686#
-# not compiled
-!!stockfish:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/kde-misc
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/kde-misc
@ -3,8 +3,4 @@
 #?in(os_linux_pkglist, CB1)!=#
 #-world(#-cl_pass_file-#)-#
 !systemd-kcm:5
-#?os_arch_machine==i686#
-# not compiled
-!!tellico:5
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/media-gfx
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/media-gfx
@ -16,21 +16,7 @@
 !!comix:0
 !!duhdraw:0
 !!kphotoalbum:5
-
-#?os_arch_machine==x86_64#
-# not compiled
 !!pinta:0
-#os_arch_machine#
-
-#?os_arch_machine==i686#
-!!zgv:0
-# not compiled
-!!fotoxx:0
-!!iscan:0
-!!iscan-data:0
-!!iscan-plugin-gt-f720:0
-!!povray:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB3)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/media-libs
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/media-libs
@ -18,18 +18,7 @@ bcg729

 # not compiled
 !!lastfmlib:0
-#?os_arch_machine==x86_64#
-# not compiled
 !!osl:0
-#os_arch_machine#
-
-#?os_arch_machine==i686#
-!!libsidplayfp:0
-!!xine-lib:1
-# not compiled
-!!gegl:0
-!!svgalib:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CBS)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/media-plugins
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/media-plugins
@ -17,11 +17,4 @@ deadbeef-fb
 !vdr-rotor:0
 !!vdr-ttxtsubs:0
 !!vdr-vompserver:0
-
-#?os_arch_machine==i686#
-!gst-plugins-srtp:1.0
-!vdr-radiolist:0
-!vdr-skinelchi:0
-!vdr-vcd:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/media-sound
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/media-sound
@ -18,6 +18,7 @@ media-sound/audacious
 #?in(os_linux_pkglist, CB2)!=#
 #-world(#-cl_pass_file-#)-#
 !!audex:5
+!!cadence:0
 !!cantata:0
 !!cdtool:0
 !!deadbeef:0
@ -26,9 +27,6 @@ media-sound/audacious
 !!kid3:5
 !!musique:0
 !!tomahawk:0
-#?os_arch_machine==x86_64#
-!!cadence:0
-#os_arch_machine#

 # is blocking
 !!apulse:0
@ -47,14 +45,6 @@ media-sound/audacious
 !!pympd:0
 !!seq24:0
 !!umix:0
-
-#?os_arch_machine==i686#
-# not compiled for x86
-!!mixxx:0
-!!spotify:0
-!!xineadump:0
-#os_arch_machine#
-
 #in#

 #?in(os_linux_pkglist, CB3)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/media-tv
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/media-tv
@ -7,15 +7,11 @@ media-tv/ivtv-utils
 media-tv/kodi
 media-tv/linuxtv-dvb-apps
 #media-tv/mythtv
+media-tv/plex-media-server
 media-tv/shoutcast2vdr
 media-tv/tvnamer
 #media-tv/v4l-dvb-saa716x
 media-tv/v4l-utils
 media-tv/w_scan
 media-tv/xmltv
-
-#?os_arch_machine==x86_64#
-media-tv/plex-media-server
-#os_arch_machine#
-
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/media-video
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/media-video
@ -31,9 +31,4 @@ openshot
 # not compiled
 !!pitivi:0
 !!yle-dl:0
-
-#?os_arch_machine==i686#
-# not compiled
-!!gxine:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-firewall
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-firewall
@ -2,9 +2,4 @@

 #?in(os_linux_pkglist, CB4)!=#
 #-world(#-cl_pass_file-#)-#
-# not compiled
-!!ipt_netflow:0
-#?os_arch_machine==i686#
-!!fwbuilder:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-im
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-im
@ -8,11 +8,10 @@
 !!tkabber:0
 !!transwhat:0
 !!yowsup:0
-#?os_arch_machine==x86_64#
+
 # not compiled
 !!bitlbee-facebook:0
 !!swift:4
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB4)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-libs
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-libs
@ -1,9 +1,7 @@
 # Calculate name=world format=world

 #?in(os_linux_pkglist, CB1)!=#
-#?os_arch_machine==x86_64#
 kimap2
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB3)!=#
@ -16,10 +14,6 @@ kimap2
 !!signon-ui:0
 # not compiled
 !pjproject:0
-
-#?os_arch_machine==i686#
-!roadrunner:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB3)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-misc
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-misc
@ -30,11 +30,6 @@

 # need to download
 !!icaclient:0
-
-#?os_arch_machine==i686#
-# not compiled
-!!liveice:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB2, CB3)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-print
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-print
@ -7,7 +7,5 @@ hplip
 #?in(os_linux_pkglist, CB4)!=#
 #-world(#-cl_pass_file-#)-#
 !!fax4cups:0
-#?os_arch_machine==x86_64#
 !!mtink:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/sci-biology
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/sci-biology
@ -5,8 +5,4 @@
 # not compiled
 !!mira:0
 !!ncbi-tools:0
-
-#?os_arch_machine==i686#
-!!wgs-assembler:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/sci-libs
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/sci-libs
@ -9,9 +9,6 @@

 !!fetk:0
 !!mc:0
-#?os_arch_machine==i686#
-!!galib:0
-#os_arch_machine#

 # not compiled
 !!libdap:0
@ -21,9 +18,7 @@
 # not compiled in CBB
 !!scipy:0

-#?os_arch_machine==x86_64#
 !!clapack:0
 # not compiled
 !!linux-gpib-modules:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/sci-physics
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/sci-physics
@ -7,7 +7,5 @@ cernlib-montecarlo
 #?in(os_linux_pkglist, CB4)!=#
 #-world(#-cl_pass_file-#)-#
 !!cernlib-montecarlo:0
-#?os_arch_machine==x86_64#
 !!paw:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-boot
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-boot
@ -2,8 +2,4 @@

 #?in(os_linux_pkglist, CB1)!=#
 #-world(#-cl_pass_file-#)-#
-#?os_arch_machine==i686#
-# not compiled
-!!cromwell:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-fs
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-fs
@ -6,13 +6,6 @@
 # not compided
 !!loop-aes:0
 !!static-dev:0
-#?os_arch_machine==i686#
-# not compiled
-!!sys-fs/e4rat:0
-!!zfs:0
-!!zfs-auto-snapshot:0
-!!zfs-kmod:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CBS)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-libs
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-libs
@ -9,8 +9,4 @@
 !!obstack-standalone:0
 !!queue-standalone:0
 !!uclibc-ng:0
-
-#?os_arch_machine==i686#
-!!libieee1284:0
-#os_arch_machine#
 #in#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/www-client
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/www-client
@ -2,9 +2,6 @@

 #?in(os_linux_pkglist, CB3)!=#
 epiphany
-#?os_arch_machine==x86_64#
-#firefox
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB4)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-misc
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-misc
@ -1,11 +1,9 @@
 # Calculate name=world format=world

 #?in(os_linux_pkglist, CB1)!=#
+kronometer
 pcmanfm-qt
 sddm
-#?os_arch_machine==x86_64#
-kronometer
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB2)!=#
@ -20,10 +18,6 @@ kronometer
 !!sddm:0
 !!touchcal:0
 !!unclutter-xfixes:0
-#?os_arch_machine==i686#
-# not compiled
-!!bblaunch:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB3)!=#
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-wm
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-wm
@ -6,10 +6,6 @@

 # not compiled
 !!x11-wm/enlightenment:0.17
-
-#?os_arch_machine==i686#
-!!treewm:0
-#os_arch_machine#
 #in#

 #?in(os_linux_pkglist, CB2)!=#