gentoo resync : 15.12.2019

4 files changed, 2 insertions, 68 deletions

diff --git a/media-sound/volumeicon/Manifest b/media-sound/volumeicon/Manifest
index 0554bd5e1201..d0d84df60752 100644
--- a/media-sound/volumeicon/Manifest
+++ b/media-sound/volumeicon/Manifest
@@ -1,6 +1,3 @@
-AUX volumeicon-0.4.6-glib-2.31.patch 649 BLAKE2B 1d9605a0cd6e122a6f38e6d056233264fb1f25261fb4111e17e5f09e0c326fb55015b6804fcb6166bedb7947304615214f2ac87c44695a92e70db8addbc06a6e SHA512 6b11df00cbe09d5152a111dc3788e2f9acae83879cb81277265c5ad727e454f00014aaa9d75d0cd1ffe402a2a85801fab9d3ccce1399a8ba1bc5752997f0c65b
-DIST volumeicon-0.4.6.tar.gz 136769 BLAKE2B 3044843571052b9e543279435e090d81f2a675495c4563458141327a6a542ea65dd8323058beec1ebe80fbb42ac5a439b39c95ea5b63cb4ec0c302fddc6b7833 SHA512 f5b649a113270a417046532ec9b80e738afe1275ce919a8a7adafbac05cdf58f9454a5386d3304cce652a90e63bc5297fa8cd5b369e0f1149c898483cbfe2f71
 DIST volumeicon-0.5.1.tar.gz 172401 BLAKE2B 6638ef0746fff8eab8e4ff80698793ec8cc5ac2152cbe52f61cd06041c3f5f9e690818f885e362009354a768e46d157fc6a82389e87024cc0cd072ec3b50ffe5 SHA512 a96c79f91a8a0ec96f3297af659cf738547bb33e5908edb6b499bcc5081c61339ceaccc3a854a2f953a6f177fe6d8be1578cacab522d8be63a9dda8cf7c7a452
-EBUILD volumeicon-0.4.6.ebuild 774 BLAKE2B cfddaabcfc08da4f95d45e739f1d12ea6925ebe51b7bfa8805f8631685a7ddad9454835de5ce9bd8526646fff0f814cfc5f8ac8c9ae0903e300450cedb69b148 SHA512 0d8635e822f5053b0cfd1ab15e045eaa787d179fe7311145cc839b437507ff88304e55e185a5ce78a510f0af25e677f2e6a35b0045869457334dd8b3f813b33a
-EBUILD volumeicon-0.5.1-r1.ebuild 678 BLAKE2B 06c404d234fe0911ada7d2e481715df34d4278c4800ddc95b087659b9b1676335de9e6dbbb163fdff6679b3d4aea6ca42306a0bf52c0eb367c65cbe425446e29 SHA512 3c63b16fa3b558a477bca8710146e93622f0ec4c0346b99499300dde878edd62324ee23959fe329b1d72d4885fc2584ce487718f906e287cde56711348d37e11
+EBUILD volumeicon-0.5.1-r1.ebuild 677 BLAKE2B e17088fe69455d2e5f02165879004e28a2e67c382028a136a00bc5fdf2b3924e3c255c436f7128773575f13fa10fd3e1ab147519384583376f59555da10827bc SHA512 93f442e2fac1ab27abe20bbda6f09ee8310e41324408250acac05c922a0be88528694e3bb321c6d2ea086d5c91d1126dcd28a2fe5060051da91ce866814d1971
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch b/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch
deleted file mode 100644
index 6eeda5135f34..000000000000
--- a/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/412473
-
---- src/alsa_backend.c
-+++ src/alsa_backend.c
-@@ -22,10 +22,8 @@
- //##############################################################################
- 
- #include <alsa/asoundlib.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
--#include <glib/glist.h>
--#include <glib/giochannel.h>
- 
- #include "alsa_backend.h"
- 
---- src/oss_backend.c
-+++ src/oss_backend.c
-@@ -26,10 +26,8 @@
- #include <fcntl.h>
- #include <assert.h>
- #include <stdlib.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
--#include <glib/glist.h>
--#include <glib/giochannel.h>
- 
- #include "oss_backend.h"
- 
diff --git a/media-sound/volumeicon/volumeicon-0.4.6.ebuild b/media-sound/volumeicon/volumeicon-0.4.6.ebuild
deleted file mode 100644
index 9abb83f16dcc..000000000000
--- a/media-sound/volumeicon/volumeicon-0.4.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A lightweight volume control that sits in your systray"
-HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
-SRC_URI="http://softwarebakery.com/maato/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libnotify"
-
-RDEPEND=">=dev-libs/glib-2
-	media-libs/alsa-lib
-	>=x11-libs/gtk+-2.16:2
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glib-2.31.patch
-}
-
-src_configure() {
-	# --enable-oss --with-oss-include-path=/usr/include/sys #419891
-	econf $(use_enable libnotify notify)
-}
diff --git a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild b/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
index 05daf8638a3b..9843572f6c72 100644
--- a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
+++ b/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://nullwise.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libnotify"
 
 RDEPEND="