commit: 5422464543784546c8dc26a2b17e5cb0baeca103
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 16:15:16 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 16:15:16 2019 +0000
URL: https://gitweb.gentoo.org/proj/grs.git/commit/?id=54224645
ACCEPT_LICENSE: restrict it further
core/etc/grs/world.conf | 5 ++++-
core/etc/portage/make.conf.CYCLE.1 | 2 +-
core/etc/portage/make.conf.CYCLE.2 | 2 +-
core/etc/portage/make.conf.CYCLE.3 | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 1cf07fc..1094ec9 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -1094,7 +1094,10 @@ package.use : media-sound/twolame:0 -static-libs
package.use : media-sound/wavpack:0 -static-libs
[media-video/ffmpeg:0]
-package.use : media-video/ffmpeg:0 -altivec -amrenc -appkit -chromaprint
-chromium -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_aes
-cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_fma3 -cpu_flags_x86_fma4
-cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_sse4_2
-cpu_flags_x86_ssse3 -cpu_flags_x86_xop -debug -doc -fdk -flite -frei0r
-fribidi -gcrypt -gmp -iec61883 -kvazaar -libdrm -libilbc -librtmp -libsoxr
-mipsdspr1 -mipsdspr2 -mipsfpu -mmal -nvenc -opencl -openh264 -openssl
-pulseaudio -rubberband -snappy -ssh -svg -test -truetype -vdpau -x264 -zeromq
-zimg -zvbi X alsa amr bluray bs2b bzip2 cdio cpu_flags_x86_mmx
cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpudetection encode
fftools_aviocat fftools_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash
fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper
fftools_qt-faststart fftools_sidxindex fftools_trasher fontconfig gme gnutls
gpl gsm hardcoded-tables iconv ieee1
394 jack jpeg2k ladspa libass libcaca libv4l lzma modplug mp3 network openal
opengl opus oss pic postproc samba sdl speex static-libs theora threads twolame
v4l vaapi vorbis vpx wavpack webp x265 xcb xvid zlib
+package.use : media-video/ffmpeg:0 -altivec -amrenc -appkit -chromaprint
-chromium -codec2 -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext
-cpu_flags_x86_aes -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_fma3
-cpu_flags_x86_fma4 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1
-cpu_flags_x86_sse4_2 -cpu_flags_x86_ssse3 -cpu_flags_x86_xop -debug -doc -fdk
-flite -frei0r -fribidi -gcrypt -gmp -iec61883 -kvazaar -libaom -libdrm
-libilbc -libressl -librtmp -libsoxr -libxml2 -lv2 -mipsdspr1 -mipsdspr2
-mipsfpu -mmal -opencl -openh264 -openssl -pulseaudio -rubberband -snappy -srt
-ssh -svg -test -truetype -vdpau -video_cards_nvidia -x264 -zeromq -zimg -zvbi
X alsa amr bluray bs2b bzip2 cdio cpu_flags_x86_mmx cpu_flags_x86_mmxext
cpu_flags_x86_sse cpu_flags_x86_sse2 cpudetection encode fftools_aviocat
fftools_cws2fws fftools_ffescape fftools_ffeval fftools_ffhash
fftools_fourcc2pixfmt fftools_graph2dot fftools_ismindex fftools_pktdumper
fftools_qt-faststart fftools_sidxindex fftools_trasher
fontconfig gme gnutls gpl gsm hardcoded-tables iconv ieee1394 jack jpeg2k
ladspa libass libcaca libv4l lzma modplug mp3 network openal opengl opus oss
pic postproc samba sdl speex static-libs theora threads twolame v4l vaapi
vorbis vpx wavpack webp x265 xcb xvid zlib
+
+[media-video/mplayer:0]
+package.use : media-video/mplayer:0 -altivec -aqua -bluray
-cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_ssse3 -cpudetection
-debug -doc -encode -faac -faad -lirc -live -pulseaudio -rar -rtc -selinux
-toolame -tremor -vcd -vdpau -vidix -x264 -yuv4mpeg X a52 aalib alsa bidi bl
bs2b cddb cdio cdparanoia cpu_flags_x86_mmx cpu_flags_x86_mmxext
cpu_flags_x86_sse cpu_flags_x86_sse2 dga dts dv dvb dvd dvdnav enca fbcon ftp
ggi gif gsm iconv ipv6 jack joystick jpeg ladspa libass libcaca libmpeg2 lzo
mad md5sum mng mp3 nas network nut openal opengl osdmenu oss png pnm pvr radio
rtmp samba sdl shm speex tga theora truetype twolame unicode v4l
video_cards_mga vorbis xinerama xscreensaver xv xvid zoran
[media-video/rtmpdump:0]
package.use : media-video/rtmpdump:0 -libressl gnutls ssl
diff --git a/core/etc/portage/make.conf.CYCLE.1
b/core/etc/portage/make.conf.CYCLE.1
index 6fcdfe1..063d1c2 100644
--- a/core/etc/portage/make.conf.CYCLE.1
+++ b/core/etc/portage/make.conf.CYCLE.1
@@ -2,4 +2,4 @@ CFLAGS="-O2 -pipe -fno-diagnostics-color"
CXXFLAGS="${CFLAGS}"
CHOST="x86_64-pc-linux-gnu"
MAKEOPTS="-j17"
-ACCEPT_LICENSE="* -@EULA"
+ACCEPT_LICENSE="linux-fw-redistributable no-source-code"
diff --git a/core/etc/portage/make.conf.CYCLE.2
b/core/etc/portage/make.conf.CYCLE.2
index b7c4fcc..a0cdf34 100644
--- a/core/etc/portage/make.conf.CYCLE.2
+++ b/core/etc/portage/make.conf.CYCLE.2
@@ -4,4 +4,4 @@ CHOST="x86_64-pc-linux-gnu"
MAKEOPTS="-j17"
USE="-cups -tk -fontforge"
USE_ORDER="env:conf:pkg:defaults:pkginternal:repo:env.d"
-ACCEPT_LICENSE="* -@EULA"
+ACCEPT_LICENSE="linux-fw-redistributable no-source-code"
diff --git a/core/etc/portage/make.conf.CYCLE.3
b/core/etc/portage/make.conf.CYCLE.3
index 3383602..60453c2 100644
--- a/core/etc/portage/make.conf.CYCLE.3
+++ b/core/etc/portage/make.conf.CYCLE.3
@@ -3,4 +3,4 @@ CXXFLAGS="${CFLAGS}"
CHOST="x86_64-pc-linux-gnu"
MAKEOPTS="-j17"
PORTAGE_BINHOST="http://bluemoon.freeharbor.net/";
-ACCEPT_LICENSE="* -@EULA"
+ACCEPT_LICENSE="linux-fw-redistributable no-source-code"
