gentoo resync : 15.10.2017

4 files changed, 26 insertions, 14 deletions

diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 6c39e2d68428..a962e7b03b79 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -18,7 +18,7 @@ media-libs/sdl-mixer fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-12 frei0r
-<=media-video/ffmpeg-3.3.3 frei0r sofalizer
+<=media-video/ffmpeg-3.3.4 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (26 May 2017)
 # toolame not stable yet
diff --git a/profiles/license_groups b/profiles/license_groups
index 32cfceb8d1f2..030fecc0abea 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -5,7 +5,7 @@
 # licenses@gentoo.org
 
 # GLEP 23
-# https://wiki.gentoo.org/wiki/GLEP:23
+# https://www.gentoo.org/glep/glep-0023.html
 
 ######################################################################
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 3f85934bfe03..e0750063ce71 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,30 @@
 
 #--- END OF EXAMPLES ---
 
+# Raymond Jennings <shentino@gmail.com> (08 Jun 2017)
+# Depends on qt4 which is being removed.
+# Upstream announced EOL effective July 2017.
+# Possible alternative is skypeforlinux,
+# which uses the same account information but has different features.
+# See bug #620722 and bug #608174.
+# Masked for removal in 30 days
+dev-python/skype4py
+media-sound/skype-call-recorder
+net-im/skype
+net-im/skypetab-ng
+
+# Kent Fredric <kentnl@gentoo.org> (14 Oct 2017)
+# 12 years without upstream responding to bugs, code almost
+# irredeemably unmaintainable and with no way to demonstrate it
+# actually works. Bug #634244
+# Masked for removal in 30 days.
+dev-perl/Apache-SessionX
+
+# Alexis Ballier <aballier@gentoo.org> (14 Oct 2017)
+# Beta version, breaks revdeps, needs testing
+>=dev-lang/ocaml-4.06.0_beta
+>=dev-ml/camlp4-4.06
+
 # Lars Wendler <polynomial-c@gentoo.org> (12 Oct 2017)
 # Dead upstream. No qt5 release. Use app-admin/keepassxc as drop-in
 # replacement which has very active upstream and regular releases.
@@ -340,17 +364,6 @@ app-emulation/vmware-player
 app-emulation/vmware-modules
 app-emulation/vmware-tools
 
-# Raymond Jennings <shentino@gmail.com> (11 Jun 2017)
-# Upstream announced EOL effective July 2017.
-# Depends on qt4 which is being deprecated.
-# Possible alternative is skypeforlinux,
-# which uses the same account information but has different features.
-# See bug #620722 and bug #608174.
-dev-python/skype4py
-media-sound/skype-call-recorder
-net-im/skype
-net-im/skypetab-ng
-
 # Hans de Graaff <graaff@gentoo.org> (05 Jun 2017)
 # Bundles obsolete and vulnerable webkit version.
 # Upstream has stopped development and recommends using
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2ea01347dc3d..188359b29bcd 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4277,7 +4277,6 @@ media-libs/spandsp:fixed-point - Enable fixed point support
 media-libs/speex:utils - Enables speex commandline utilities (speexenc, speexdec).
 media-libs/speex:vbr - Enable VBR support.
 media-libs/svgalib:kernel-helper - Build the helper kernel module
-media-libs/taglib:asf - Provide support for Microsoft's 'advanced systems format' media container.
 media-libs/taglib:boost - Use dev-libs/boost instead of GCC built-ins
 media-libs/tremor:low-accuracy - enable 32bit only multiply operations
 media-libs/vigra:valgrind - Enable valgrind in make check