Gentoo Archives: gentoo-commits

From: Dennis Lamm <expeditioneer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-dvb-daemon/
Date: Mon, 04 Jan 2016 07:56:00
Message-Id: 1451894101.ebf3ff828c1015a2be0d02e4bc7e948008400f55.expeditioneer@gentoo
1 commit: ebf3ff828c1015a2be0d02e4bc7e948008400f55
2 Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 4 07:55:01 2016 +0000
4 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 4 07:55:01 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf3ff82
7
8 gnome-extra/gnome-dvb-daemon simple fixes
9
10 .../gnome-dvb-daemon-0.2.90.ebuild | 55 +++++++++++++---------
11 1 file changed, 32 insertions(+), 23 deletions(-)
12
13 diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
14 index 6b2e8bd..676fe14 100644
15 --- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
16 +++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
17 @@ -1,11 +1,11 @@
18 -# Copyright 1999-2015 Gentoo Foundation
19 +# Copyright 1999-2016 Gentoo Foundation
20 # Distributed under the terms of the GNU General Public License v2
21 # $Id$
22
23 EAPI="5"
24 GCONF_DEBUG="no"
25 -PYTHON_COMPAT=( python{3_3,3_4} )
26 -VALA_MIN_API_VERSION="0.25"
27 +PYTHON_COMPAT=( python{3_4,3_5} )
28 +VALA_MIN_API_VERSION="0.26"
29
30 inherit eutils gnome2 multilib python-any-r1 vala
31
32 @@ -22,45 +22,54 @@ RDEPEND=">=dev-libs/glib-2.32.0:2
33 >=media-libs/gst-plugins-good-1.4.0:1.0
34 >=media-libs/gst-plugins-bad-1.4.0:1.0
35 >=dev-libs/libgee-0.8:0.8
36 - >=dev-db/sqlite-3.4
37 + >=dev-db/sqlite-3.4:3
38 >=media-libs/gst-rtsp-server-1.4.5:1.0
39 media-plugins/gst-plugins-dvb:1.0
40 dev-python/gst-python:1.0
41 >=dev-python/pygobject-3.2.1:3
42 - >=dev-libs/gobject-introspection-1.44.0
43 + >=dev-libs/gobject-introspection-1.44.0:0
44 x11-libs/gtk+:3[introspection]
45 - virtual/libgudev
46 + virtual/libgudev:0
47 vala? ( $(vala_depend) )
48 totem? ( media-video/totem )"
49 DEPEND="${RDEPEND}
50 ${PYTHON_DEPS}
51 - >=dev-lang/perl-5.8.1
52 - >=dev-util/intltool-0.40.0
53 - virtual/pkgconfig
54 - nls? ( sys-devel/gettext )
55 - >=sys-devel/libtool-2.2.6"
56 -
57 -pkg_setup() {
58 - G2CONF="${G2CONF} \
59 - $(use_enable nls)
60 - $(use_enable totem totem-plugin)"
61 - use totem && G2CONF="${G2CONF} \
62 - --with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
63 - python-any-r1_pkg_setup
64 -}
65 + >=dev-lang/perl-5.8.1:0
66 + >=dev-util/intltool-0.40.0:0
67 + >=dev-libs/libltdl-2.2.6:0
68 + virtual/pkgconfig:0
69 + nls? ( >=sys-devel/gettext-0.18.1:0 )"
70
71 src_prepare() {
72 python_fix_shebang .
73 gnome2_src_prepare
74 - use vala && vala_src_prepare
75 + if use vala ; then
76 + vala_src_prepare
77 + fi
78 +}
79 +
80 +src_configure() {
81 + local myconf
82 + if use totem ; then
83 + myconf = "${myconf} --with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
84 + fi
85 + gnome2_src_configure \
86 + $(use_enable nls) \
87 + $(use_enable totem totem-plugin) \
88 + ${myconf}
89 + python-any-r1_pkg_setup
90 }
91
92 pkg_postinst() {
93 - use totem && python_optimize
94 + if use totem ; then
95 + python_optimize
96 + fi
97 gnome2_pkg_postinst
98 }
99
100 pkg_postrm() {
101 - use totem && python_optimize
102 + if use totem ; then
103 + python_optimize
104 + fi
105 gnome2_pkg_postrm
106 }