Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gexiv2/, media-libs/gexiv2/files/
Date: Tue, 07 Feb 2017 23:42:29
Message-Id: 1486510940.19135773fd630905ca754cc186471579c797307c.floppym@gentoo
1 commit: 19135773fd630905ca754cc186471579c797307c
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 7 23:41:02 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 7 23:42:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19135773
7
8 media-libs/gexiv2: backport fix for typelibdir
9
10 Bug: https://bugs.gentoo.org/603002
11 Package-Manager: Portage-2.3.3_p49, Repoman-2.3.1_p42
12
13 media-libs/gexiv2/files/0.10.4-typelibdir.patch | 26 ++++++++++++++++++++++
14 ...exiv2-0.10.4.ebuild => gexiv2-0.10.4-r1.ebuild} | 9 ++++++--
15 2 files changed, 33 insertions(+), 2 deletions(-)
16
17 diff --git a/media-libs/gexiv2/files/0.10.4-typelibdir.patch b/media-libs/gexiv2/files/0.10.4-typelibdir.patch
18 new file mode 100644
19 index 00000000..7988bd4
20 --- /dev/null
21 +++ b/media-libs/gexiv2/files/0.10.4-typelibdir.patch
22 @@ -0,0 +1,26 @@
23 +From 7c47e3907c4888190138c3301232e198206217fb Mon Sep 17 00:00:00 2001
24 +From: Jens Georg <mail@××××××.org>
25 +Date: Wed, 17 Aug 2016 13:11:18 +0200
26 +Subject: Fix typelib install directory
27 +
28 +Signed-off-by: Jens Georg <mail@××××××.org>
29 +---
30 + Makefile.am | 2 +-
31 + 1 file changed, 1 insertion(+), 1 deletion(-)
32 +
33 +diff --git a/Makefile.am b/Makefile.am
34 +index 7b5862f..bfc46d2 100644
35 +--- a/Makefile.am
36 ++++ b/Makefile.am
37 +@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
38 + pkgconfigdir = $(libdir)/pkgconfig
39 + GEXIV2_publicdir = $(includedir)/gexiv2
40 + girdir = $(datadir)/gir-1.0
41 +-typelibdir = $(datadir)/gir-1.0
42 ++typelibdir = $(libdir)/girepository-1.0
43 + py2gidir = $(PYTHON2_GIDIR)
44 + py3gidir = $(PYTHON3_GIDIR)
45 + vapidir = $(datadir)/vala/vapi
46 +--
47 +cgit v0.12
48 +
49
50 diff --git a/media-libs/gexiv2/gexiv2-0.10.4.ebuild b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
51 similarity index 85%
52 rename from media-libs/gexiv2/gexiv2-0.10.4.ebuild
53 rename to media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
54 index e538816..c8e2edf 100644
55 --- a/media-libs/gexiv2/gexiv2-0.10.4.ebuild
56 +++ b/media-libs/gexiv2/gexiv2-0.10.4-r1.ebuild
57 @@ -1,4 +1,4 @@
58 -# Copyright 1999-2016 Gentoo Foundation
59 +# Copyright 1999-2017 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61 # $Id$
62
63 @@ -6,7 +6,7 @@ EAPI=6
64
65 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
66
67 -inherit eutils multilib python-r1 toolchain-funcs versionator xdg-utils
68 +inherit autotools eutils multilib python-r1 toolchain-funcs versionator xdg-utils
69
70 MY_PV=$(get_version_component_range 1-2)
71
72 @@ -28,10 +28,15 @@ RDEPEND="${PYTHON_DEPS}
73 DEPEND="${RDEPEND}
74 virtual/pkgconfig"
75
76 +PATCHES=(
77 + "${FILESDIR}"/0.10.4-typelibdir.patch
78 +)
79 +
80 src_prepare() {
81 xdg_environment_reset
82 tc-export CXX
83 default
84 + eautoreconf
85 }
86
87 src_configure() {