1 |
commit: f290dd88cc7bb129e0bb4be9b22bd40e367ab5fe |
2 |
Author: Bernardo Meurer <meurerbernardo <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Aug 8 20:18:58 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 28 08:13:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f290dd88 |
7 |
|
8 |
media-libs/gexiv2: bump to 0.12.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/691774 |
11 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
12 |
Signed-off-by: Bernardo Meurer <bernardo <AT> standard.ai> |
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
media-libs/gexiv2/Manifest | 1 + |
16 |
.../{gexiv2-9999.ebuild => gexiv2-0.12.0.ebuild} | 27 +++++++++++----------- |
17 |
media-libs/gexiv2/gexiv2-9999.ebuild | 15 ++++++------ |
18 |
3 files changed, 21 insertions(+), 22 deletions(-) |
19 |
|
20 |
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest |
21 |
index efbe59e9dd0..f5484decc33 100644 |
22 |
--- a/media-libs/gexiv2/Manifest |
23 |
+++ b/media-libs/gexiv2/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7 |
26 |
+DIST gexiv2-0.12.0.tar.xz 370816 BLAKE2B 7768cffafedf41948ca6ddd22614f0eb3b44a317a23ade3c8d39d5ec5ff77c0d8c61dd8dcca5108b3403e0e3ec8be6659c16445de27163e8689c6c40f5313566 SHA512 c89e7d307359c718dff1f3991acb4ece66bce985a3d8bee1c8fccf4ce39187af62684c87eaae9b0425a6fdbf147b7330902041d9588e52a4bad1da4255d245e9 |
27 |
|
28 |
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-0.12.0.ebuild |
29 |
similarity index 82% |
30 |
copy from media-libs/gexiv2/gexiv2-9999.ebuild |
31 |
copy to media-libs/gexiv2/gexiv2-0.12.0.ebuild |
32 |
index 91c86ef6de6..13a90876ae8 100644 |
33 |
--- a/media-libs/gexiv2/gexiv2-9999.ebuild |
34 |
+++ b/media-libs/gexiv2/gexiv2-0.12.0.ebuild |
35 |
@@ -3,9 +3,9 @@ |
36 |
|
37 |
EAPI=7 |
38 |
|
39 |
-PYTHON_COMPAT=( python2_7 python3_{5,6} ) |
40 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
41 |
|
42 |
-inherit meson python-r1 vala xdg-utils |
43 |
+inherit meson python-r1 vala |
44 |
|
45 |
DESCRIPTION="GObject-based wrapper around the Exiv2 library" |
46 |
HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2" |
47 |
@@ -18,9 +18,9 @@ else |
48 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
49 |
fi |
50 |
|
51 |
-LICENSE="LGPL-2.1" |
52 |
+LICENSE="LGPL-2.1+ GPL-2" |
53 |
SLOT="0" |
54 |
-IUSE="gtk-doc +introspection python static-libs test vala" |
55 |
+IUSE="gtk-doc +introspection python static-libs test +vala" |
56 |
|
57 |
REQUIRED_USE=" |
58 |
python? ( introspection ${PYTHON_REQUIRED_USE} ) |
59 |
@@ -28,12 +28,6 @@ REQUIRED_USE=" |
60 |
vala? ( introspection ) |
61 |
" |
62 |
|
63 |
-RDEPEND="${PYTHON_DEPS} |
64 |
- >=dev-libs/glib-2.38.0:2 |
65 |
- >=media-gfx/exiv2-0.21:= |
66 |
- introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
67 |
-" |
68 |
-DEPEND="${RDEPEND}" |
69 |
BDEPEND=" |
70 |
dev-util/glib-utils |
71 |
virtual/pkgconfig |
72 |
@@ -44,11 +38,16 @@ BDEPEND=" |
73 |
) |
74 |
vala? ( $(vala_depend) ) |
75 |
" |
76 |
+RDEPEND="${PYTHON_DEPS} |
77 |
+ >=dev-libs/glib-2.38.0:2 |
78 |
+ >=media-gfx/exiv2-0.21:= |
79 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
80 |
+" |
81 |
+DEPEND="${RDEPEND}" |
82 |
|
83 |
src_prepare() { |
84 |
- xdg_environment_reset |
85 |
- use vala && vala_src_prepare |
86 |
default |
87 |
+ use vala && vala_src_prepare |
88 |
} |
89 |
|
90 |
src_configure() { |
91 |
@@ -56,8 +55,8 @@ src_configure() { |
92 |
$(meson_use introspection) |
93 |
$(meson_use vala vapi) |
94 |
$(meson_use gtk-doc gtk_doc) |
95 |
- # prevents installation of python modules (uses install_data from meson |
96 |
- # which does not optimize the modules |
97 |
+ # Prevents installation of python modules (uses install_data from meson |
98 |
+ # which does not optimize the modules) |
99 |
-Dpython2_girdir=no |
100 |
-Dpython3_girdir=no |
101 |
) |
102 |
|
103 |
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild |
104 |
index 91c86ef6de6..8748d1cf4fe 100644 |
105 |
--- a/media-libs/gexiv2/gexiv2-9999.ebuild |
106 |
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild |
107 |
@@ -3,9 +3,9 @@ |
108 |
|
109 |
EAPI=7 |
110 |
|
111 |
-PYTHON_COMPAT=( python2_7 python3_{5,6} ) |
112 |
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
113 |
|
114 |
-inherit meson python-r1 vala xdg-utils |
115 |
+inherit meson python-r1 vala |
116 |
|
117 |
DESCRIPTION="GObject-based wrapper around the Exiv2 library" |
118 |
HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2" |
119 |
@@ -18,9 +18,9 @@ else |
120 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
121 |
fi |
122 |
|
123 |
-LICENSE="LGPL-2.1" |
124 |
+LICENSE="LGPL-2.1+ GPL-2" |
125 |
SLOT="0" |
126 |
-IUSE="gtk-doc +introspection python static-libs test vala" |
127 |
+IUSE="gtk-doc +introspection python static-libs test +vala" |
128 |
|
129 |
REQUIRED_USE=" |
130 |
python? ( introspection ${PYTHON_REQUIRED_USE} ) |
131 |
@@ -46,9 +46,8 @@ BDEPEND=" |
132 |
" |
133 |
|
134 |
src_prepare() { |
135 |
- xdg_environment_reset |
136 |
- use vala && vala_src_prepare |
137 |
default |
138 |
+ use vala && vala_src_prepare |
139 |
} |
140 |
|
141 |
src_configure() { |
142 |
@@ -56,8 +55,8 @@ src_configure() { |
143 |
$(meson_use introspection) |
144 |
$(meson_use vala vapi) |
145 |
$(meson_use gtk-doc gtk_doc) |
146 |
- # prevents installation of python modules (uses install_data from meson |
147 |
- # which does not optimize the modules |
148 |
+ # Prevents installation of python modules (uses install_data from meson |
149 |
+ # which does not optimize the modules) |
150 |
-Dpython2_girdir=no |
151 |
-Dpython3_girdir=no |
152 |
) |