Change dep from quvi to libquvi (radhermit recommendation), apply marienzs

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog
index 2f00d4b1448bc07fec897e3c745392ffb5f03c8d..0eb1e22cb1ab2fb85a8a990b08038b5c703ca6de 100644 (file)
--- a/dev-libs/totem-pl-parser/ChangeLog
+++ b/dev-libs/totem-pl-parser/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-libs/totem-pl-parser
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.104 2011/10/16 17:25:59 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.105 2011/10/19 07:03:36 tetromino Exp $
+
+*totem-pl-parser-2.32.6-r1 (19 Oct 2011)
+
+  19 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +totem-pl-parser-2.32.6-r1.ebuild,
+  +files/totem-pl-parser-2.32.6-quvi-0.4.patch:
+  Change dependency from quvi to libquvi per Tim Harder's recommendation (and
+  drop keywords accordingly). Add libquvi-0.4 compatibility patch (deprecated
+  "video" interface was removed during libquvi-0.2.20 development); fixes
+  bug #386651. Many thanks to Marien Zwart for the patch and to the many users
+  in the bug's CC list for testing. Patch has not yet been applied upstream
+  (see https://bugzilla.gnome.org/show_bug.cgi?id=661451), but is obviously
+  correct by inspection.
 
   16 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   totem-pl-parser-2.32.6.ebuild:

diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 0aafa630dc94f49d72b4e6057d598dfe64c12f6e..0e69804f4ba2487ccadb4f3ebc53430900f05db0 100644 (file)
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX totem-pl-parser-2.32.3-fix-quvi.patch 786 RMD160 42df090f3814e7b2fa0b879db05f65ad09d4f5a4 SHA1 4130bc17bc86a53fd4dee8c738865d7d2224dd25 SHA256 a891cc4bda5a94cbbdde031f0ee05cbb1fdd0f53c09710c366a5a6bc9787257a
+AUX totem-pl-parser-2.32.6-quvi-0.4.patch 850 RMD160 14224b3d21b7fb8bf0b5d582579671651acfe54f SHA1 c1130ed96ce94e3f3508854b7e5d4ebfb6790831 SHA256 0ddded34923431dd356519f57c7d7fcaff44411a8c95b06fb0f32ac43b0198b3
 DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2
 DIST totem-pl-parser-2.32.3.tar.bz2 1586596 RMD160 cee2b82abf6b245f2082a007997519ed1596d76b SHA1 f6697f785727c5d6e14c9ad64ea71bda86b7bdfe SHA256 c15149650c5420426e7becd6eb4298e898d1975cb7c9ff534cc0785d350916e2
 DIST totem-pl-parser-2.32.5.tar.bz2 1605159 RMD160 9db90f4971454339592882643973d0380d898416 SHA1 e704b1664713631aca059cd5bafdbfd5abbe32a7 SHA256 f7233972602321db5e46819a5b47b52c10b63c4344725a5179ac956284e1991d
@@ -9,23 +10,14 @@ DIST totem-pl-parser-2.32.6.tar.xz 1438372 RMD160 06bcce46646201234f733a8aafb9a6
 EBUILD totem-pl-parser-2.32.3.ebuild 1943 RMD160 562ada04deb88e2c8b870282c8003ae7236779da SHA1 80153c70631c79d30260440c1e99f4f8d1287818 SHA256 905c94e621a83eba411a3ea4fc537da601ff45b9e393bc66977ee18e82b00a9c
 EBUILD totem-pl-parser-2.32.5-r1.ebuild 1844 RMD160 b015c7edace368e4ecddcf0efe7c473c22902ff8 SHA1 2ea23ef82f713362b765312cd11d996baa65225d SHA256 f7011be7ae1851c19f53857a872f8197590229669e26bd12599e881f9b73d8d2
 EBUILD totem-pl-parser-2.32.5.ebuild 1835 RMD160 e854c641b4c272f6b8ccb7495c3bdb5e24cbff15 SHA1 92f4b38148323e94e5c9570d57ae57e11e459a0e SHA256 c7cf659b3ef5a00662951ccd83b03f442c827ffdca5de2275ed014f3093f54f6
+EBUILD totem-pl-parser-2.32.6-r1.ebuild 1977 RMD160 5bdbc4e770daf98cc0469ae02993da973bf0691b SHA1 9dc7e2d33ae7089200560b7811ad71abdf05bad2 SHA256 b11964928a8b456b0cf6951763480c2c8f082f44a62daf2d45f2cd0c97bfcc43
 EBUILD totem-pl-parser-2.32.6.ebuild 1892 RMD160 6d12c4f2b29519d49b22fd285a6444b5cf5dbdeb SHA1 49dcc4f29bb49486938612e9e9658f17d1b8340f SHA256 e557fa4449c25d7acd888b371147bd7451fa80a47c41eb4d9090770de7e11bf2
-MISC ChangeLog 16721 RMD160 bd5e5121f2c712b99020fb6b6404c507760378a9 SHA1 30af07cd052a0a9fee5676cd3529f2372ba38f19 SHA256 d666c4f2fa20eb3fac5a000eadfc11a6cf7544df1f9bac5bdc20cd3b2c3399ac
+MISC ChangeLog 17393 RMD160 c3b6de269394695baacf977d380147942ff33462 SHA1 256eb2eebc95a72ab185cb45a946250158bf6118 SHA256 e91571dacfcd48fc0bce05c590e6c90770316f956db311e097ea2df31f0cbf60
 MISC metadata.xml 492 RMD160 dcba09047647b0805cc966e245f52d4d9501676f SHA1 7e60c9d6a844a0d57e9d8e2789dd8e52d0c9db92 SHA256 43d02e4dc81f8f531e19376c0107031953d50ca59d0c80602f8b8838b482f0e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOmxOtAAoJEF0huFKJUZL56QMP/28mWbYCayhg25sR70hsO13h
-4MhEeNijviV3G4JQcJ1/a0RA4w5WnR72KuC5N3KX8ABDdSeOo7u1gh8vWIIGYGfa
-PsOrgsSC1Xm8OTqDuz82JUNXX7Eyov66ygpzEKwjd5JtzpOOlwud3GYg5Tm5czvq
-uHgjVAAL5DTeRB6bv2Nx8fCpB5holmgE+8OIo+NYTr/1DSxfW+U4UDHy14PmdtZR
-BncnGU5254/COwydZEclIzcIFN1wLssAcCY63ejzhkQxSCB1IIz900ZfRC8yG/H0
-6HgcvRU3Uv7NvLD0PfUWMrlL3+m8ZSU1EFd2r1y1yRVSZqm++s9yW1jevzYUpE6P
-q+f865YBXSpgXeRElKdveVeS8DK17QsXHFwIxAf+WZj//513OsMVGdUuqoSN4R9N
-s+fW6+ALhNEamBNm7aHao34FSpakoYIp5JWZdtANFX+Z+fnyw9Ul60/0XbYu83UE
-oX4OXNBTd0iWIqVbOV5jwkT7q+VynKT1n4EHtrYPxN/Jbud+qWN87WEpCAS9UULe
-+961meEF4t0z74FXfbfPIQyR6aZ0d7jUGqTqcQdxcVAS2k1IohLbPbR/6PB8EHvV
-dERyu04YzyYrZHo+ZPPJ+hQ4po2V8fbXJOU22foNojOusBfEVbWn1pxbHLFWCb5O
-ctmtO/miVJNPasV3WB0e
-=SF9v
+iF4EAREIAAYFAk6edk0ACgkQdjK8w9WeBnC0ugEAjnUWxANGz7wvJL9x6muyPZVw
+/YJmka2CDcb5umq1l44BAKrBOc/8tBRnKigs+1yHR6R6Ap/wmhMrFchOVj736iAj
+=jNR+
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/totem-pl-parser/files/totem-pl-parser-2.32.6-quvi-0.4.patch b/dev-libs/totem-pl-parser/files/totem-pl-parser-2.32.6-quvi-0.4.patch
new file mode 100644 (file)
index 0000000..2391785
--- /dev/null
+++ b/dev-libs/totem-pl-parser/files/totem-pl-parser-2.32.6-quvi-0.4.patch
@@ -0,0 +1,29 @@
+Use "media" interface instead of "video" (deprecated in libquvi-0.2.15,
+removed in 0.2.20). Fixes compatibility with libquvi-0.4.
+
+See https://bugs.gentoo.org/show_bug.cgi?id=386651,
+https://bugzilla.gnome.org/show_bug.cgi?id=661451
+
+--- a/plparse/totem-pl-parser-videosite.c
++++ b/plparse/totem-pl-parser-videosite.c
+@@ -75,7 +75,7 @@
+ #ifdef HAVE_QUVI
+       QUVIcode rc;
+       quvi_t handle;
+-      quvi_video_t v;
++      quvi_media_t v;
+       char *uri;
+       /* properties */
+       const char *video_uri;
+@@ -104,8 +104,8 @@
+               return TOTEM_PL_PARSER_RESULT_ERROR;
+       }
+ 
+-      getprop (QUVIPROP_VIDEOURL, video_uri);
+-      if (quvi_getprop (v, QUVIPROP_VIDEOFILELENGTH, &length) == QUVI_OK)
++      getprop (QUVIPROP_MEDIAURL, video_uri);
++      if (quvi_getprop (v, QUVIPROP_MEDIACONTENTLENGTH, &length) == QUVI_OK)
+               length_str = g_strdup_printf ("%f", length);
+       else
+               length_str = NULL;
+

diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild
new file mode 100644 (file)
index 0000000..e09c303
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild,v 1.1 2011/10/19 07:03:36 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Playlist parsing library"
+HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
+
+# eautoreconf needs:
+#SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="archive doc +introspection +quvi"
+
+RDEPEND=">=dev-libs/glib-2.24:2
+       dev-libs/gmime:2.4
+       >=net-libs/libsoup-gnome-2.30:2.4
+       archive? ( >=app-arch/libarchive-2.8.4 )
+       introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+       quvi? ( >=media-libs/libquvi-0.2.15 )"
+DEPEND="${RDEPEND}
+       !<media-video/totem-2.21
+       >=sys-devel/gettext-0.17
+       >=dev-util/intltool-0.35
+       doc? ( >=dev-util/gtk-doc-1.11 )"
+# eautoreconf needs:
+#      >=dev-util/gtk-doc-am-1.11
+
+pkg_setup() {
+       G2CONF="${G2CONF}
+               --disable-static
+               --disable-maintainer-mode
+               $(use_enable archive libarchive)
+               $(use_enable quvi)
+               $(use_enable introspection)"
+       DOCS="AUTHORS ChangeLog NEWS"
+}
+
+# eautoreconf needs:
+#src_unpack() {
+#      # If gobject-introspection is installed, we don't need the extra .m4
+#      if has_version "dev-libs/gobject-introspection"; then
+#              unpack ${P}.tar.bz2
+#      else
+#              unpack ${A}
+#      fi
+#}
+
+src_prepare() {
+       # bug #386651, https://bugzilla.gnome.org/show_bug.cgi?id=661451
+       epatch "${FILESDIR}/${PN}-2.32.6-quvi-0.4.patch"
+
+       gnome2_src_prepare
+
+       # Disable tests requiring network access, bug #346127
+       sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
+               -e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
+               -i plparse/tests/parser.c || die "sed failed"
+}
+
+src_test() {
+       # This is required as told by upstream in bgo#629542
+       dbus-launch emake check || die "emake check failed"
+}