2017-02-21 08:22:50 UTC

13 files changed, 55 insertions, 56 deletions

diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.2.0 b/metadata/md5-cache/dev-python/jupyter_core-4.3.0
index 82954b896477..1b58be0d2740 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.2.0
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.3.0
@@ -9,7 +9,7 @@ LICENSE=BSD
 RDEPEND=dev-python/traitlets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.2.0.tar.gz
+SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	ff7a6238714c20c6b0ba05d9956b5ad8	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	python-r1	1f16d4a5e3af0ebb79bbe131576e0618	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c5fa9839d126f44856462c9d3a119f06
+_md5_=e811ef54ef284bbb51a8111912775324
diff --git a/metadata/md5-cache/media-video/mpv-0.22.0-r2 b/metadata/md5-cache/media-video/mpv-0.22.0-r2
index 254ac0233523..0bf411eedf89 100644
--- a/metadata/md5-cache/media-video/mpv-0.22.0-r2
+++ b/metadata/md5-cache/media-video/mpv-0.22.0-r2
@@ -7,9 +7,9 @@ IUSE=+alsa aqua archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca en
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+ BSD ISC
 RDEPEND=!libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0 ) cdda? ( dev-libs/libcdio-paranoia ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv enca? ( app-i18n/enca ) libguess? ( >=app-i18n/libguess-1.0 ) uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) opengl? ( X? ( virtual/opengl ) ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 virtual/opengl ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba[smbclient(+)] ) sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) v4l? ( media-libs/libv4l ) vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( x11-libs/libXdamage ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) egl? ( || ( gbm X wayland ) ) enca? ( iconv ) gbm? ( drm egl ) lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) opengl? ( || ( aqua X !cli? ( libmpv ) ) ) test? ( || ( opengl egl ) ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) zsh-completion? ( cli )
+REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) egl? ( || ( gbm X wayland ) ) enca? ( iconv ) gbm? ( drm egl ) lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) opengl? ( || ( aqua X !cli? ( libmpv ) ) ) test? ( || ( opengl egl ) ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.22.0.tar.gz -> mpv-0.22.0.tar.gz https://waf.io/waf-1.8.12
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:waf-utils src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-r1	1f16d4a5e3af0ebb79bbe131576e0618	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	c21174962af5ca8091b66f58612797ce	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=aaf3bf1cb16353744740ac5687637bd3
+_md5_=fd8347c06f975d01d7aac2d026270fc3
diff --git a/metadata/md5-cache/media-video/mpv-0.24.0 b/metadata/md5-cache/media-video/mpv-0.24.0
index 1a94ce062cc0..cc65e95a56c1 100644
--- a/metadata/md5-cache/media-video/mpv-0.24.0
+++ b/metadata/md5-cache/media-video/mpv-0.24.0
@@ -7,9 +7,9 @@ IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd
 KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=GPL-2+ BSD ISC
 RDEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0 ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) opengl? ( X? ( virtual/opengl ) ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 virtual/opengl ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba[smbclient(+)] ) sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) v4l? ( media-libs/libv4l ) vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( x11-libs/libXdamage ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav || ( opengl egl ) ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl ) lcms? ( || ( opengl egl ) ) luajit? ( lua ) opengl? ( || ( aqua X !cli? ( libmpv ) ) ) test? ( || ( opengl egl ) ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) zsh-completion? ( cli )
+REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav || ( opengl egl ) ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl ) lcms? ( || ( opengl egl ) ) luajit? ( lua ) opengl? ( || ( aqua X !cli? ( libmpv ) ) ) test? ( || ( opengl egl ) ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.24.0.tar.gz -> mpv-0.24.0.tar.gz https://waf.io/waf-1.8.12
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_compile:waf-utils src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-r1	1f16d4a5e3af0ebb79bbe131576e0618	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	c21174962af5ca8091b66f58612797ce	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3adff5040d78cbff4e69d7eabb89dc89
+_md5_=9c30d7446c3547fa6334846b382c6346
diff --git a/metadata/md5-cache/media-video/mpv-9999 b/metadata/md5-cache/media-video/mpv-9999
index 163cc8f2e99b..a82e47b1a118 100644
--- a/metadata/md5-cache/media-video/mpv-9999
+++ b/metadata/md5-cache/media-video/mpv-9999
@@ -6,9 +6,9 @@ HOMEPAGE=https://mpv.io/
 IUSE=+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb dvd +egl encode gbm +iconv jack jpeg lcms +libass libav libcaca libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv zsh-completion cpu_flags_x86_sse4_1 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 LICENSE=GPL-2+ BSD ISC
 RDEPEND=!libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] ) libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] ) sys-libs/zlib alsa? ( >=media-libs/alsa-lib-1.0.18 ) archive? ( >=app-arch/libarchive-3.0.0:= ) bluray? ( >=media-libs/libbluray-0.3.0 ) cdda? ( dev-libs/libcdio-paranoia ) cuda? ( >=media-video/ffmpeg-3.3:0 ) drm? ( x11-libs/libdrm ) dvd? ( >=media-libs/libdvdnav-4.2.0 >=media-libs/libdvdread-4.1.0 ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) lcms? ( >=media-libs/lcms-2.6:2 ) libass? ( >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz] virtual/ttf-fonts ) libcaca? ( >=media-libs/libcaca-0.99_beta18 ) lua? ( !luajit? ( <dev-lang/lua-5.3:= ) luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) opengl? ( X? ( virtual/opengl ) ) pulseaudio? ( media-sound/pulseaudio ) raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 virtual/opengl ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba[smbclient(+)] ) sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] ) v4l? ( media-libs/libv4l ) vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] ) vdpau? ( >=x11-libs/libvdpau-0.2 ) wayland? ( >=dev-libs/wayland-1.6.0 >=x11-libs/libxkbcommon-0.3.0 ) X? ( x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 opengl? ( x11-libs/libXdamage ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) ) cuda? ( x11-drivers/nvidia-drivers[X] ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav || ( opengl egl ) ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl ) lcms? ( || ( opengl egl ) ) luajit? ( lua ) opengl? ( || ( aqua X !cli? ( libmpv ) ) ) test? ( || ( opengl egl ) ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) zsh-completion? ( cli )
