From 19135773fd630905ca754cc186471579c797307c Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 7 Feb 2017 18:41:02 -0500
Subject: media-libs/gexiv2: backport fix for typelibdir

Bug: https://bugs.gentoo.org/603002
Package-Manager: Portage-2.3.3_p49, Repoman-2.3.1_p42
---
 media-libs/gexiv2/files/0.10.4-typelibdir.patch | 26 +++++++++++
 media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild       | 58 +++++++++++++++++++++++++
 media-libs/gexiv2/gexiv2-0.10.4.ebuild          | 53 ----------------------
 3 files changed, 84 insertions(+), 53 deletions(-)
 create mode 100644 media-libs/gexiv2/files/0.10.4-typelibdir.patch
 create mode 100644 media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
 delete mode 100644 media-libs/gexiv2/gexiv2-0.10.4.ebuild

(limited to 'media-libs/gexiv2')

diff --git a/media-libs/gexiv2/files/0.10.4-typelibdir.patch b/media-libs/gexiv2/files/0.10.4-typelibdir.patch
new file mode 100644
index 000000000000..7988bd4002a4
--- /dev/null
+++ b/media-libs/gexiv2/files/0.10.4-typelibdir.patch
@@ -0,0 +1,26 @@
+From 7c47e3907c4888190138c3301232e198206217fb Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Wed, 17 Aug 2016 13:11:18 +0200
+Subject: Fix typelib install directory
+
+Signed-off-by: Jens Georg <mail@jensge.org>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7b5862f..bfc46d2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ pkgconfigdir     = $(libdir)/pkgconfig
+ GEXIV2_publicdir = $(includedir)/gexiv2
+ girdir           = $(datadir)/gir-1.0
+-typelibdir       = $(datadir)/gir-1.0
++typelibdir       = $(libdir)/girepository-1.0
+ py2gidir         = $(PYTHON2_GIDIR)
+ py3gidir         = $(PYTHON3_GIDIR)
+ vapidir          = $(datadir)/vala/vapi
+-- 
+cgit v0.12
+
diff --git a/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..c8e2edfa6ec8
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit autotools 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}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/0.10.4-typelibdir.patch
+)
+
+src_prepare() {
+	xdg_environment_reset
+	tc-export CXX
+	default
+	eautoreconf
+}
+
+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.4.ebuild b/media-libs/gexiv2/gexiv2-0.10.4.ebuild
deleted file mode 100644
index e538816b2826..000000000000
--- a/media-libs/gexiv2/gexiv2-0.10.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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}
-	virtual/pkgconfig"
-
-src_prepare() {
-	xdg_environment_reset
-	tc-export CXX
-	default
-}
-
-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
-}
-- 
cgit v1.2.3-65-gdbad