kolan
/
Overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve upgrade conflicts.

This commit is contained in:
Kolan Sh 2014-07-15 21:50:56 +04:00
parent 1ef1d5f2c7
commit d19366b55d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
profiles/hardened/linux/amd64/backbone/no-multilib/make.defaults
View File

@ -43,7 +43,7 @@ USE="${USE} alsa audio dts -esd -jingle mad mikmod -nas \
USE="${USE} -dvb -dvdr -ffmpeg fftw -ipod -quicktime v4l v4l2 video -xvmc" USE="${USE} -dvb -dvdr -ffmpeg fftw -ipod -quicktime v4l v4l2 video -xvmc"
# graphics # graphics
USE="${USE} -aalib -gphoto2 imagemagick jpg -X" USE="${USE} -aalib -gphoto2 imagemagick jpg"
# arc # arc
USE="${USE} bzip2 gzip" USE="${USE} bzip2 gzip"

4
profiles/hardened/linux/amd64/backbone/no-multilib/package.accept_keywords
View File

@ -126,6 +126,7 @@ games-action/minetest ~amd64
games-action/minetest_game ~amd64 games-action/minetest_game ~amd64
games-action/minetest_common ~amd64 games-action/minetest_common ~amd64
games-fps/urbanterror ~amd64 games-fps/urbanterror ~amd64
media-libs/freetype ~amd64
<media-plugins/caps-plugins-0.9.10 ~amd64 # higher brokes alsaequal <media-plugins/caps-plugins-0.9.10 ~amd64 # higher brokes alsaequal
media-plugins/gst-plugins-ffmpeg ~amd64 media-plugins/gst-plugins-ffmpeg ~amd64
media-sound/mp3unicode ~amd64 media-sound/mp3unicode ~amd64
@ -177,3 +178,6 @@ www-apps/tt-rss ~amd64
www-misc/zoneminder ~amd64 www-misc/zoneminder ~amd64
www-servers/lighttpd ~amd64 www-servers/lighttpd ~amd64
www-servers/thin ~amd64 www-servers/thin ~amd64
x11-libs/gtk+ ~amd64
x11-libs/cairo ~amd64
x11-libs/gdk-pixbuf ~amd64