Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/totem-pl-parser/, dev-libs/totem-pl-parser/files/
Date: Sun, 13 Aug 2017 09:51:36
Message-Id: 1502617858.fbd860dc38289ac5e50f3189ccc5a4cdcaa5c877.eva@gentoo
1 commit: fbd860dc38289ac5e50f3189ccc5a4cdcaa5c877
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 13 09:42:39 2017 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 13 09:50:58 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbd860dc
7
8 dev-libs/totem-pl-parser: version bump 3.10.7 → 3.10.8
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 dev-libs/totem-pl-parser/Manifest | 1 +
13 .../totem-pl-parser-3.10.8-gmime-automagic.patch | 98 ++++++++++++++++++++++
14 .../totem-pl-parser/totem-pl-parser-3.10.8.ebuild | 70 ++++++++++++++++
15 3 files changed, 169 insertions(+)
16
17 diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
18 index 4469d54953c..282693ed823 100644
19 --- a/dev-libs/totem-pl-parser/Manifest
20 +++ b/dev-libs/totem-pl-parser/Manifest
21 @@ -1 +1,2 @@
22 DIST totem-pl-parser-3.10.7.tar.xz 1608864 SHA256 9c8285bc3131faa309d5cba5a919d5166abc2b8cc5a0c850fe861be8b14e089c SHA512 681ebd61680a4aab3fc4d1d1d158d1d938c0a015f25464169862e0fa3b108af0d0392151a0f4661aa0edafdd7f83ea7f3296dfd01cabdcf3bcac36be488e764e WHIRLPOOL e5549425ac4912f2fe84b5af875d29dc2f049e64f9652671272600697b7d208929c3752d806e31c24b173dea44423e6f23a8fc1fd75417614359a9cda6ba5efd
23 +DIST totem-pl-parser-3.10.8.tar.xz 1618992 SHA256 ffc50a0713d5f3049912545169eea7d367483b2c4a868032940516ed1e78dd2b SHA512 1692fe6d183838bdfb9125ae2bf9fbf74762333a7ebb6becc755bfdbfb8d2ea1ae257f42aab7b7a1ab419aee2b35902176a731f26736a62015806d1423adae70 WHIRLPOOL 4aa55e96fb27196cb7a7f082d9030e467a5ecadb6d9448878b858b5670de9151d4043fa985b51d28c0f5345085b22b65510f9eb6129f4bc1b9ebc24957928cb5
24
25 diff --git a/dev-libs/totem-pl-parser/files/totem-pl-parser-3.10.8-gmime-automagic.patch b/dev-libs/totem-pl-parser/files/totem-pl-parser-3.10.8-gmime-automagic.patch
26 new file mode 100644
27 index 00000000000..19ab82960fd
28 --- /dev/null
29 +++ b/dev-libs/totem-pl-parser/files/totem-pl-parser-3.10.8-gmime-automagic.patch
30 @@ -0,0 +1,98 @@
31 +From b2e7a0b5db67dd276b09a151cf8a4aa3b58409fb Mon Sep 17 00:00:00 2001
32 +From: Gilles Dartiguelongue <eva@g.o>
33 +Date: Sun, 13 Aug 2017 11:28:19 +0200
34 +Subject: [PATCH] Allow selecting specific gmime version
35 +
36 +---
37 + configure.ac | 69 ++++++++++++++++++++++++++++++------------------------------
38 + 1 file changed, 34 insertions(+), 35 deletions(-)
39 +
40 +diff --git a/configure.ac b/configure.ac
41 +index dda59f7..f92bbf5 100644
42 +--- a/configure.ac
43 ++++ b/configure.ac
44 +@@ -74,47 +74,46 @@ pkg_modules="glib-2.0 >= $GLIB_REQS libxml-2.0 gthread-2.0 gio-2.0 >= $GIO_REQS
45 + ##################################
46 + # Checking libgmime dependency
47 + ##################################
48 ++GMIME=""
49 + gmime_message=""
50 +
51 +-AC_ARG_ENABLE(gmime-i-know-what-im-doing,
52 +- AS_HELP_STRING([--disable-gmime-i-know-what-im-doing],
53 +- [Disable libgmime (Unsupported, breaks Podcast support).]),
54 +- [enable_gmime=no],
55 +- [enable_gmime=yes])
56 +-
57 +-if test "x$enable_gmime" = "xyes" ; then
58 +- have_gmime3=no
59 +- PKG_CHECK_MODULES(GMIME,
60 +- gmime-3.0,
61 +- [have_gmime=yes have_gmime3=yes GMIME=gmime-3.0],
62 +- [have_gmime=no])
63 +-
64 +- if test "x$have_gmime" = "xno" ; then
65 +- PKG_CHECK_MODULES(GMIME,
66 +- gmime-2.6,
67 +- [have_gmime=yes GMIME=gmime-2.6],
68 +- [have_gmime=no])
69 +- fi
70 +-
71 +- if test "x$have_gmime" = "xyes" ; then
72 +- AC_SUBST(GMIME, $GMIME)
73 +- AC_SUBST(USEGMIME, yes)
74 +- AC_DEFINE(HAVE_GMIME, 1, [GMime available in the system])
75 +- if test "x$have_gmime3" = xyes ; then
76 +- AC_DEFINE(HAVE_GMIME3, 1, [GMime 3.0 available in the system])
77 +- fi
78 +- pkg_modules="$pkg_modules $GMIME"
79 +- else
80 +- AC_MSG_ERROR([libgmime is required to compile totem-pl-parser.])
81 +- fi
82 +-else
83 +- AC_SUBST(USEGMIME, no)
84 +- gmime_message="
85 ++AC_ARG_ENABLE(gmime,
86 ++ AS_HELP_STRING([--enable-gmime=2.6|3.0|auto|no],
87 ++ [Which gmime version to compile against. Disabling libgmime is unsupported and breaks Podcast support.]),
88 ++ [],
89 ++ [enable_gmime=auto])
90 ++
91 ++AS_IF([test "x$enable_gmime" = "x2.6"],
92 ++ [PKG_CHECK_MODULES(GMIME, [gmime-2.6], [GMIME=gmime-2.6])],
93 ++ [test "x$enable_gmime" = "x3.0"],
94 ++ [PKG_CHECK_MODULES(GMIME, [gmime-3.0], [GMIME=gmime-3.0])],
95 ++ [test "x$enable_gmime" = "xauto" -o "x$enable_gmime" = "xyes"],
96 ++ [PKG_CHECK_MODULES(GMIME, [gmime-3.0],
97 ++ [GMIME=gmime-3.0],
98 ++ [PKG_CHECK_MODULES(GMIME, [gmime-2.6], [GMIME=gmime-2.6])])],
99 ++ [test "x$enable_gmime" = "xno"],
100 ++ [],
101 ++ # else
102 ++ [AC_MSG_ERROR([invalid gmime version specified])]
103 ++)
104 ++
105 ++AS_IF([test "x$enable_gmime" = "xno"],
106 ++ [
107 ++ AC_SUBST(USEGMIME, no)
108 ++ gmime_message="
109 + **************************************************************
110 + Compiling totem-pl-parser without libgmime.
111 + This will break podcast support and is completely unsupported.
112 + **************************************************************"
113 +-fi
114 ++ ], [
115 ++ AC_SUBST(GMIME, $GMIME)
116 ++ AC_SUBST(USEGMIME, yes)
117 ++ AC_DEFINE(HAVE_GMIME, 1, [GMime available in the system])
118 ++ AS_IF([test "$xGMIME" = "xgmime-3.0"],
119 ++ [AC_DEFINE(HAVE_GMIME3, 1, [GMime 3.0 available in the system])])
120 ++ pkg_modules="$pkg_modules $GMIME"
121 ++ ]
122 ++)
123 +
124 + ##################################
125 + # Checking quvi dependency
126 +--
127 +2.14.0
128 +
129
130 diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
131 new file mode 100644
132 index 00000000000..50753e332a2
133 --- /dev/null
134 +++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.8.ebuild
135 @@ -0,0 +1,70 @@
136 +# Copyright 1999-2017 Gentoo Foundation
137 +# Distributed under the terms of the GNU General Public License v2
138 +
139 +EAPI=6
140 +GNOME2_EAUTORECONF="yes"
141 +inherit gnome2
142 +
143 +DESCRIPTION="Playlist parsing library"
144 +HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
145 +
146 +LICENSE="LGPL-2+"
147 +SLOT="0/18"
148 +IUSE="archive crypt +introspection +quvi test"
149 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
150 +
151 +RDEPEND="
152 + >=dev-libs/glib-2.31:2
153 + dev-libs/gmime:2.6
154 + >=net-libs/libsoup-2.43:2.4
155 + archive? ( >=app-arch/libarchive-3 )
156 + crypt? ( dev-libs/libgcrypt:0= )
157 + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
158 + quvi? ( >=media-libs/libquvi-0.9.1:0= )
159 +"
160 +DEPEND="${RDEPEND}
161 + !<media-video/totem-2.21
162 + dev-libs/gobject-introspection-common
163 + >=dev-util/intltool-0.35
164 + >=dev-util/gtk-doc-am-1.14
165 + sys-devel/autoconf-archive
166 + >=sys-devel/gettext-0.17
167 + virtual/pkgconfig
168 + test? (
169 + gnome-base/gvfs[http]
170 + sys-apps/dbus )
171 +"
172 +# eautoreconf needs:
173 +# dev-libs/gobject-introspection-common
174 +# sys-devel/autoconf-archive
175 +
176 +PATCHES=(
177 + # Fix gmime slot automagic, https://bugzilla.gnome.org/786231
178 + "${FILESDIR}"/${P}-gmime-automagic.patch
179 +)
180 +
181 +src_prepare() {
182 + # Disable tests requiring network access, bug #346127
183 + # 3rd test fails on upgrade, not once installed
184 + sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
185 + -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
186 + -e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1/:'\
187 + -i plparse/tests/parser.c || die "sed failed"
188 +
189 + gnome2_src_prepare
190 +}
191 +
192 +src_configure() {
193 + gnome2_src_configure \
194 + --disable-static \
195 + --enable-gmime=2.6 \
196 + $(use_enable archive libarchive) \
197 + $(use_enable crypt libgcrypt) \
198 + $(use_enable quvi) \
199 + $(use_enable introspection)
200 +}
201 +
202 +src_test() {
203 + # This is required as told by upstream in bgo#629542
204 + GVFS_DISABLE_FUSE=1 dbus-run-session emake check
205 +}