gentoo resync : 22.01.2019

4 files changed, 110 insertions, 5 deletions

diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 5c21c8447326..e4adde78f4d0 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,4 +1,7 @@
+AUX 3.26.2-optional-introspection.patch 1302 BLAKE2B 8563a7d5206765c47757d160ce67c6e8c86c6761364089e602df7158c53f16501b02e9ce3267d4443a30d5784e42c50821358d9ac9be63eb2e706acb61e85144 SHA512 a863084b2db4d9c3c6e25ad45485e59e6039512c03b302b86f37e4f756061449f710a97b7555450b25dcbf86ee13e3c6dcfc5e99c03d0be0e711e50f58d978f0
 AUX totem-pl-parser-3.10.8-gmime-automagic.patch 3454 BLAKE2B fe16c0c78e73ebd735ff619074462d455087c7436d9dcba862771f0aa10df9400960733e1c829fa240af6bc43cea50957dbd5034e95c26bc5c076715b71b1cb7 SHA512 0cb2b632ec79711ced87a8b8df13011defeb2117a3242d28129f53bc3c845a18d929a2697edc99e08b69410d7933ab065a65257fce62c12a8bd72f19bb4d5d6d
 DIST totem-pl-parser-3.10.8.tar.xz 1618992 BLAKE2B ab7dc3010afb9a2112f19991ee74c43436962a66fa233162b2d2c6743e5727762102f6f0bfed2a30750c0d4e3cf0fbfdb7fdab8568b0cb827e49d0f99a938c41 SHA512 1692fe6d183838bdfb9125ae2bf9fbf74762333a7ebb6becc755bfdbfb8d2ea1ae257f42aab7b7a1ab419aee2b35902176a731f26736a62015806d1423adae70
+DIST totem-pl-parser-3.26.2.tar.xz 1314032 BLAKE2B 1513223e7cdebf1b16587a8ef899dd0318d0474d3987a346525cb0f77966c87bf858510c6432f204e4ec758467da273c8644fa6976eb0da237b729f507763646 SHA512 b4d05f6c41942d243be411fb58aa557c0402eac56acc4fc213214a59d20df4354c17d5dec4064a5580f88e721411a16953e69e94c2ebe98e1aaf8b0729b8a83d
 EBUILD totem-pl-parser-3.10.8.ebuild 2080 BLAKE2B 8234199f84709abb2cc9140fc61065c05bdff5ada8dd1d36e76b7558715850a9079eb35de0742807ffc06f3c394f3096054ce3c6720f4859cc6e306b4a4efbe5 SHA512 e377bc056735214d3859ee50a06f61c815e1add95b1fb6265c895c7fcdc908a0790080e5db1a73e861fa416375b3f98eb1127d6156ba28eaf2a0bc70a950bfab
-MISC metadata.xml 482 BLAKE2B 38550c9c390117026b4c51a779fe05f9d023877b0d071f02a320ba624fc36046763c569d3e735cd4e5b46ad941f3882e7257055b68fafd909d3c5fe1706f4f3e SHA512 40da37106a328a46dea049d602980112ef3b9b0fd644b05d5375f1e7f7748373478a8cb779bafd7607f38a1c989e65fba5cdfaba55dd2c4dc2f5bb748e4f9d77
+EBUILD totem-pl-parser-3.26.2.ebuild 1986 BLAKE2B 5b3a796280b836ce249766f2a4ceaf7af9659f8be997c73c8c63ef11f73db006d2118e0361cab7be768c35f86aee197cd91f1443bddbbdab81aa0ca68b8ccbf6 SHA512 5134c8d5c909739db2e9dfd48c6022503450c9076fc3b2b2d1a60cd246cecd0d391e5625c6de50f7e497820f272795e4ea9733d9fef1692c7f4d9137dd225b06
+MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch b/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch
new file mode 100644
index 000000000000..f258b20b73da
--- /dev/null
+++ b/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch
@@ -0,0 +1,35 @@
+From e097a4608cafac147546db658a4a37f8a23715ca Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 17 Jan 2019 01:16:40 +0200
+Subject: [PATCH] build: make introspection optional, not based on
+ cross-compiling
+
+This is how most other projects do it - cross-compiling that hits trouble
+can just disable it then.
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 9c32a5f..58e9f8c 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -6,3 +6,5 @@ option('enable-libgcrypt', type: 'combo', choices : ['yes', 'no', 'auto'], value
+   description : 'Enable libgcrypt support.')
+ option('enable-gtk-doc', type: 'boolean', value: 'false',
+   description : 'Generate the API reference (depends on GTK-Doc)')
++option('enable-introspection', type: 'boolean', value: 'true',
++  description : 'Generate gobject-introspection bindings')
+diff --git a/plparse/meson.build b/plparse/meson.build
+index bdfde9d..ad4e344 100644
+--- a/plparse/meson.build
++++ b/plparse/meson.build
+@@ -121,7 +121,7 @@ if have_quvi
+ endif
+ 
+ # Introspection
+-if not meson.is_cross_build()
++if get_option('enable-introspection')
+   gnome.generate_gir(plparser_lib,
+                      sources: plparser_public_headers + plparser_sources + [
+                        totem_pl_parser_marshalers[1],
+-- 
+2.17.0
+
diff --git a/dev-libs/totem-pl-parser/metadata.xml b/dev-libs/totem-pl-parser/metadata.xml
index b40fbdb315d8..085e8b59297c 100644
--- a/dev-libs/totem-pl-parser/metadata.xml
+++ b/dev-libs/totem-pl-parser/metadata.xml
@@ -6,9 +6,8 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="archive">Enables support for accessing media files in archives
-		transparently via <pkg>app-arch/libarchive</pkg></flag>
-	<flag name="quvi">Use <pkg>media-libs/libquvi</pkg> for parsing video
-		links</flag>
+	<flag name="archive">Enables ISO detection with <pkg>app-arch/libarchive</pkg></flag>
+	<flag name="crypt">Support AmazonAMZ decoding with <pkg>dev-libs/libgcrypt</pkg></flag>
+	<flag name="quvi">Use <pkg>media-libs/libquvi</pkg> for parsing video links</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild
new file mode 100644
index 000000000000..10d510358338
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="Playlist parsing library"
+HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0/18"
+IUSE="archive crypt gtk-doc +introspection +quvi test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	quvi? ( >=media-libs/libquvi-0.9.1:0= )
+	archive? ( >=app-arch/libarchive-3 )
+	dev-libs/libxml2:2
+	crypt? ( dev-libs/libgcrypt:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		gnome-base/gvfs[http]
+		sys-apps/dbus )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-optional-introspection.patch
+)
+
+src_prepare() {
+	# Disable tests requiring network access, bug #346127
+	# 3rd test fails on upgrade, not once installed
+	# Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
+	#sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
+	#	-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
+	#	-e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
+	#	-i plparse/tests/parser.c || die "sed failed"
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# uninstalled-tests is abused to switch from loading live FS helper
+	# to in-build-tree helper, check on upgrades this is not having other
+	# consequences, bug #630242
+	local emesonargs=(
+		-Denable-quvi=$(usex quvi yes no)
+		-Denable-libarchive=$(usex archive yes no)
+		-Denable-libgcrypt=$(usex crypt yes no)
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_use introspection enable-introspection)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# This is required as told by upstream in bgo#629542
+	GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
+}