gentoo (valentine's day) resync : 14.02.2021

3 files changed, 36 insertions, 3 deletions

diff --git a/media-sound/volumeicon/Manifest b/media-sound/volumeicon/Manifest
index d0d84df60752..5fd3ea8dd36e 100644
--- a/media-sound/volumeicon/Manifest
+++ b/media-sound/volumeicon/Manifest
@@ -1,3 +1,4 @@
+AUX volumeicon-0.5.1-fix-libnotify.patch 650 BLAKE2B 899eba04b6959e50807e6728aaffe3c144e484514d9cf3c79e4f886916fe4b6a63847074395a02eb158c6a27f23e8277541438a869f8e883b5323ca29e51a547 SHA512 bfb49e5cac861cb97c40ecc52ab0decfb3e2407ecadb8e1b8d811212798ffd71031fc0a2dbc814001a302dcf326a81cee2cf9027adb629ad397bf000a61dab1b
 DIST volumeicon-0.5.1.tar.gz 172401 BLAKE2B 6638ef0746fff8eab8e4ff80698793ec8cc5ac2152cbe52f61cd06041c3f5f9e690818f885e362009354a768e46d157fc6a82389e87024cc0cd072ec3b50ffe5 SHA512 a96c79f91a8a0ec96f3297af659cf738547bb33e5908edb6b499bcc5081c61339ceaccc3a854a2f953a6f177fe6d8be1578cacab522d8be63a9dda8cf7c7a452
-EBUILD volumeicon-0.5.1-r1.ebuild 677 BLAKE2B e17088fe69455d2e5f02165879004e28a2e67c382028a136a00bc5fdf2b3924e3c255c436f7128773575f13fa10fd3e1ab147519384583376f59555da10827bc SHA512 93f442e2fac1ab27abe20bbda6f09ee8310e41324408250acac05c922a0be88528694e3bb321c6d2ea086d5c91d1126dcd28a2fe5060051da91ce866814d1971
+EBUILD volumeicon-0.5.1-r2.ebuild 798 BLAKE2B ba5599a5d891fda711e6f6ea269954b9b478ad85d3408a9bc75d064804aec0c6a41aebb2541fef9ff0247e6c2dce78b995dc13439a120bc519e1315dd5c024f4 SHA512 dded00caebc6854dd09918855165e519469d8eeaf72faa7f08e3a4d47a6f9bd393c5ba959563a933d9b24bcbbaa04692ea6e4ae381294acbd57eae6f7c25d011
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch b/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch
new file mode 100644
index 000000000000..bdfaa4f11a2d
--- /dev/null
+++ b/media-sound/volumeicon/files/volumeicon-0.5.1-fix-libnotify.patch
@@ -0,0 +1,22 @@
+From 78a9c23775ebe12d3f3be93c0798144a6e732d90 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john.lindgren@aol.com>
+Date: Wed, 30 Dec 2015 20:50:46 -0500
+Subject: [PATCH] Add missing space in NOTIFY_CFLAGS.
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6ad78d5..c8b72bd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,7 +86,7 @@ fi
+ if test "x${notify}" = xyes; then
+ # Check for libnotify
+ PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.5.0])
+-NOTIFY_CFLAGS+="-DCOMPILEWITH_NOTIFY"
++NOTIFY_CFLAGS+=" -DCOMPILEWITH_NOTIFY"
+ AC_SUBST(NOTIFY_CFLAGS)
+ AC_SUBST(NOTIFY_LIBS)
+ fi
diff --git a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild b/media-sound/volumeicon/volumeicon-0.5.1-r2.ebuild
index 9843572f6c72..37b89992df4f 100644
--- a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
+++ b/media-sound/volumeicon/volumeicon-0.5.1-r2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="A lightweight volume control that sits in your systray"
 HOMEPAGE="http://nullwise.com/volumeicon.html"
 SRC_URI="http://nullwise.com/${PN}/${P}.tar.gz"
@@ -19,12 +21,20 @@ RDEPEND="
 	x11-libs/libX11
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-0.5.1-fix-libnotify.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
 	econf $(use_enable libnotify notify)