+REQUIRED_USE=|| ( cli libmpv ) aqua? ( opengl ) cuda? ( !libav || ( opengl egl ) ) egl? ( || ( gbm X wayland ) ) gbm? ( drm egl ) lcms? ( || ( opengl egl ) ) luajit? ( lua ) opengl? ( || ( aqua X !cli? ( libmpv ) ) ) test? ( || ( opengl egl ) ) tools? ( cli ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) vdpau? ( X ) wayland? ( egl ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) zsh-completion? ( cli ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://waf.io/waf-1.8.12
 _eclass_exported_funcs=pkg_pretend:- pkg_preinst:- pkg_postrm:- pkg_postinst:- pkg_setup:- src_unpack:git-r3 src_prepare:- src_configure:- src_compile:waf-utils src_test:- src_install:-
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	git-r3	6efc2d7de07a77bf72c7207b48d0e123	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	eb9be4b678c4e71f3f530a767df31912	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-r1	1f16d4a5e3af0ebb79bbe131576e0618	python-utils-r1	50dad5f912d4c16c130f5679777f25e8	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	waf-utils	c21174962af5ca8091b66f58612797ce	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b5f26ca5986c652482192c9601bcb737
+_md5_=b7c079233468e63b3acec0c7e55193e8
diff --git a/metadata/md5-cache/x11-misc/netwmpager-2.05 b/metadata/md5-cache/x11-misc/netwmpager-2.05
index 3a634b3640af..9c781e42f814 100644
--- a/metadata/md5-cache/x11-misc/netwmpager-2.05
+++ b/metadata/md5-cache/x11-misc/netwmpager-2.05
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=compile configure install
 DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXft x11-libs/libXdmcp x11-libs/libXau virtual/pkgconfig x11-proto/xproto
 DESCRIPTION=Pager that works with Openbox and other EWMH compliant window managers
 EAPI=5
@@ -8,6 +8,6 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXft x11-libs/libXdmcp x11-libs/libXau
 SLOT=0
 SRC_URI=mirror://sourceforge/sf-xpaint/netwmpager-2.05.tar.bz2
-_eclass_exported_funcs=src_configure:- src_install:-
+_eclass_exported_funcs=src_configure:- src_compile:- src_install:-
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=eed15c8d8caa25a8f55ce2280231d9b4
+_md5_=c5acde36c252ed89cbb887e17261f443
diff --git a/metadata/md5-cache/x11-misc/shutterbug-1.7.45 b/metadata/md5-cache/x11-misc/shutterbug-1.7.45
deleted file mode 100644
index 11f27b7e9f80..000000000000
--- a/metadata/md5-cache/x11-misc/shutterbug-1.7.45
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/reswrap >=sys-apps/sed-4
-DESCRIPTION=Screenshot utility based on the FOX Toolkit
-EAPI=4
-HOMEPAGE=http://www.fox-toolkit.org/
-IUSE=+jpeg +png +tiff debug doc profile
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
-SLOT=0
-SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.45.tar.gz
-_eclass_exported_funcs=pkg_postinst:fox src_unpack:fox src_prepare:fox src_configure:- src_compile:fox src_install:fox
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	fox	9e6c90d3fe308094ad1add83a7d611f2	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f340cda848b437f3971d06ffd65822dd
diff --git a/metadata/md5-cache/x11-misc/shutterbug-1.7.47 b/metadata/md5-cache/x11-misc/shutterbug-1.7.47
deleted file mode 100644
index f7eb74dcdb49..000000000000
--- a/metadata/md5-cache/x11-misc/shutterbug-1.7.47
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=x11-libs/fox:1.7 x11-libs/libICE x11-libs/libSM jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/reswrap >=sys-apps/sed-4
-DESCRIPTION=Screenshot utility based on the FOX Toolkit
-EAPI=5
-HOMEPAGE=http://www.fox-toolkit.org/
-IUSE=+jpeg +png +tiff debug doc profile
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/fox:1.7 x11-libs/libICE x11-libs/libSM jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
-SLOT=0
-SRC_URI=ftp://ftp.fox-toolkit.org/pub/fox-1.7.47.tar.gz
-_eclass_exported_funcs=pkg_postinst:fox src_unpack:fox src_prepare:fox src_configure:- src_compile:fox src_install:fox
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	fox	9e6c90d3fe308094ad1add83a7d611f2	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=458e5880b99a6be7a0e2f5f5cf1794db
diff --git a/metadata/md5-cache/x11-misc/xautomation-1.06 b/metadata/md5-cache/x11-misc/xautomation-1.06
deleted file mode 100644
index 857c494eda62..000000000000
--- a/metadata/md5-cache/x11-misc/xautomation-1.06
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/libpng-1.2:0 x11-libs/libX11 x11-libs/libXtst x11-proto/inputproto x11-proto/xextproto x11-proto/xproto
-DESCRIPTION=Control X from command line and find things on screen
-EAPI=4
-HOMEPAGE=http://hoopajoo.net/projects/xautomation.html
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.2:0 x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=http://hoopajoo.net/static/projects/xautomation-1.06.tar.gz
-_eclass_exported_funcs=-
-_md5_=ea6bda3dab8d34d971b8c6f7483bad2c
diff --git a/metadata/md5-cache/x11-misc/xautomation-1.09 b/metadata/md5-cache/x11-misc/xautomation-1.09-r1
index ee95d9f89542..a638b2f9bcd8 100644
--- a/metadata/md5-cache/x11-misc/xautomation-1.09
+++ b/metadata/md5-cache/x11-misc/xautomation-1.09-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DEPEND=>=media-libs/libpng-1.2:0 x11-libs/libX11 x11-libs/libXi x11-libs/libXtst x11-proto/inputproto x11-proto/xextproto x11-proto/xproto
 DESCRIPTION=Control X from command line and find things on screen
-EAPI=5
+EAPI=6
 HOMEPAGE=http://hoopajoo.net/projects/xautomation.html
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ RDEPEND=>=media-libs/libpng-1.2:0 x11-libs/libX11 x11-libs/libXi x11-libs/libXts
 SLOT=0
 SRC_URI=http://hoopajoo.net/static/projects/xautomation-1.09.tar.gz
 _eclass_exported_funcs=-
-_md5_=1a6307d32e6c109134c7b4846d399b07
+_md5_=82571f320ad425c16b4319734fe9ff53
diff --git a/metadata/md5-cache/x11-misc/xcalendar-4.0-r2 b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
new file mode 100644
index 000000000000..bb30ae731884
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xcalendar-4.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext x11-misc/imake x11-proto/xproto x11-misc/gccmakedep motif? ( >=x11-libs/motif-2.3:0 )
+DESCRIPTION=A simple interactive calendar program with a notebook capability
+EAPI=6
+HOMEPAGE=http://www.freebsd.org/
+IUSE=motif
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=HPND
+RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw x11-libs/libXext
+SLOT=0
+SRC_URI=ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/xcalendar-4.0+i18n.tar.gz
+_eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=04fb0c0ddbbb9f64f015fbcba8ddd9b1
diff --git a/metadata/md5-cache/x11-misc/xidle-26052015 b/metadata/md5-cache/x11-misc/xidle-26052015
new file mode 100644
index 000000000000..e8ba5ee12447
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xidle-26052015
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=x11-libs/libX11 x11-libs/libXScrnSaver
+DESCRIPTION=Monitors inactivity in X and runs the specified program when a timeout occurs
+EAPI=6
+HOMEPAGE=http://www.freebsdsoftware.org/x11/xidle.html
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=BSD-2
+RDEPEND=x11-libs/libX11 x11-libs/libXScrnSaver
+SLOT=0
+SRC_URI=http://distcache.freebsd.org/local-distfiles/novel/xidle-26052015.tar.bz2
+_eclass_exported_funcs=pkg_postinst:- src_compile:- src_install:-
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=636f311bc07733ee6bffb3993f01ffbc
diff --git a/metadata/md5-cache/x11-misc/xsel-1.2.0-r1 b/metadata/md5-cache/x11-misc/xsel-1.2.0-r1
new file mode 100644
index 000000000000..a724e25bab8e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xsel-1.2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-proto/xproto x11-libs/libXt
+DESCRIPTION=Command-line program for getting and setting the contents of the X selection
+EAPI=6
+HOMEPAGE=http://www.vergenet.net/~conrad/software/xsel
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=HPND
+RDEPEND=x11-libs/libX11 x11-libs/libXext
+SLOT=0
+SRC_URI=http://www.vergenet.net/~conrad/software/xsel/download/xsel-1.2.0.tar.gz
+_eclass_exported_funcs=src_compile:-
+_md5_=d1dac92bde10bc301076c81f82e99aa4
diff --git a/metadata/md5-cache/x11-misc/xsnap-1.5.15 b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r1
index ef2e1a5a240b..c456defb5784 100644
--- a/metadata/md5-cache/x11-misc/xsnap-1.5.15
+++ b/metadata/md5-cache/x11-misc/xsnap-1.5.15-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile prepare
 DEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm app-text/rman dev-lang/perl x11-misc/imake x11-proto/xproto
 DESCRIPTION=Program to interactively take a 'snapshot' of a region of the screen
-EAPI=5
+EAPI=6
 HOMEPAGE=ftp://ftp.ac-grenoble.fr/ge/Xutils/
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
 LICENSE=GPL-3+
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libpng:0 virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-l
 SLOT=0
 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/Xutils/xsnap-1.5.15.tar.bz2
 _eclass_exported_funcs=src_prepare:- src_compile:-
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6dded0108d17deb6d6202464a9c15268
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=70eeeb75a5f35fa8f5ccddb5fd82e8e6