gentoo resync : 21.07.2018

3 files changed, 72 insertions, 0 deletions

diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 693662f1a495..0654a6f2c2fb 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -1,5 +1,8 @@
+AUX playerctl-0.6.1-doc-typesfile-path-fix.patch 1127 BLAKE2B d41f347717cbd49fb9ba1792fc33f9777e7a43ddc88a5678dc94666cf4b14a03467b270cd333329c41535f72cd3d075210e8bcca84ff9d6b41791e111eb198fc SHA512 24694c8172e59b2eb76f72e4bb1ce8809ab9ce0b335875750e189ba0047d7282e824f993495feea5680a53afc668cf313a50c1f00ff878512e52260c534248d5
 DIST playerctl-0.5.0.tar.gz 17015 BLAKE2B 5da1d0fd4e442ac5f124bd693ae14222624c5239c9fad72e57d43977467339522344bc8d8c37b0f2bfda51c61861dc33d7e35e4a730ce59a87b691b5657ec729 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c
 DIST playerctl-0.6.0.tar.gz 22124 BLAKE2B 6bb90586c56e21a00b5e6e1769248b9782a8211b01dacf590857fe4fe199d6d3fa7aa46a36cba9a8e198a1aad0bf17973fc15140db11c484edfb0275971d3d08 SHA512 8023b5704ca2a428510df6228850b616061289764cc3c4190c0c46f79d6a20e499495f2d773bd821357653ba63bca40eac70f7cc3a11251da3c6a4f7781db739
+DIST playerctl-0.6.1.tar.gz 22921 BLAKE2B d2f5874280e1a99b318bc83c40a38ee31d9c68426cb63e1e16e8ded26bac1a894d78a929f46d45d631af70e37476a4151c520eb69c94e80026689a12c682f0ad SHA512 07c302eb06a96bf3b8aa180e68e85ef6f9fdb5933b80fbce8ee5f9a36c1d961eaf5638e319ff0b26475984acc57a447a4aa8e705667f77e4bd393364cdbfb284
 EBUILD playerctl-0.5.0.ebuild 909 BLAKE2B 4b4149e81209610d4de900f59860270d9bee8d97821350f5a9dd921869c6987b0952d93e958f662ded41a08ba58709dfb9af5b4c71e9b5ce209cbbde8c1135b7 SHA512 81bd0b13240357151302d2ba9bc28631e634b25437a19112b3b10e0d1939141c9acb0cf26f62d795bfff8f0d0d70c0a74149aeafa0185a2cae6a67ee8c8db666
 EBUILD playerctl-0.6.0.ebuild 919 BLAKE2B 9023af5a6c9fe937c5096e12720b676c434e45c21238326d957dd50f33d4a44ed20abd2f541386ae471ce6835efdfad1f406fcb220ae6833cc94544aeec2445f SHA512 898d55b119f86d63a9b46dab9b10f53017caa728ba484c7ab814b58f936ae4a25d168b407d86e560099b478b4dfa10fcef01ea5c9c4ecb1d8367cc833cc26e28
+EBUILD playerctl-0.6.1.ebuild 973 BLAKE2B a6f3a4432d1b42984a3426977b05f4e94b303afc755a061f121196e882704cf440c8606b9829099ff91d3e01653ecf75e2beee121b9d0683c6e3c4c0c1b8032c SHA512 0c57ffda7cedd332b10cc566967f35c9a89b0cf732025fe9b4febedb89801332b7a357fb281520dfeee668ae1cea95b1d9c26e9a5cde6fdf0536bdbe9f355d5e
 MISC metadata.xml 487 BLAKE2B 26a06ce93634d362dee7b3a595d5257ef946c27a17c181f758fa3c0acd33aeb45c825643311da3739791f80402e38b8fd618ea43655ec60689978cf2e0f2f30f SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f
diff --git a/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch b/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch
new file mode 100644
index 000000000000..75ba5b61f9f1
--- /dev/null
+++ b/media-sound/playerctl/files/playerctl-0.6.1-doc-typesfile-path-fix.patch
@@ -0,0 +1,28 @@
+From f5fefa32f1ac59d2a9c00221281fe3541845d6d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Mon, 16 Jul 2018 18:21:21 -0400
+Subject: [PATCH] doc: look for gobject_typesfile in build dir
+
+Looking for playerctl.types file in the source directory is a mistake
+because it's generated during build and placed in build dir. Look for
+the types file in build dir instead.
+---
+ doc/reference/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/reference/meson.build b/doc/reference/meson.build
+index 100d561..b5a16a7 100644
+--- a/doc/reference/meson.build
++++ b/doc/reference/meson.build
+@@ -19,7 +19,7 @@ gnome.gtkdoc(
+     '--name-space=meson.project_name()',
+   ],
+   scan_args: '--deprecated-guards="PLAYERCTL_DISABLE_DEPRECATED"',
+-  gobject_typesfile: meson.project_name() + '.types',
++  gobject_typesfile: join_paths(meson.current_build_dir(), meson.project_name() + '.types'),
+   fixxref_args: [
+     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
+-- 
+2.17.0
+
diff --git a/media-sound/playerctl/playerctl-0.6.1.ebuild b/media-sound/playerctl/playerctl-0.6.1.ebuild
new file mode 100644
index 000000000000..262d4ae14ff6
--- /dev/null
+++ b/media-sound/playerctl/playerctl-0.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson xdg-utils
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+# Override the meson dependency in MESON_DEPEND of meson.eclass
+# The eclass depends on '>=dev-util/meson-0.40.0' as of writing this
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/meson-0.46.0
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.1-doc-typesfile-path-fix.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc gtk-doc)
+		$(meson_use introspection)
+	)
+
+	xdg_environment_reset # 596166
+	meson_src_configure
+}