gentoo resync : 13.10.2019

5 files changed, 108 insertions, 25 deletions

diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 24680e5d95bb..4425eb175ba8 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,6 +1,8 @@
 AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
 AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
-EBUILD gexiv2-0.10.10-r1.ebuild 1845 BLAKE2B de2fbffcddc6ac6c09171916520accea55068cc52ed43af73908c6cc4feb141fbe26cd187aa6362ba0b246a4d7b00aae9d6448741c4ba351009b84fb205caf64 SHA512 2192b65ee68d7ea41a1b0eb225cf773d05556f6b10df61db5245858da8ef790ef35dfb9e44b1c48b76f8b96cf2f3d125349a43a1537e0bbf0ffc50b5da7410a8
-EBUILD gexiv2-9999.ebuild 1650 BLAKE2B 648e3adfb789c2b410c155e5c5f9392327b017581c98893ed3fcf7a6e7b40c0558ee4417a7937ac98d82132747a492fff9d7d9e6c4bfca934173219a1dfb3b28 SHA512 0a3104e245f5ba7236c91cf6469398b997ad6eecf97caa80a1a8dead8af3cb2216d64ab587e1ee1d3d61b356401476ccc9d4423d534240fa348cb8eb764517fd
-MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
+DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9
+EBUILD gexiv2-0.10.10-r1.ebuild 1859 BLAKE2B 571cd27d784156fd7ad20f5abf31a49ca9f24bc2abe09fd4471e35c4c225d919453a890c86eda6e0a4beb0979228f3df2bf01be1abc0e1ab71796a86b7b11309 SHA512 b1af7fef73c5582137c3f28ed3c6eeb18b7eab5bc460aa26ef63a85abad92daeabd4b15d9253df1e9feafeff28760e85ca724eebcd1c3d1b398dd3def7aa839b
+EBUILD gexiv2-0.12.0.ebuild 1642 BLAKE2B f487bcc583c48a99a816b689ffabf1cc17ab58d848581e00149d3f8e852b7df96833e0cf9780d609cd39f4720132538e4994ab6f70848b0342c4007b9cd85ce0 SHA512 fc63ee66b2a63127a54a503ac9e0007c20df1f924b6aa1eaca46f0327348e91e62d70da13e0186e5268cb65033a53f1b64e1f0dd7396d5f4ecd8d5a95fa0f48f
+EBUILD gexiv2-9999.ebuild 1642 BLAKE2B f487bcc583c48a99a816b689ffabf1cc17ab58d848581e00149d3f8e852b7df96833e0cf9780d609cd39f4720132538e4994ab6f70848b0342c4007b9cd85ce0 SHA512 fc63ee66b2a63127a54a503ac9e0007c20df1f924b6aa1eaca46f0327348e91e62d70da13e0186e5268cb65033a53f1b64e1f0dd7396d5f4ecd8d5a95fa0f48f
+MISC metadata.xml 643 BLAKE2B 449e133d5846d7390b649aa2f101438c2305fec51f048ad5b29a5ff46f42f51ed47d27fef583e78a34b66cfc9dfa1e3e1e08e5a998a9127b5cbcd70f72420993 SHA512 9972f031fd8ea9451f59a4aa69fd45acbe8a119c32a2e81edafb7ef14b5be3475b3660eb141d1281c9483821cdadd29249c27a9f3ac0e9187037ae53f6f683f6
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index c9cf2f6ea763..ed3b99e6bbd7 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -15,18 +15,18 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 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 )
 "
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.38.0:2
diff --git a/media-libs/gexiv2/gexiv2-0.12.0.ebuild b/media-libs/gexiv2/gexiv2-0.12.0.ebuild
new file mode 100644
index 000000000000..c83cec2f56ad
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.12.0.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_{5,6,7} )
+
+inherit meson python-r1 vala
+
+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"
+fi
+
+LICENSE="LGPL-2.1+ GPL-2"
+SLOT="0"
+IUSE="gtk-doc +introspection python static-libs test +vala"
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+	test? ( python introspection )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pygobject:3
+		media-gfx/exiv2[xmp]
+	)
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38.0:2
+	>=media-gfx/exiv2-0.21:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	use vala && vala_src_prepare
+}
+
+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-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index 91c86ef6de69..c83cec2f56ad 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
-inherit meson python-r1 vala xdg-utils
+inherit meson python-r1 vala
 
 DESCRIPTION="GObject-based wrapper around the Exiv2 library"
 HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
@@ -15,25 +15,19 @@ if [[ ${PV} == 9999 ]]; then
 	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+ GPL-2"
 SLOT="0"
-IUSE="gtk-doc +introspection python static-libs test vala"
-
+IUSE="gtk-doc +introspection python static-libs test +vala"
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
 	test? ( python introspection )
 	vala? ( introspection )
 "
+RESTRICT="!test? ( test )"
 
-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
@@ -44,11 +38,16 @@ BDEPEND="
 	)
 	vala? ( $(vala_depend) )
 "
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.38.0:2
+	>=media-gfx/exiv2-0.21:=
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	xdg_environment_reset
-	use vala && vala_src_prepare
 	default
+	use vala && vala_src_prepare
 }
 
 src_configure() {
@@ -56,8 +55,8 @@ src_configure() {
 		$(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
+		# Prevents installation of python modules (uses install_data from meson
+		# which does not optimize the modules)
 		-Dpython2_girdir=no
 		-Dpython3_girdir=no
 	)
diff --git a/media-libs/gexiv2/metadata.xml b/media-libs/gexiv2/metadata.xml
index 6ade85e1c642..5a1a3fffea91 100644
--- a/media-libs/gexiv2/metadata.xml
+++ b/media-libs/gexiv2/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>bernardo@standard.ai</email>
+		<name>Bernardo Meurer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		gexiv2 is a GObject wrapper around the Exiv2 photo metadata library.
+		It allows for GNOME applications to easily inspect and update EXIF,
+		IPTC, and XMP metadata in photo and video files of various formats.
+	</longdescription>
 </pkgmetadata>