| 1 |
commit: 11abb7d25360b0b48d1f2ab266ab8d1995ac67dc |
| 2 |
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 26 23:23:15 2016 +0000 |
| 4 |
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 23:23:15 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=11abb7d2 |
| 7 |
|
| 8 |
app-text/evince: Bump version to 3.20.0 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Manifest-Sign-Key: 0xE9E568677E8B4D42 |
| 12 |
|
| 13 |
.../{evince-9999.ebuild => evince-3.20.0.ebuild} | 52 ++++++++-------------- |
| 14 |
app-text/evince/evince-9999.ebuild | 24 +++++----- |
| 15 |
app-text/evince/metadata.xml | 1 - |
| 16 |
3 files changed, 32 insertions(+), 45 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-3.20.0.ebuild |
| 19 |
similarity index 66% |
| 20 |
copy from app-text/evince/evince-9999.ebuild |
| 21 |
copy to app-text/evince/evince-3.20.0.ebuild |
| 22 |
index 62271e1..0cd9075 100644 |
| 23 |
--- a/app-text/evince/evince-9999.ebuild |
| 24 |
+++ b/app-text/evince/evince-3.20.0.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2015 Gentoo Foundation |
| 27 |
+# Copyright 1999-2016 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
# $Id$ |
| 30 |
|
| 31 |
@@ -7,9 +7,6 @@ GCONF_DEBUG="yes" |
| 32 |
GNOME2_LA_PUNT="yes" |
| 33 |
|
| 34 |
inherit gnome2 |
| 35 |
-if [[ ${PV} = 9999 ]]; then |
| 36 |
- inherit gnome2-live |
| 37 |
-fi |
| 38 |
|
| 39 |
DESCRIPTION="Simple document viewer for GNOME" |
| 40 |
HOMEPAGE="https://wiki.gnome.org/Apps/Evince" |
| 41 |
@@ -17,13 +14,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince" |
| 42 |
LICENSE="GPL-2+ CC-BY-SA-3.0" |
| 43 |
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) |
| 44 |
SLOT="0/evd3.4-evv3.3" |
| 45 |
-IUSE="djvu dvi gnome +introspection libsecret multimedia nautilus nsplugin +postscript t1lib tiff xps" |
| 46 |
-if [[ ${PV} = 9999 ]]; then |
| 47 |
- IUSE="${IUSE} doc" |
| 48 |
- KEYWORDS="" |
| 49 |
-else |
| 50 |
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" |
| 51 |
-fi |
| 52 |
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps" |
| 53 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris" |
| 54 |
|
| 55 |
# Since 2.26.2, can handle poppler without cairo support. Make it optional ? |
| 56 |
# not mature enough |
| 57 |
@@ -39,16 +31,19 @@ COMMON_DEPEND=" |
| 58 |
>=x11-libs/gtk+-3.16.0:3[introspection?] |
| 59 |
gnome-base/gsettings-desktop-schemas |
| 60 |
>=x11-libs/cairo-1.10:= |
| 61 |
- >=app-text/poppler-0.24[cairo] |
| 62 |
- djvu? ( >=app-text/djvu-3.5.17:= ) |
| 63 |
+ >=app-text/poppler-0.33[cairo] |
| 64 |
+ djvu? ( >=app-text/djvu-3.5.22:= ) |
| 65 |
dvi? ( |
| 66 |
virtual/tex-base |
| 67 |
dev-libs/kpathsea:= |
| 68 |
t1lib? ( >=media-libs/t1lib-5:= ) ) |
| 69 |
+ gstreamer? ( |
| 70 |
+ media-libs/gstreamer:1.0 |
| 71 |
+ media-libs/gst-plugins-base:1.0 |
| 72 |
+ media-libs/gst-plugins-good:1.0 ) |
| 73 |
gnome? ( gnome-base/gnome-desktop:3= ) |
| 74 |
- introspection? ( >=dev-libs/gobject-introspection-1 ) |
| 75 |
- libsecret? ( >=app-crypt/libsecret-0.5 ) |
| 76 |
- multimedia? ( media-libs/gstreamer:1.0= ) |
| 77 |
+ gnome-keyring? ( >=app-crypt/libsecret-0.5 ) |
| 78 |
+ introspection? ( >=dev-libs/gobject-introspection-1:= ) |
| 79 |
nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) |
| 80 |
postscript? ( >=app-text/libspectre-0.2:= ) |
| 81 |
tiff? ( >=media-libs/tiff-3.6:0= ) |
| 82 |
@@ -59,9 +54,8 @@ RDEPEND="${COMMON_DEPEND} |
| 83 |
gnome-base/librsvg |
| 84 |
|| ( |
| 85 |
>=x11-themes/adwaita-icon-theme-2.17.1 |
| 86 |
- >=x11-themes/gnome-icon-theme-2.17.1 |
| 87 |
+ ( >=x11-themes/gnome-icon-theme-2.17.1 x11-themes/gnome-icon-theme-symbolic ) |
| 88 |
>=x11-themes/hicolor-icon-theme-0.10 ) |
| 89 |
- x11-themes/gnome-icon-theme-symbolic |
| 90 |
" |
| 91 |
DEPEND="${COMMON_DEPEND} |
| 92 |
app-text/docbook-xml-dtd:4.3 |
| 93 |
@@ -69,19 +63,12 @@ DEPEND="${COMMON_DEPEND} |
| 94 |
dev-util/gdbus-codegen |
| 95 |
>=dev-util/gtk-doc-am-1.13 |
| 96 |
>=dev-util/intltool-0.35 |
| 97 |
+ dev-util/itstool |
| 98 |
sys-devel/gettext |
| 99 |
virtual/pkgconfig |
| 100 |
" |
| 101 |
- |
| 102 |
-if [[ ${PV} = 9999 ]]; then |
| 103 |
- DEPEND="${DEPEND} |
| 104 |
- app-text/yelp-tools |
| 105 |
- doc? ( >=dev-util/gtk-doc-1.13 )" |
| 106 |
-fi |
| 107 |
- |
| 108 |
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/ |
| 109 |
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/ |
| 110 |
-#RESTRICT="test" |
| 111 |
+# eautoreconf needs: |
| 112 |
+# app-text/yelp-tools |
| 113 |
|
| 114 |
src_prepare() { |
| 115 |
gnome2_src_prepare |
| 116 |
@@ -93,8 +80,6 @@ src_prepare() { |
| 117 |
} |
| 118 |
|
| 119 |
src_configure() { |
| 120 |
- local myconf="" |
| 121 |
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" |
| 122 |
gnome2_src_configure \ |
| 123 |
--disable-static \ |
| 124 |
--enable-pdf \ |
| 125 |
@@ -104,16 +89,15 @@ src_configure() { |
| 126 |
--enable-dbus \ |
| 127 |
$(use_enable djvu) \ |
| 128 |
$(use_enable dvi) \ |
| 129 |
- $(use_with libsecret keyring) \ |
| 130 |
+ $(use_enable gstreamer multimedia) \ |
| 131 |
$(use_enable gnome libgnome-desktop) \ |
| 132 |
+ $(use_with gnome-keyring keyring) \ |
| 133 |
$(use_enable introspection) \ |
| 134 |
- $(use_enable multimedia) \ |
| 135 |
$(use_enable nautilus) \ |
| 136 |
$(use_enable nsplugin browser-plugin) \ |
| 137 |
$(use_enable postscript ps) \ |
| 138 |
$(use_enable t1lib) \ |
| 139 |
$(use_enable tiff) \ |
| 140 |
$(use_enable xps) \ |
| 141 |
- BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \ |
| 142 |
- ${myconf} |
| 143 |
+ BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins |
| 144 |
} |
| 145 |
|
| 146 |
diff --git a/app-text/evince/evince-9999.ebuild b/app-text/evince/evince-9999.ebuild |
| 147 |
index 62271e1..6682dba 100644 |
| 148 |
--- a/app-text/evince/evince-9999.ebuild |
| 149 |
+++ b/app-text/evince/evince-9999.ebuild |
| 150 |
@@ -1,4 +1,4 @@ |
| 151 |
-# Copyright 1999-2015 Gentoo Foundation |
| 152 |
+# Copyright 1999-2016 Gentoo Foundation |
| 153 |
# Distributed under the terms of the GNU General Public License v2 |
| 154 |
# $Id$ |
| 155 |
|
| 156 |
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evince" |
| 157 |
LICENSE="GPL-2+ CC-BY-SA-3.0" |
| 158 |
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3) |
| 159 |
SLOT="0/evd3.4-evv3.3" |
| 160 |
-IUSE="djvu dvi gnome +introspection libsecret multimedia nautilus nsplugin +postscript t1lib tiff xps" |
| 161 |
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps" |
| 162 |
if [[ ${PV} = 9999 ]]; then |
| 163 |
IUSE="${IUSE} doc" |
| 164 |
KEYWORDS="" |
| 165 |
@@ -39,16 +39,19 @@ COMMON_DEPEND=" |
| 166 |
>=x11-libs/gtk+-3.16.0:3[introspection?] |
| 167 |
gnome-base/gsettings-desktop-schemas |
| 168 |
>=x11-libs/cairo-1.10:= |
| 169 |
- >=app-text/poppler-0.24[cairo] |
| 170 |
- djvu? ( >=app-text/djvu-3.5.17:= ) |
| 171 |
+ >=app-text/poppler-0.33[cairo] |
| 172 |
+ djvu? ( >=app-text/djvu-3.5.22:= ) |
| 173 |
dvi? ( |
| 174 |
virtual/tex-base |
| 175 |
dev-libs/kpathsea:= |
| 176 |
t1lib? ( >=media-libs/t1lib-5:= ) ) |
| 177 |
+ gstreamer? ( |
| 178 |
+ media-libs/gstreamer:1.0 |
| 179 |
+ media-libs/gst-plugins-base:1.0 |
| 180 |
+ media-libs/gst-plugins-good:1.0 ) |
| 181 |
gnome? ( gnome-base/gnome-desktop:3= ) |
| 182 |
- introspection? ( >=dev-libs/gobject-introspection-1 ) |
| 183 |
- libsecret? ( >=app-crypt/libsecret-0.5 ) |
| 184 |
- multimedia? ( media-libs/gstreamer:1.0= ) |
| 185 |
+ gnome-keyring? ( >=app-crypt/libsecret-0.5 ) |
| 186 |
+ introspection? ( >=dev-libs/gobject-introspection-1:= ) |
| 187 |
nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) |
| 188 |
postscript? ( >=app-text/libspectre-0.2:= ) |
| 189 |
tiff? ( >=media-libs/tiff-3.6:0= ) |
| 190 |
@@ -59,7 +62,7 @@ RDEPEND="${COMMON_DEPEND} |
| 191 |
gnome-base/librsvg |
| 192 |
|| ( |
| 193 |
>=x11-themes/adwaita-icon-theme-2.17.1 |
| 194 |
- >=x11-themes/gnome-icon-theme-2.17.1 |
| 195 |
+ ( >=x11-themes/gnome-icon-theme-2.17.1 x11-themes/gnome-icon-theme-symbolic ) |
| 196 |
>=x11-themes/hicolor-icon-theme-0.10 ) |
| 197 |
x11-themes/gnome-icon-theme-symbolic |
| 198 |
" |
| 199 |
@@ -69,6 +72,7 @@ DEPEND="${COMMON_DEPEND} |
| 200 |
dev-util/gdbus-codegen |
| 201 |
>=dev-util/gtk-doc-am-1.13 |
| 202 |
>=dev-util/intltool-0.35 |
| 203 |
+ dev-util/itstool |
| 204 |
sys-devel/gettext |
| 205 |
virtual/pkgconfig |
| 206 |
" |
| 207 |
@@ -104,10 +108,10 @@ src_configure() { |
| 208 |
--enable-dbus \ |
| 209 |
$(use_enable djvu) \ |
| 210 |
$(use_enable dvi) \ |
| 211 |
- $(use_with libsecret keyring) \ |
| 212 |
+ $(use_enable gstreamer multimedia) \ |
| 213 |
$(use_enable gnome libgnome-desktop) \ |
| 214 |
+ $(use_with gnome-keyring keyring) \ |
| 215 |
$(use_enable introspection) \ |
| 216 |
- $(use_enable multimedia) \ |
| 217 |
$(use_enable nautilus) \ |
| 218 |
$(use_enable nsplugin browser-plugin) \ |
| 219 |
$(use_enable postscript ps) \ |
| 220 |
|
| 221 |
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml |
| 222 |
index 96e3660..115a0ee 100644 |
| 223 |
--- a/app-text/evince/metadata.xml |
| 224 |
+++ b/app-text/evince/metadata.xml |
| 225 |
@@ -8,7 +8,6 @@ |
| 226 |
<use> |
| 227 |
<flag name="dvi">Enable the built-in DVI viewer</flag> |
| 228 |
<flag name="libsecret">Enable support for credentials store</flag> |
| 229 |
- <flag name="multimedia">Enable multimedia support</flag> |
| 230 |
<flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag> |
| 231 |
<flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer |
| 232 |
(<pkg>media-libs/t1lib</pkg>)</flag> |
Archives