gentoo (valentine's day) resync : 14.02.2021

7 files changed, 16 insertions, 107 deletions

diff --git a/x11-misc/i3blocks/Manifest b/x11-misc/i3blocks/Manifest
index d8c7b5ca340a..b76843e16d1d 100644
--- a/x11-misc/i3blocks/Manifest
+++ b/x11-misc/i3blocks/Manifest
@@ -1,8 +1,4 @@
-AUX i3blocks-default-sysconfdir.patch 373 BLAKE2B 4483b6c4e838559997acff86c46a879206decc0e834bd92cf8573eab28f5ce3ec74f186ce53fe3e2a69f8e7006265ce956f677470828f8b3e1bc40b5ab925abe SHA512 db974877a1eadb1b37279dd4e4159b47947958f688aed94dd3e3c49457a94a0e5d803f221dc7a160ed2cfdc915399892d010a1083a49a7ba7a53d49572c16554
-AUX i3blocks-disable-bash-completion.patch 468 BLAKE2B f4a2777bfb42468abaa79762470f871848f76e252de030792a8365656ba683095eb90c95c9f45ab4e250877bade39ee9a89acc067799138b08ac565661af46bb SHA512 cdb9cdf0103d7609f67ec7df80b725e32dc88a90d8b964d2da6d257e2bb3c67ab5a5a7fd99253c713535860752c52741e97982b4b862e88f99ba0bc634eb23b4
-DIST i3blocks-1.4.tar.gz 35943 BLAKE2B 84c1d08d173238ecd875254015dc78cb560cefb1eb11d9628dc8572fb44f9724927e622aecc9888c43fdc435df8b07f6b07e22c4543354edb2d92cc8d5d00321 SHA512 f04fd68d59097b21bc88f3097dff137de656dd3fa696d9c04b987ba25136e5e5d9cacb63998e8635fe55fcf94f47900aec8c79d98e1d1d8847856a89ad9a6578
+AUX i3blocks-disable-bash-completion.patch 396 BLAKE2B 1ed07e8bc335117e4dcbf048efadea33306575f706bb88006cd5528158ff9ddcf373202fa4f5d007de69d5694c3521137d23ae108b825123f72858fa4f3d724a SHA512 b388bbaf394f791f052cfe3cda97f9c69b36fe30cee3954df27888585285abe22c6d21d8d2f611467583581d153d00f55477a3458b46d9b741662ace16a00d5c
 DIST i3blocks-1.5.tar.gz 66019 BLAKE2B 0378dac61d2f0049dffefe2a3f98512518aef311f2d9d79b72fd9882834c6a09c8954e7ca906fb96bbcc76992288fe659b4977f2cfad1234dca27ec9131ac720 SHA512 759829d59f94070251378d437891c2df05715fbd0b734c34dd41767d61957f301c6125b0058668295b8eeac29038fae6b2e8c194f903398ee736662213d1d534
-EBUILD i3blocks-1.4-r1.ebuild 769 BLAKE2B 871a9eb5cf632c053ed5795047fa1b87b8a16519e9892a96f6ceab764b28c4b2808cbc28afe9f869fe9868a8ccc295ed65b87d38c74dd81d1e9beb771174b104 SHA512 a54bd1cbf1464eb5b7ddd72d1926aec330943602bdc346ab4e74ae5c4030365566dca85d9afda23760a8e66514fcda6172b7171fa063672c9db61d7428aebfa2
-EBUILD i3blocks-1.5-r1.ebuild 765 BLAKE2B c5f8ee3ed8bdda27469431b703e9194d81c6acbe7f1772d05e100a7ac150ab7b30d274224c620a82e409c3146d6eb760ccf0f9b7f61e75f6d6083cac922a3c74 SHA512 40a1abe1ee905d463bdcf8db3f5ff602b910fe8ef9fce5bd436c6733f96c8873338a65f914a84b85a335f584423624657ec1d16ffd0dc143b2f9f78725da00ef
-EBUILD i3blocks-1.5.ebuild 699 BLAKE2B 2ca090318052d5c5fcf03d5b0b4ed896217a81194800cf07c00f7c8d47c79424438678eef5d5b1fb7b1c6c0d4982fbc4277dfdf8f4f417a8939b2ea775594d60 SHA512 7693bce42f2959023b3601e4f10da5ec2351e85bb4271a2192a14eabb45f6515a57ad21ddfe4931019b1d7109691ee544d595bc27ae8a3d68abe4b59bae34058
-MISC metadata.xml 400 BLAKE2B 306658e11cb2e3dbefbb4f79cb3d41137a9f70d2a2ad9e63dcb90d1663a3b3d3220a09f3a29ef451a4191f73ccca8294dbd96225da5c13f2186f6e1ddc8dbfe1 SHA512 43531d6c06327673e8cdf74fee209b01dc17d1c50f54a24a793fdbffde4069694502da52013ceae37dfd57c52bcafef530a36746d46e2931aba93c2673647d07
+EBUILD i3blocks-1.5-r1.ebuild 633 BLAKE2B 6f8faffed53680ba459deddd5153d5acb43602c57cb6fac17400c9b2373e5b153d48e997944925c68824f9f008c4256930e09d65171b8d897dd7ec05b0d77133 SHA512 0ccd2efd114bb3be218a094170647048c417811727ccddba89e489e3bcdc82db3249a2461080133b09309d37c11a570c5e647a1e3ae8cd86e1cec0caf4987b19
+MISC metadata.xml 517 BLAKE2B 815d06199e095adf685affa065ac859489993b5d50e375f55b1fd07bd3ca87b8ddb7f1430165a6a63cf61687af7f5b73528271ea5dfd89e42a5ac7f025c0512d SHA512 4a8a2b029c9c4af79740990325ae978989c0a7623b235951f657cf390ed40051931bfd6763d6887c49c9ee6f3c84c8bce3e51083a24cdcb04422bb056a71bb21
diff --git a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch b/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch
deleted file mode 100644
index 04d625dcb47f..000000000000
--- a/x11-misc/i3blocks/files/i3blocks-default-sysconfdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- i3blocks-1.4/~Makefile	2017-02-20 18:56:06.340061271 +0100
-+++ i3blocks-1.4/Makefile	2017-02-20 18:56:27.518915055 +0100
-@@ -4,11 +4,7 @@ ifndef PREFIX
-   PREFIX=/usr/local
- endif
- ifndef SYSCONFDIR
--  ifeq ($(PREFIX),/usr)
--    SYSCONFDIR=/etc
--  else
--    SYSCONFDIR=$(PREFIX)/etc
--  endif
-+  SYSCONFDIR=/etc
- endif
- ifndef LIBEXECDIR
-   LIBEXECDIR=$(PREFIX)/libexec
diff --git a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch
index bfca548e06f1..bc7c065eea8e 100644
--- a/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch
+++ b/x11-misc/i3blocks/files/i3blocks-disable-bash-completion.patch
@@ -1,5 +1,5 @@
---- a/Makefile.am	2019-10-20 22:46:55.603462157 +0200
-+++ b/Makefile.am	2019-10-20 22:47:29.893461028 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -29,14 +29,3 @@
  
  dist_sysconf_DATA = \
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
deleted file mode 100644
index ce2f86de762d..000000000000
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="highly flexible status line for the i3 window manager"
-HOMEPAGE="https://github.com/vivien/i3blocks"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vivien/${PN}"
-else
-	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-RDEPEND="app-admin/sysstat
-	media-sound/playerctl
-	sys-apps/lm-sensors
-	sys-power/acpi
-	|| ( x11-wm/i3 x11-wm/i3-gaps )"
-
-DEPEND="app-text/ronn"
-
-PATCHES=( "${FILESDIR}/${PN}-default-sysconfdir.patch" ) #610090
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
-}
diff --git a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
index 0ff32627916e..8bd169120d36 100644
--- a/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
@@ -5,22 +5,14 @@ EAPI=7
 
 inherit autotools bash-completion-r1
 
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
 DESCRIPTION="highly flexible status line for the i3 window manager"
 HOMEPAGE="https://github.com/vivien/i3blocks"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vivien/${PN}"
-else
-	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
+SRC_URI="https://github.com/vivien/i3blocks/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-IUSE="+contrib"
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="+contrib"
 
 PDEPEND="contrib? ( x11-misc/i3blocks-contrib )"
 
diff --git a/x11-misc/i3blocks/i3blocks-1.5.ebuild b/x11-misc/i3blocks/i3blocks-1.5.ebuild
deleted file mode 100644
index 9922b9524a99..000000000000
--- a/x11-misc/i3blocks/i3blocks-1.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="highly flexible status line for the i3 window manager"
-HOMEPAGE="https://github.com/vivien/i3blocks"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/vivien/${PN}"
-else
-	SRC_URI="https://github.com/vivien/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-PATCHES=( "${FILESDIR}"/${PN}-disable-bash-completion.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	newbashcomp bash-completion ${PN}
-}
diff --git a/x11-misc/i3blocks/metadata.xml b/x11-misc/i3blocks/metadata.xml
index 2e726d1c36a9..fbf0521c46d6 100644
--- a/x11-misc/i3blocks/metadata.xml
+++ b/x11-misc/i3blocks/metadata.xml
@@ -1,9 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">vivien/i3blocks</remote-id>