gentoo resync : 15.02.2018

4 files changed, 65 insertions, 5 deletions

diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index a6715bc13d30..044553d8a58d 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -4,8 +4,9 @@ DIST gexiv2-0.10.3.tar.xz 244816 BLAKE2B 79177a679c0d10c90a266c023930e27318f2e78
 DIST gexiv2-0.10.5.tar.xz 591752 BLAKE2B 2fe5beaec7a6c2c9c55e8669c1cd8077cb5636f9b188b1ae64212582a23b514ece68108dbd3d4369417af6901579a28b69beb1a44013b51a3517f7fcf4f3e409 SHA512 350e9db388d0aa1c106f3e5bf8862206977d650be0223229c61c6a3ee20642890fbfd7681a215b9c85c10d0787a00a25bc05a639e19a5f39be27cb6d1bb0fc06
 DIST gexiv2-0.10.6.tar.xz 629872 BLAKE2B 9a0f0b98eb1f19d4642cd0fb692b8ec539d3aa98f5c47f04317466877c404955d86c7fb4b2399fee30191555340fbc7701e19132d707f57d123cb16771507570 SHA512 4b15b33af9266a69babd902d379edefe7afd3d2eef11aa3c144f9ddf9c645b697bae16b8d89f50e9b3da884f1ba32f505e118c5fef5204f5630e3a9c6fee7fca
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
+EBUILD gexiv2-0.10.3-r1.ebuild 1302 BLAKE2B 43e272b98068e32d329e71766eadde4dd3b3ae9da04fbc4ac6a06d5fdffa4a0daca322f898e80a52209c4510a6657eb07d6a2fded3b8d52f54ce6896f7c3b199 SHA512 0d1c228ed35c68803b4c6b93f263b00667e6affe60b1e1066290f4a095de558e8c88e049f1f7450feac5f6e6810c233367f4a88ed96b35ac5a8812d7f0b3df25
 EBUILD gexiv2-0.10.3.ebuild 1263 BLAKE2B 499afbb8cb30cf2f3a6b536fe378c24bacec6e073e4c66005d8432f845c964a8460bd204ae386c2596da04be2973b8529032c42f288e7194c5d088992beb0dac SHA512 8e482c48e8d590633c518b4bfc50b1d38a6996e5f58af84bb60fe1d72d3dd94ac1fc1b1bf06b2dd508088ade154f903350fd38a3b9460f9c26fcd2616504ab9f
 EBUILD gexiv2-0.10.5-r1.ebuild 1388 BLAKE2B f45b369b735e07a3561856d4fbaa86fec086a02dd24841ed5d4d81a081a5ad4663eac1f2c9ed916b0cf387d3c546c991ae6ba90dc001b67c7a29f07786530130 SHA512 7e8c345bbbab1698c845c2c3f30ec66235cb0b80f32b6841ca186c68f50b8ddaef848bec6c75075b649731063e4315ee726edfe589e118cf930b7dba01a4a451
-EBUILD gexiv2-0.10.6.ebuild 1287 BLAKE2B 105b3830f92130d6a0f80de4d851722578540a2a4203eeaa7ee630d2d84ee9bdf69a08e5aac58571a4f02f0a7141f336d1765b1d63fd07cb33b32e67be8fbbff SHA512 e63a5e7c7928913f8ee1ad51c2a48133fedb6d78e784c02ad21135f657fed85135e290a09a28955e89fc4ed7bba19d54f97e7ec0be84d03661a14b7923c306dd
-EBUILD gexiv2-0.10.8.ebuild 1402 BLAKE2B 9bd3d8681eb074f05890202ec3a29f6e29c7ce8ef93faa075062afff72f893fac913c55af3020bdca8ec00ce77275d23711ecd20baa7d1ec92ffccdb2fa49441 SHA512 f3679506189cf3bb8eab1561212a0ad34a6f4ae77b564cc7e93c3b38dea9ba630bb87dd1fe8b51a51cff4768e4dc17fe1c594b220cc3010e4df7beb28e60b4e9
+EBUILD gexiv2-0.10.6.ebuild 1326 BLAKE2B 2a08ca7e489a0b8751a253c9e53ad2379b5d1d989afbdb450e2e0413c9e4bb609e24acbe9e6d83924e3894e8ac15793f39cdf0bf0fc9e632e58f2fb56ff67e5a SHA512 ee6ff6a1d9162d0c8e5001770b8f22c5b53699b49fb78628e92f0463d1fa441d35b87d6476094ff2f3670b1e797986573219e16ea9c538d859980b2987069afe
+EBUILD gexiv2-0.10.8.ebuild 1512 BLAKE2B 726883a9f1882136c6bf1a476c0ed79959746b142d5b2cf45cfae43305e6b1f2465377a76c933fe2294f84279446f01c3d25018a2a869bcbbfb9552193b62999 SHA512 ce0021f2cc5ac31969d8089af4c5eebb63651fdf48d994a5072ae35000050e6f01791b082713de4044245cc445ce17a035e1da9a6568a8805be32605be312e2b
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
new file mode 100644
index 000000000000..fc6047cfb1f1
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
+
+MY_PV=$(get_version_component_range 1-2)
+
+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 hppa ia64 ppc ppc64 sparc x86"
+IUSE="introspection python static-libs"
+
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.26.1:2
+	>=media-gfx/exiv2-0.21:0=
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	virtual/pkgconfig"
+
+src_prepare() {
+	xdg_environment_reset
+	tc-export CXX
+	epatch "${FILESDIR}/${P}-exiv-0.26.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIB="$(get_libdir)" install
+	dodoc AUTHORS NEWS README THANKS
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+
+	use static-libs || prune_libtool_files --modules
+}
diff --git a/media-libs/gexiv2/gexiv2-0.10.6.ebuild b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
index 73d79469fb5b..4adf9967d4d8 100644
--- a/media-libs/gexiv2/gexiv2-0.10.6.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=media-gfx/exiv2-0.21:0=
 	introspection? ( dev-libs/gobject-introspection:= )"
 DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
 	virtual/pkgconfig"
 
 src_prepare() {
diff --git a/media-libs/gexiv2/gexiv2-0.10.8.ebuild b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
index 1ace566e3332..268944a20166 100644
--- a/media-libs/gexiv2/gexiv2-0.10.8.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.8.ebuild
@@ -15,12 +15,12 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="introspection python static-libs test vala"
 
 REQUIRED_USE="
 	python? ( introspection ${PYTHON_REQUIRED_USE} )
-	test? ( python )
+	test? ( python introspection )
 	vala? ( introspection )
 "
 
@@ -31,6 +31,11 @@ RDEPEND="${PYTHON_DEPS}
 	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
+	test? (
+		dev-python/pygobject
+		media-gfx/exiv2[xmp]
+	)
+	dev-libs/gobject-introspection-common
 	virtual/pkgconfig"
 
 src_prepare() {