diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-02 21:45:28 +0100 |
| commit | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (patch) | |
| tree | c18e1c09e605e94e2a1e93345ad25746cc9e14b9 /profiles/base | |
| parent | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (diff) | |
gentoo resync : 02.06.2019
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/make.defaults | 7 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 6 | ||||
| -rw-r--r-- | profiles/base/package.use.stable.mask | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 2ffb8d9669ea..053b0e4ac859 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -52,8 +52,9 @@ KERNEL="linux" USERLAND="GNU" INPUT_DEVICES="keyboard mouse" -# Accept any license except those in the EULA license group. -ACCEPT_LICENSE="* -@EULA" +# Accept only licenses in the FREE license group, i.e., with +# the freedom to use, share, modify and share modifications +ACCEPT_LICENSE="-* @FREE" # Tomáš Chvátal <scarabeus@gentoo.org> (23 Mar 2013) # By default enable libreoffice implementation only. @@ -153,7 +154,7 @@ TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE="1" # Aaron W. Swenson <titanofold@gentoo.org> (9 Jul 2017) # Default target(s) for postgres{,-multi}.eclass -POSTGRES_TARGETS="postgres9_5 postgres10" +POSTGRES_TARGETS="postgres10 postgres11" # Michael Orlitzky <mjo@gentoo.org> (17 Nov 2017) # diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 03f8e8c920bd..bd7f8963dc12 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -7,6 +7,12 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# James Le Cuirot <chewi@gentoo.org> (21 May 2019) +# Doesn't support ffmpeg-4. Portage takes a long time to report the +# conflict and the feature is half broken anyway. See +# https://github.com/visualboyadvance-m/visualboyadvance-m/issues/179. +games-emulation/vbam ffmpeg + # Ulrich Müller <ulm@gentoo.org> (18 May 2019) # Firmware images without a known license. Most likely, upstream # redistribution may conflict with the licenses or lack thereof diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 0879dc3bdde3..8bde36761be2 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -4,6 +4,12 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in package.use.mask +# Bernd Waibel <waebbl@gmail.com> (22 May 2019) +# Marked experimental, needs build and runtime testing. Due to non- +# available licenses for arnold and maya I can not test these addons. +# Build and functional tests and reports on issues are appreciated! +media-gfx/alembic arnold maya + # Georgy Yakovlev <gyakovlev@gentoo.org> (10 May 2019) # needs llvm slots which are not stable #678908 # also prone to weird compilation failures |