gentoo resync : 07.10.2018

3 files changed, 9 insertions, 46 deletions

diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 0f2a15e36dee..7b707e80137c 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1,7 +1,6 @@
 AUX fix-missing-gint.patch 629 BLAKE2B 934363d22d7f7fb4eb8f0116418a703d83c50847b249623fe313f007d58a54b99691b611b76b6fcee714d5df9e73d21d25ea4914bd66096cf12e645f28fe703c SHA512 66aaa515cbb7a76f6f87fa527723cc60082ed77efeb02cb8fef784be3ab8a8fbec37ec61d7ff67c4b0cc0074cc281dd238c19cb1fb7686e57bb274b226dc25c9
-DIST pasystray-0.2.1.tar.bz2 100456 BLAKE2B 8cf7aa97a20062dffac59969a7b8d1d71e6fdaafd4e944b2ed3444f50fc1a70ab07f1c3e9c349115c8e50d1bf11093649ee41300590934bc4f71fd752b5aa1c2 SHA512 db7c05c2eb5fd3dada2e3c23f28978497d17a2147078390ab3e8c88654c4bd8ce48d07a15e9a5b3834acffcc2d86fa719ce2403255915bdfb2eb610bd0549041
 DIST pasystray-0.6.0.tar.gz 53835 BLAKE2B ef5abab45a17f6445e8cbd1e37c300aa2c1c25bee3d684d05263b02a507badb1d5ce7a1c76bed94d255e4f2d5e2f18bdfd749e83e98273a52d42ffb12a32f115 SHA512 51fdb5aab22ad10ffe73f6de68115ee1559f09f58cfe4d5201a2f262323ca3476a8b09c7fc02c4144414f44444661edd25d2d39b3de54ed4c662660867da622c
-EBUILD pasystray-0.2.1.ebuild 879 BLAKE2B 978299c671a5e877c78db6903b0a00cd89a6c70964bac36c6e3b0fbbab46b5b1b8b0fefb577308d7a8009602d849080121974ccea3cf20e70a66d0cd2d5219d2 SHA512 f74684712b6d36c901c70c69953b98947eda6e79e88e78e743f0de183bd6253d9bc6d71938ceb9f6bcefd9771783555fff1749cef1f8def7dacc2d559e5ad418
-EBUILD pasystray-0.6.0-r1.ebuild 1043 BLAKE2B 780ca6c4f8585e76acfa5e82d78ac757fc22f501c83b0c21feaa522e3ef13300806080f2b11c434dff71d95449e24fc6d4b0c56679d7b0a582e22c879673246c SHA512 534ffc663633ba4cc9c7f539db311e35dd973ffc08a76b5638dc32e4d48999583e73c94863e1937ac8e66af05816e20de447e557569e86f4e06f043698f7d0b7
+DIST pasystray-0.7.0.tar.gz 56014 BLAKE2B cba947895fc71a18a43c314486ec3513e844b1df426d0104f321c8ecd28199b6b4adf69f5c10146470a74c5e6f74f505833bd00c4541399a162ddcfb8aac4701 SHA512 a98dae85640c0640f921173cf5a794963e974af64a7a972bbc2a53e69060895b55494934bc1fcfd957f0c94ca90e4d52634bf444e841b2a0a57434e05500161b
 EBUILD pasystray-0.6.0-r2.ebuild 1098 BLAKE2B db682d8aeb9c5897bd8cfc636d48c08a9836c6a36c9a04dd7ef1c5b05829ddfdec7b122c2021acf0a8999e9c3c0451aae9f47c5385b06243ff6a69fbda86eeb7 SHA512 6a11e33c0ce6cd4f4272978d2371b219e697c554b32a3596519eb9be7b621d3e5aff01ff308b8e912d53be4d767fc2f9e4ded71bf47244ca2d5379fc43e3c4b7
+EBUILD pasystray-0.7.0.ebuild 1003 BLAKE2B 693733b47c7195d7318c89d38873d1895c674c75246ea67ea2cb82a4da21ec694afe08d062a20f2db710144bca3956ef4236911545fa16c01029ccc264c04621 SHA512 3d2c727b59605700b57e5c13cdb8ac1823b871c3efe57a8bf9ad0284c41dfc11aba99b4fc3aecc22842f612551cc07d1a113585688e9f983a9f75830ce6e0fea
 MISC metadata.xml 635 BLAKE2B 54e8f3a6f865a0caafaf253e37c517e84c5a41414c2456d34780522c25b8998cd50b2306e24d55e9c6c45e4e62bf6fc60e2f5098f63fd23e42778b0b067cb922 SHA512 97fb650bc38171c10b3678940a72b5100874aa84820b962e1b892d82555c8527bf19976076fa0017c400d7955716e7eb4747bcd8cc372198b5c84f6ec4086495
diff --git a/media-sound/pasystray/pasystray-0.2.1.ebuild b/media-sound/pasystray/pasystray-0.2.1.ebuild
deleted file mode 100644
index 3ce386fe140d..000000000000
--- a/media-sound/pasystray/pasystray-0.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnome2-utils
-
-DESCRIPTION="A system tray for pulseaudio controls (replacement for the deprecated padevchooser)"
-HOMEPAGE="https://github.com/christophgysin/pasystray"
-SRC_URI="mirror://github/christophgysin/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND="
-	|| ( >=media-sound/pulseaudio-1.0[glib,avahi] >=media-sound/pulseaudio-5.0-r3[glib,zeroconf] )
-	>=net-dns/avahi-0.6
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README TODO"
-
-src_configure() {
-	econf $(use_enable libnotify notify)
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/pasystray/pasystray-0.6.0-r1.ebuild b/media-sound/pasystray/pasystray-0.7.0.ebuild
index 2730461f08c8..2a40a2718dc9 100644
--- a/media-sound/pasystray/pasystray-0.6.0-r1.ebuild
+++ b/media-sound/pasystray/pasystray-0.7.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2-utils autotools vcs-snapshot xdg
+
+inherit gnome2-utils autotools xdg
 
 DESCRIPTION="PulseAudio system tray"
 HOMEPAGE="https://github.com/christophgysin/pasystray"
@@ -10,20 +11,22 @@ SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="libnotify zeroconf"
 
 RDEPEND="
 	>=dev-libs/glib-2.48.2
 	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
-	zeroconf? ( >=net-dns/avahi-0.6 )
 	x11-libs/gtk+:3
 	x11-libs/libX11
+	zeroconf? ( >=net-dns/avahi-0.6 )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+S=${WORKDIR}/${PN}-${P}
+
 src_prepare() {
 	default
 	eautoreconf
@@ -35,11 +38,6 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update