6 files changed, 185 insertions, 252 deletions
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index ee3e3074e3f6..39119a3d92b5 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,6 +1,7 @@
-AUX gexiv2-0.10.9-exiv2-0.27.patch 5212 BLAKE2B 70fb4bd8bf55071ba4313ee8b25daf112ee31badd2eb64d8961f962bdcc0aa29cb9ab80668e8f83de5fa05d455b596d4442a1479553d9a907d8728a7dcd758dc SHA512 9b6769da9dab347bed3927ccc33840598be01936aba21a45c05388f85e8b959f3ab8e6fe06c9c65332fada56f75ce9929bb12c2c98d5a29d5a9e159b4ca8091f
+AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
+DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-DIST gexiv2-0.10.9.tar.xz 380348 BLAKE2B 6e1479f1a4ac74f622f71eb554c42a5170091d6b1b790962ef415eab4b2528dececa2f2f7147cc662fa00503ec66766294f7efd9401bae4771e72c56724398ec SHA512 40683ce341c5eb09ad67a4a25ad14a791247a5b5f459acba424815e98d5797b0a7fb338fb4d4f1c234147c9268abe34570698fd4259cb80f7f7af76af0f0fba3
+EBUILD gexiv2-0.10.10.ebuild 1778 BLAKE2B 8c3bdd09c48b1337049a4f971fefa9060ae1b572e884a7911dad8b7bf87ea5cf7fe7afaa0afaa92a3a76df71d16603f6ea1e3f2c93f02cdf6b7e06ce3b77ac75 SHA512 45eaf8081a3d45f7232a284c75a09ab34c4e4ec28fb73ead465a6b1c634999a444c234a5cdb4ccd8e8fcf94b88979ea6827a9f91804f82bb7b9a67ab4957c1b2
 EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade
-EBUILD gexiv2-0.10.9.ebuild 1532 BLAKE2B 4f68af7b1074b6798d5084837916908f1256e4479496afb54b21360cd0f17b1b4e97fefb5c40f6a929ccd7fda78354f5aa6b4c6fbef486a470a7a05f9ab6cbdd SHA512 f3ae2354dece29ace18a80183f629bbe33c403ebfc5616c42119b0afd1173e4ef531ea4fa8277fb8f347d47c443196c45f05c723f4bba6f5c3843cf09e536f4f
+EBUILD gexiv2-9999.ebuild 1621 BLAKE2B fc25baa5039abad251d79ce4ed59ce05eb878604608e833c65e835486f3b6724eff0a90c491eaec438f7405ae1f8401624ef6e7c7f6477c265d180641c08e6c2 SHA512 634213f60b484bbe46395938fc1bf64a13ea01da2b8531de1ea8e0ba0e3328c41b74d6eb945b1af9ad1d4d12bbc77775200963b17d7d765f9b944ca2c056ecd0
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
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>
- 
- 
diff --git a/media-libs/gexiv2/gexiv2-0.10.10.ebuild b/media-libs/gexiv2/gexiv2-0.10.10.ebuild
new file mode 100644
index 000000000000..ad4135f9b2a5
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit meson python-r1 vala xdg-utils
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test vala"
+
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38.0:2
+	>=media-gfx/exiv2-0.21:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	test? (
+		dev-python/pygobject:3
+		media-gfx/exiv2[xmp]
+	)
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	# renames meson options to current git HEAD's names, current naming scheme
+	# is rather awkward
+	"${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		# prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules
+		-Dpython2-girdir=no
+		-Dpython3-girdir=no
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+}
diff --git a/media-libs/gexiv2/gexiv2-0.10.9.ebuild b/media-libs/gexiv2/gexiv2-0.10.9.ebuild
deleted file mode 100644
index eea5a85a5cc2..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-MY_PV=$(ver_cut 1-2)
-inherit autotools python-r1 toolchain-funcs vala xdg-utils
-
-DESCRIPTION="GObject-based wrapper around the Exiv2 library"
-HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
-SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="introspection python static-libs test vala"
-
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python introspection )
-	vala? ( introspection )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	media-gfx/exiv2:=
-	introspection? ( dev-libs/gobject-introspection:= )
-	vala? ( $(vala_depend) )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig
-	test? (
-		dev-python/pygobject
-		media-gfx/exiv2[xmp]
-	)
-"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-src_prepare() {
-	xdg_environment_reset
-	tc-export CXX
-	use vala && vala_src_prepare
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable static-libs static) \
-		$(use_enable vala)
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIB="$(get_libdir)" install
-	einstalldocs
-
-	if use python ; then
-		python_moduleinto gi/overrides/
-		python_foreach_impl python_domodule GExiv2.py
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
new file mode 100644
index 000000000000..2547c6a9ca91
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit meson python-r1 vala xdg-utils
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gexiv2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test vala"
+
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38.0:2
+	>=media-gfx/exiv2-0.21:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	test? (
+		dev-python/pygobject:3
+		media-gfx/exiv2[xmp]
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	xdg_environment_reset
+	use vala && vala_src_prepare
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+		# prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules
+		-Dpython2-girdir=no
+		-Dpython3-girdir=no
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+}