summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2017-02-07 18:41:02 -0500
committerMike Gilbert <floppym@gentoo.org>2017-02-07 18:42:20 -0500
commit19135773fd630905ca754cc186471579c797307c (patch)
tree906efac05c7ff09b0ecf55f0294196a506ce141c /media-libs/gexiv2
parentx11-wm/xpra: rename ambigious USE=ffmpeg to USE=enc_ffmpeg, enc_ffmpeg suppor... (diff)
downloadgentoo-19135773fd630905ca754cc186471579c797307c.tar.gz
gentoo-19135773fd630905ca754cc186471579c797307c.tar.bz2
gentoo-19135773fd630905ca754cc186471579c797307c.zip
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
Diffstat (limited to 'media-libs/gexiv2')
-rw-r--r--media-libs/gexiv2/files/0.10.4-typelibdir.patch26
-rw-r--r--media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild (renamed from media-libs/gexiv2/gexiv2-0.10.4.ebuild)9
2 files changed, 33 insertions, 2 deletions
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 00000000000..7988bd4002a
--- /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.ebuild b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
index e538816b282..c8e2edfa6ec 100644
--- a/media-libs/gexiv2/gexiv2-0.10.4.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
+inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
MY_PV=$(get_version_component_range 1-2)
@@ -28,10 +28,15 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}"/0.10.4-typelibdir.patch
+)
+
src_prepare() {
xdg_environment_reset
tc-export CXX
default
+ eautoreconf
}
src_configure() {