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-25 17:31:25 +04:00
parent afdd33b665
commit 0fabeffd18
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
profiles/default/linux/amd64/13.0/backbone/desktop/package.accept_keywords
View File

@ -404,6 +404,7 @@ x11-libs/libdrm ~amd64
x11-libs/libva ~amd64 x11-libs/libva ~amd64
x11-libs/libva-intel-driver ~amd64 x11-libs/libva-intel-driver ~amd64
x11-libs/libva-vdpau-driver ~amd64 x11-libs/libva-vdpau-driver ~amd64
x11-libs/libvdpau ~amd64
x11-libs/libXfont ~amd64 x11-libs/libXfont ~amd64
x11-libs/pango ~amd64 x11-libs/pango ~amd64
x11-libs/tslib ~amd64 x11-libs/tslib ~amd64

6
profiles/default/linux/amd64/13.0/backbone/desktop/package.use
View File

@ -135,7 +135,7 @@ sys-devel/llvm clang
sys-fs/aufs3 kernel-patch ramfs sys-fs/aufs3 kernel-patch ramfs
sys-fs/lvm2 static-libs -thin sys-fs/lvm2 static-libs -thin
sys-fs/ntfs3g ntfsprogs sys-fs/ntfs3g ntfsprogs
sys-fs/udev extras gudev hwdb static-libs sys-fs/udev extras gudev hwdb introspection static-libs
sys-kernel/dracut device-mapper sys-kernel/dracut device-mapper
sys-kernel/geek-sources branding ck debian genpatches gentoo ice optimization zen sys-kernel/geek-sources branding ck debian genpatches gentoo ice optimization zen
>=sys-kernel/geek-sources-3.10.1 -branding -gentoo >=sys-kernel/geek-sources-3.10.1 -branding -gentoo
@ -148,7 +148,7 @@ sys-power/cpufreqd apm lm_sensors pmu
virtual/ffmpeg mp3 theora virtual/ffmpeg mp3 theora
virtual/jpeg static-libs virtual/jpeg static-libs
virtual/libudev static-libs virtual/libudev static-libs
virtual/libgudev static-libs virtual/libgudev introspection static-libs
virtual/opencl abi_x86_32 virtual/opencl abi_x86_32
virtual/udev gudev hwdb static-libs virtual/udev gudev hwdb static-libs
www-apps/dokuwiki gd vhosts www-apps/dokuwiki gd vhosts
@ -173,5 +173,5 @@ x11-misc/virtualgl abi_x86_32
x11-terms/rxvt-unicode 256-color alt-font-width perl -vanilla xft x11-terms/rxvt-unicode 256-color alt-font-width perl -vanilla xft
x11-themes/gtk-engines-equinox -animation -themes -icons x11-themes/gtk-engines-equinox -animation -themes -icons
x11-wm/ion3 proportional-tabs systray wallpaper x11-wm/ion3 proportional-tabs systray wallpaper
xfce-base/thunar exif libnotify startup-notification udev -xfce_plugins_trash xfce-base/thunar exif libnotify startup-notification udev udisks -xfce_plugins_trash
xfce-extra/tumbler ffmpeg gstreamer odf pdf raw xfce-extra/tumbler ffmpeg gstreamer odf pdf raw