From 4c90fe1ca80d0fa77ce8c610471913dce7b02579 Mon Sep 17 00:00:00 2001
From: David Guglielmi <david.guglielmi@gmail.com>
Date: Mon, 27 Mar 2017 23:43:32 +0200
Subject: [PATCH] media-sound/lollypop: fix sandbox access violation

---
 media-sound/lollypop/Manifest                 |  3 +-
 ...fix-searchprovider-sandbox-violation.patch | 36 +++++++++++++++++++
 media-sound/lollypop/lollypop-0.9.230.ebuild  | 16 +++++++--
 3 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 media-sound/lollypop/files/lollypop-0.9.230-fix-searchprovider-sandbox-violation.patch

diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 2710b57..18b51bb 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,2 +1,3 @@
+AUX lollypop-0.9.230-fix-searchprovider-sandbox-violation.patch 1285 SHA256 8331c0881d0549dfee84b844878a7ac1100e352af8d5c6095da3d68694280ba7 SHA512 f3aec515edb21d173898f99200fd3f519746c438cf668b3dbfd9efaecca016a8f6211f7251991627cc3db8ee64579ab376fc2f3131eb2d32d1cf8971034340ba WHIRLPOOL 46730ab25417cc0a73cdd39efdaf7c6961721803991cb80b4976d945f792cbb8dca3d8d8d5d9cdd1316860813f72fde1ea582f08c0dc58143f9cd32e8e72892a
 DIST lollypop-0.9.230.tar.xz 410608 SHA256 fe4d33b21affd2b428b1e4555ae60c11741ee67063eabf00b1db18c6e97417b1 SHA512 cfbd041c63556ed8d1ed12e3470dc0a2190635430bae19e488dc5530d880ad4680b48836f510dd927b602257a15f966ea96cc49bddadf09845732bb953bf5137 WHIRLPOOL ca94109cda9ab5249f079be1827962716c28e0510f1c5b8f8288658e2a5e1021bbfba514fd24c5b25141f4587584f9cf987d5bbb7b8918cc513f33bba8c19540
-EBUILD lollypop-0.9.230.ebuild 1253 SHA256 3d26e838658d85bedac635302e21092a2a8296234f2eb75b12cfadd285e7ae5b SHA512 768d4938e5d109a59ab1ef7ec65cf2c5762b4731273b9a9b3e0ec0092f367f4ef10a6a0e4896b653563f7e12536f683ef64fdf9f2e4eaceaf6882fbf859e4464 WHIRLPOOL 163e5bac699e66c595fd05bbfde8424f196a797bb4e72912469d88cef02f3f6e62269b98f89e07ea6e6b035cdd018e9270ee54245b34350e21e7f92b167f2c20
+EBUILD lollypop-0.9.230.ebuild 1464 SHA256 657e615b9a762982d2cabd82edcb57f414da52ac663347d64ebe965e40199a95 SHA512 c662849604e95c62532321057f208f89b01e517c91bdae7f54fd1ff337f36310a32136bc7ec3b49beaaf551d1bbd139c792dd93f4f86bf15141055911dfe5da8 WHIRLPOOL 65052d88b51761af09d22b7c2b20ca2c5aabbeb78784a3bb2440df8e1a7c55067015a33cdf03223f6bbab6eae64aa6730c7d97368d3ac0c98c697208f11183ed
diff --git a/media-sound/lollypop/files/lollypop-0.9.230-fix-searchprovider-sandbox-violation.patch b/media-sound/lollypop/files/lollypop-0.9.230-fix-searchprovider-sandbox-violation.patch
new file mode 100644
index 0000000..6e3bbfd
--- /dev/null
+++ b/media-sound/lollypop/files/lollypop-0.9.230-fix-searchprovider-sandbox-violation.patch
@@ -0,0 +1,36 @@
+diff -dNur a/search-provider/Makefile.am b/search-provider/Makefile.am
+--- a/search-provider/Makefile.am	2017-02-23 08:43:51.000000000 +0100
++++ b/search-provider/Makefile.am	2017-03-27 23:23:16.103449177 +0200
+@@ -39,21 +39,17 @@
+ service_in_files = org.gnome.Lollypop.SearchProvider.service.in
+ 
+ 
+-appdatadir = $(pkgdatadir)
+-appdata_DATA = lollypop-sp
++libexec_SCRIPTS = lollypop-sp
+ 
+ EXTRA_DIST = \
+         org.gnome.Lollypop.SearchProvider.service.in\
+         lollypop-sp.in\
+-	$(appdata_DATA)\
++	$(libexec_SCRIPTS)\
+ 	$(searchprovider_DATA) \
+ 	$(service_DATA)
+ 
+ CLEANFILES = \
+-        $(appdata_DATA)\
++        $(libexec_SCRIPTS)\
+ 	$(service_DATA)
+ 
+-install-data-hook:
+-	test -f $(pkgdatadir)/$(appdata_DATA) && chmod +x $(pkgdatadir)/$(appdata_DATA); exit 0
+-
+ -include $(top_srcdir)/git.mk
+diff -dNur a/search-provider/org.gnome.Lollypop.SearchProvider.service.in b/search-provider/org.gnome.Lollypop.SearchProvider.service.in
+--- a/search-provider/org.gnome.Lollypop.SearchProvider.service.in	2017-02-23 08:43:51.000000000 +0100
++++ b/search-provider/org.gnome.Lollypop.SearchProvider.service.in	2017-03-27 23:19:03.035317026 +0200
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.gnome.Lollypop.SearchProvider
+-Exec=@pkgdatadir@/lollypop-sp
++Exec=@libexecdir@/lollypop-sp
diff --git a/media-sound/lollypop/lollypop-0.9.230.ebuild b/media-sound/lollypop/lollypop-0.9.230.ebuild
index 567b29d..a93bf0d 100644
--- a/media-sound/lollypop/lollypop-0.9.230.ebuild
+++ b/media-sound/lollypop/lollypop-0.9.230.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python3_4 )
 PYTHON_REQ_USE="sqlite"
 
-inherit gnome2 python-single-r1
+inherit autotools gnome2 python-single-r1
 
 DESCRIPTION="Lollypop is a GNOME music playing application"
 HOMEPAGE="http://gnumdk.github.io/lollypop/"
@@ -38,6 +38,16 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+#PATCHES=(
+#	"${FILESDIR}"/${P}-fix-searchprovider-sandbox-violation.patch
+#)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-searchprovider-sandbox-violation.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
     gnome2_src_configure ITSTOOL="$(type -P true)"
 }