1 |
commit: 853dcaaedd012626bce5f6618ab78a9871c03063 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 26 21:51:58 2012 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 26 21:51:58 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=853dcaae |
7 |
|
8 |
media-gfx/eog: moved to gx86 |
9 |
|
10 |
* Sync live ebuild with gx86 changes. |
11 |
* USE=introspection is now global. |
12 |
|
13 |
--- |
14 |
media-gfx/eog/eog-3.6.2.ebuild | 71 ---------------------------------------- |
15 |
media-gfx/eog/eog-9999.ebuild | 22 +++++++------ |
16 |
media-gfx/eog/metadata.xml | 4 -- |
17 |
3 files changed, 12 insertions(+), 85 deletions(-) |
18 |
|
19 |
diff --git a/media-gfx/eog/eog-3.6.2.ebuild b/media-gfx/eog/eog-3.6.2.ebuild |
20 |
deleted file mode 100644 |
21 |
index 2271efe..0000000 |
22 |
--- a/media-gfx/eog/eog-3.6.2.ebuild |
23 |
+++ /dev/null |
24 |
@@ -1,71 +0,0 @@ |
25 |
-# Copyright 1999-2012 Gentoo Foundation |
26 |
-# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: $ |
28 |
- |
29 |
-EAPI="4" |
30 |
-GCONF_DEBUG="yes" |
31 |
-GNOME2_LA_PUNT="yes" |
32 |
- |
33 |
-inherit gnome2 |
34 |
-if [[ ${PV} = 9999 ]]; then |
35 |
- inherit gnome2-live |
36 |
-fi |
37 |
- |
38 |
-DESCRIPTION="The Eye of GNOME image viewer" |
39 |
-HOMEPAGE="http://www.gnome.org/projects/eog/" |
40 |
- |
41 |
-LICENSE="GPL-2+" |
42 |
-SLOT="1" |
43 |
-IUSE="+exif +introspection +jpeg lcms +svg tiff xmp" |
44 |
-if [[ ${PV} = 9999 ]]; then |
45 |
- IUSE="${IUSE} doc" |
46 |
- KEYWORDS="" |
47 |
-else |
48 |
- KEYWORDS="~amd64 ~x86 ~x86-fbsd" |
49 |
-fi |
50 |
- |
51 |
-REQUIRED_USE="exif? ( jpeg )" |
52 |
- |
53 |
-RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X] |
54 |
- >=dev-libs/glib-2.31.0:2 |
55 |
- >=dev-libs/libxml2-2:2 |
56 |
- >=dev-libs/libpeas-0.7.4[gtk] |
57 |
- >=gnome-base/gnome-desktop-2.91.2:3 |
58 |
- >=gnome-base/gsettings-desktop-schemas-2.91.92 |
59 |
- >=x11-themes/gnome-icon-theme-2.19.1 |
60 |
- >=x11-misc/shared-mime-info-0.20 |
61 |
- |
62 |
- x11-libs/gdk-pixbuf:2[jpeg?,tiff?] |
63 |
- x11-libs/libX11 |
64 |
- |
65 |
- exif? ( >=media-libs/libexif-0.6.14 ) |
66 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) |
67 |
- jpeg? ( virtual/jpeg:0 ) |
68 |
- lcms? ( media-libs/lcms:2 ) |
69 |
- svg? ( >=gnome-base/librsvg-2.36.2:2 ) |
70 |
- xmp? ( media-libs/exempi:2 )" |
71 |
-DEPEND="${RDEPEND} |
72 |
- dev-util/gtk-doc-am |
73 |
- >=dev-util/intltool-0.40 |
74 |
- sys-devel/gettext |
75 |
- virtual/pkgconfig" |
76 |
- |
77 |
-if [[ ${PV} = 9999 ]]; then |
78 |
- DEPEND="${DEPEND} |
79 |
- app-text/yelp-tools |
80 |
- doc? ( >=dev-util/gtk-doc-1.10 )" |
81 |
-fi |
82 |
- |
83 |
-src_configure() { |
84 |
- G2CONF="${G2CONF} |
85 |
- $(use_enable introspection) |
86 |
- $(use_with jpeg libjpeg) |
87 |
- $(use_with exif libexif) |
88 |
- $(use_with lcms cms) |
89 |
- $(use_with xmp) |
90 |
- $(use_with svg librsvg) |
91 |
- --disable-schemas-compile" |
92 |
- [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" |
93 |
- DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO" |
94 |
- gnome2_src_configure |
95 |
-} |
96 |
|
97 |
diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild |
98 |
index 2271efe..6c79a2d 100644 |
99 |
--- a/media-gfx/eog/eog-9999.ebuild |
100 |
+++ b/media-gfx/eog/eog-9999.ebuild |
101 |
@@ -2,7 +2,7 @@ |
102 |
# Distributed under the terms of the GNU General Public License v2 |
103 |
# $Header: $ |
104 |
|
105 |
-EAPI="4" |
106 |
+EAPI="5" |
107 |
GCONF_DEBUG="yes" |
108 |
GNOME2_LA_PUNT="yes" |
109 |
|
110 |
@@ -26,11 +26,12 @@ fi |
111 |
|
112 |
REQUIRED_USE="exif? ( jpeg )" |
113 |
|
114 |
-RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X] |
115 |
- >=dev-libs/glib-2.31.0:2 |
116 |
+RDEPEND=" |
117 |
+ >=x11-libs/gtk+-3.3.6:3[introspection,X] |
118 |
+ >=dev-libs/glib-2.31:2 |
119 |
>=dev-libs/libxml2-2:2 |
120 |
- >=dev-libs/libpeas-0.7.4[gtk] |
121 |
- >=gnome-base/gnome-desktop-2.91.2:3 |
122 |
+ >=dev-libs/libpeas-0.7.4:=[gtk] |
123 |
+ >=gnome-base/gnome-desktop-2.91.2:3= |
124 |
>=gnome-base/gsettings-desktop-schemas-2.91.92 |
125 |
>=x11-themes/gnome-icon-theme-2.19.1 |
126 |
>=x11-misc/shared-mime-info-0.20 |
127 |
@@ -43,12 +44,14 @@ RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X] |
128 |
jpeg? ( virtual/jpeg:0 ) |
129 |
lcms? ( media-libs/lcms:2 ) |
130 |
svg? ( >=gnome-base/librsvg-2.36.2:2 ) |
131 |
- xmp? ( media-libs/exempi:2 )" |
132 |
+ xmp? ( media-libs/exempi:2 ) |
133 |
+" |
134 |
DEPEND="${RDEPEND} |
135 |
- dev-util/gtk-doc-am |
136 |
+ >=dev-util/gtk-doc-am-1.10 |
137 |
>=dev-util/intltool-0.40 |
138 |
sys-devel/gettext |
139 |
- virtual/pkgconfig" |
140 |
+ virtual/pkgconfig |
141 |
+" |
142 |
|
143 |
if [[ ${PV} = 9999 ]]; then |
144 |
DEPEND="${DEPEND} |
145 |
@@ -63,8 +66,7 @@ src_configure() { |
146 |
$(use_with exif libexif) |
147 |
$(use_with lcms cms) |
148 |
$(use_with xmp) |
149 |
- $(use_with svg librsvg) |
150 |
- --disable-schemas-compile" |
151 |
+ $(use_with svg librsvg)" |
152 |
[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" |
153 |
DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO" |
154 |
gnome2_src_configure |
155 |
|
156 |
diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml |
157 |
index 216da8a..c53de9a 100644 |
158 |
--- a/media-gfx/eog/metadata.xml |
159 |
+++ b/media-gfx/eog/metadata.xml |
160 |
@@ -7,8 +7,4 @@ |
161 |
Desktop environment. With it, you can view single image files, as well |
162 |
as large image collections. |
163 |
</longdescription> |
164 |
- <use> |
165 |
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> |
166 |
- for introspection</flag> |
167 |
- </use> |
168 |
</pkgmetadata> |