gentoo resync : 12.01.2019

2 files changed, 29 insertions, 178 deletions

diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
new file mode 100644
index 000000000000..03f0e4fd3162
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.10-meson-fixup.patch
@@ -0,0 +1,29 @@
+--- a/meson.build
++++ b/meson.build
+@@ -9,12 +9,12 @@ gir = find_program('g-ir-scanner', requi
+ vapigen = find_program('vapigen', required: false)
+ vala = find_program('valac', required: false)
+ 
+-introspection_available = gir.found() and not get_option('disable-introspection')
+-vapi_available = introspection_available and vapigen.found() and not get_option('disable-vala')
++introspection_available = gir.found() and get_option('introspection')
++vapi_available = introspection_available and vapigen.found() and get_option('vapi')
+ 
+ subdir('gexiv2')
+ 
+-if get_option('enable-gtk-doc')
++if get_option('gtk_doc')
+   subdir('docs')
+ endif
+ 
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,5 +1,5 @@
+-option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference (depends on GTK-Doc)')
+-option('disable-introspection', type: 'boolean', value : false, description: 'Disable GObject Introspection')
+-option('disable-vala', type: 'boolean', value: false, description: 'Disable generation of vala vapi file')
++option('gtk_doc', type: 'boolean', value: false, description: 'Enable or disable generating the API reference (depends on GTK-Doc)')
++option('introspection', type: 'boolean', value : true, description: 'Enable or disable GObject Introspection')
++option('vapi', type: 'boolean', value: true, description: 'Enable or disable generation of vala vapi file')
+ option('python2-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject2 overrides (default = auto, no disables python2)')
+ option('python3-girdir', type: 'string', value : 'auto', description : 'Installation dir for PyGObject3 overrides (default = auto, no disables python3)')
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch b/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch
deleted file mode 100644
index ca68a8475a1f..000000000000
--- a/media-libs/gexiv2/files/gexiv2-0.10.9-exiv2-0.27.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From d8f96634e1df693eb0393cf82893a86dd2a92d2b Mon Sep 17 00:00:00 2001
-From: Jens Georg <mail@jensge.org>
-Date: Tue, 20 Nov 2018 12:43:21 +0100
-Subject: [PATCH] Replace single-file includes
-
-To improve compatibility with exiv2 0.27 as recommended in
-
-Fixes #34
-
-https://github.com/Exiv2/exiv2/issues/555#issuecomment-440023260
----
- gexiv2/gexiv2-metadata-exif.cpp            | 2 +-
- gexiv2/gexiv2-metadata-gps.cpp             | 2 +-
- gexiv2/gexiv2-metadata-iptc.cpp            | 2 +-
- gexiv2/gexiv2-metadata-private.h           | 6 +-----
- gexiv2/gexiv2-metadata-xmp.cpp             | 2 +-
- gexiv2/gexiv2-metadata.cpp                 | 9 ++-------
- gexiv2/gexiv2-preview-image-private.h      | 2 +-
- gexiv2/gexiv2-preview-properties-private.h | 2 +-
- gexiv2/gexiv2-startup.cpp                  | 2 +-
- gexiv2/gexiv2-stream-io.cpp                | 2 +-
- gexiv2/gexiv2-stream-io.h                  | 2 +-
- 11 files changed, 12 insertions(+), 21 deletions(-)
-
-diff --git a/gexiv2/gexiv2-metadata-exif.cpp b/gexiv2/gexiv2-metadata-exif.cpp
-index c87a460..f931b95 100644
---- a/gexiv2/gexiv2-metadata-exif.cpp
-+++ b/gexiv2/gexiv2-metadata-exif.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-metadata-gps.cpp b/gexiv2/gexiv2-metadata-gps.cpp
-index d49d97c..47592ec 100644
---- a/gexiv2/gexiv2-metadata-gps.cpp
-+++ b/gexiv2/gexiv2-metadata-gps.cpp
-@@ -15,7 +15,7 @@
- #include <stdexcept>
- #include <stdio.h>
- #include <glib-object.h>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- #include <limits>
- 
-diff --git a/gexiv2/gexiv2-metadata-iptc.cpp b/gexiv2/gexiv2-metadata-iptc.cpp
-index 2371708..aeac1c7 100644
---- a/gexiv2/gexiv2-metadata-iptc.cpp
-+++ b/gexiv2/gexiv2-metadata-iptc.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/iptc.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-metadata-private.h b/gexiv2/gexiv2-metadata-private.h
-index d85453c..8818c22 100644
---- a/gexiv2/gexiv2-metadata-private.h
-+++ b/gexiv2/gexiv2-metadata-private.h
-@@ -11,11 +11,7 @@
- #define GEXIV2_METADATA_PRIVATE_H
- 
- #include <gexiv2/gexiv2-metadata.h>
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/iptc.hpp>
--#include <exiv2/xmp.hpp>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-metadata-xmp.cpp b/gexiv2/gexiv2-metadata-xmp.cpp
-index e4900f2..6f60cd0 100644
---- a/gexiv2/gexiv2-metadata-xmp.cpp
-+++ b/gexiv2/gexiv2-metadata-xmp.cpp
-@@ -12,7 +12,7 @@
- #include "gexiv2-metadata-private.h"
- #include <string>
- #include <glib-object.h>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-metadata.cpp b/gexiv2/gexiv2-metadata.cpp
-index 98ded9d..9c791ef 100644
---- a/gexiv2/gexiv2-metadata.cpp
-+++ b/gexiv2/gexiv2-metadata.cpp
-@@ -22,13 +22,8 @@
- #include <cmath>
- #include <glib-object.h>
- #include <gio/gio.h>
--#include <exiv2/image.hpp>
--#include <exiv2/xmpsidecar.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/iptc.hpp>
--#include <exiv2/xmp.hpp>
--#include <exiv2/preview.hpp>
--#include <exiv2/jpgimage.hpp>
-+
-+#include <exiv2/exiv2.hpp>
- 
- 
- G_BEGIN_DECLS
-diff --git a/gexiv2/gexiv2-preview-image-private.h b/gexiv2/gexiv2-preview-image-private.h
-index 810304c..b52a84f 100644
---- a/gexiv2/gexiv2-preview-image-private.h
-+++ b/gexiv2/gexiv2-preview-image-private.h
-@@ -11,7 +11,7 @@
- #define GEXIV2_PREVIEW_IMAGE_PRIVATE_H
- 
- #include <gexiv2/gexiv2-preview-image.h>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-preview-properties-private.h b/gexiv2/gexiv2-preview-properties-private.h
-index bacb392..b057604 100644
---- a/gexiv2/gexiv2-preview-properties-private.h
-+++ b/gexiv2/gexiv2-preview-properties-private.h
-@@ -11,7 +11,7 @@
- #define GEXIV2_PREVIEW_PROPERTIES_PRIVATE_H
- 
- #include <gexiv2/gexiv2-preview-properties.h>
--#include <exiv2/preview.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- G_BEGIN_DECLS
- 
-diff --git a/gexiv2/gexiv2-startup.cpp b/gexiv2/gexiv2-startup.cpp
-index 179b6c7..de438de 100644
---- a/gexiv2/gexiv2-startup.cpp
-+++ b/gexiv2/gexiv2-startup.cpp
-@@ -7,7 +7,7 @@
-  * This is free software. See COPYING for details.
-  */
- 
--#include <exiv2/xmp.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "gexiv2-startup.h"
- #include "gexiv2-version.h"
- 
-diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
-index b772b74..454305d 100644
---- a/gexiv2/gexiv2-stream-io.cpp
-+++ b/gexiv2/gexiv2-stream-io.cpp
-@@ -13,7 +13,7 @@
- #include "gexiv2-stream-io.h"
- #include "gexiv2-managed-stream.h"
- 
--#include <exiv2/basicio.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gio/gio.h>
- #include <glib.h>
- #include <stdio.h>
-diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
-index 430ac01..8d1fe76 100644
---- a/gexiv2/gexiv2-stream-io.h
-+++ b/gexiv2/gexiv2-stream-io.h
-@@ -16,7 +16,7 @@
- #define GEXIV2_STREAM_IO_H
- 
- #include <gexiv2/gexiv2-managed-stream.h>
--#include <exiv2/basicio.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <gio/gio.h>
- 
-