gentoo resync : 25.08.2020

3 files changed, 187 insertions, 0 deletions

diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 9cb0c2ca416a..0360031d90b3 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -2,8 +2,10 @@ AUX fbpanel-6.1-underlinking.patch 789 BLAKE2B f0995b59f54eb5da7a7b74d470604abae
 AUX fbpanel-7.0-clang.patch 2596 BLAKE2B cb9e42fb7afaf007d49c54270ee6e09a551ee5c538d82b4cf4eb1c79663b6bc517e3d4da0117c4fbc5030df0c907289ef843cf59ca3dec69ba8f5ad3e8a1aab5 SHA512 78dfea33f3a29b857768b64bc6ea61404dee3cb75587500e98e17aeecf92a310abf1796577d433e13aab4a5524ce2400906d0e6ce2ab468a488dbae03857902f
 AUX fbpanel-7.0-fno-common.patch 440 BLAKE2B ef20f4055b21b77f15e1946a3c94eb7dd1a74f85922ebd0059b74b7503467930b352888768948f0ca46c2966103b65b746bd2c095c03f77af7859d27bcaf3013 SHA512 a62c4514749d26bd2e77d5d0ed1eae3f83af765957ec5d5e94679f9787db3eadf192eccadfcb67dc087688d6d59303cd1f6ff0448dbca11dc8524cd3079c1d4c
 AUX fbpanel-7.0-images.patch 274 BLAKE2B f587453d0e66c5fb8c93ad936dbf1cd1291d6dd652dde29f6e995947663eae8f20da3f022e494bbc6406db48ed3acdc71a38d973638b6ec11fb63e7117efd41a SHA512 432884c3d397c24e28e909bb3626ebd29ce3023c4e1aa68ccc9defdd81b59e29f72e8d090b54a04e501852b6cda91b1e8157e49092c7562184d787c8085f3ec0
+AUX fbpanel-7.0-python3-shebangs.patch 2348 BLAKE2B 84c05bb718b5754d2679fa2b1807c9a0207058d5338dc59eb65643797d6aecc31f52eaf0134b26a3a4fa5364337fa577a641f05d58401441e14faca7ce83b0c5 SHA512 6791c1cd963f40db8df88b4758464fe99f308990ab86ee2e91c6e36c2e4f8ccf935275074352d432078ab4c3f8fb07f3535af43fb2627e0904153be087a5992e
 AUX fbpanel-7.0-shebangs.patch 2348 BLAKE2B 8a68eb84f0d4c28e23483724c2600e10375e6bd96bbe640f6d1ff4ef47c17ae140873229e95322de2fd825cf5dd54d6eca6a08a4058e70d3b185f4f8b1d3440f SHA512 547367bc298548b0936e4b83e8ddccc9c9e689f5aac8a7aac1ef5e09050ce33936dba4c39d971c4f3ff5065daa55bc28989588cb08e8277ca9e201ca6994eec7
 DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
 EBUILD fbpanel-7.0-r1.ebuild 1427 BLAKE2B 08a3742360ffe73505eb75d96aa64d662f935ce88a1ebece48bcb5c6f862920d5636fc7ebbcf752cebc7e3bdc9a6fd77c311ded7b9a8786d63278a16838558e3 SHA512 3161ec424feebf681fbae71432207348d0a41d834e8f7bbaca834b4e5c827206525d1841dffc129225b8e6a3a8693157ed9dd4610f2becd03e0e28b201a88a76
+EBUILD fbpanel-7.0-r2.ebuild 1533 BLAKE2B 2f5d874331e3618056974297856dc1a0868cf61d54095d44adf60fceaebd45774be2fa5d1a4fc41ef28d1e0970196c9a2ad31f69d0e3e0b7c4054e9b8f14cad5 SHA512 e22fac287617a349c1e80e4adc16bedf6d3bc2e0a73bc543ba0389d801c7f3a9c714c0710bfa44c1adde58a0b0736dc582f7fdd9135f17a35173ddf6e6bc9971
 EBUILD fbpanel-7.0.ebuild 1334 BLAKE2B 2bc40160ddc4e6b4543527fb273ec0006a06006fb2571294c5d5a87be1c39bc26d688479bc78bc135cf8482edf7d91a3baf5a380c2f6e493f8595f405dcb9314 SHA512 e5506238b3c62e5e3ce86d3b75883f6dee9e6a87fa1fddea8ca8163ccc71116e2d4080d0fb636b4e9302d135dff013e4c7fea2a7594d36b0e3ee923d907fa57e
 MISC metadata.xml 421 BLAKE2B bec71cdd70517d1087d289c1124ed74c9540601d34de83aef4e2d45c0c3c1d3c6f6cef080edd7dd6641f146752c81a12a5c34658f8f097b940bf67ea9c024a96 SHA512 6e50dcf1443603726214701d8187864db64227db01b5c19f630d703864faec0d4692a5967a6286bd5fcd0b4762997a2bcb8ad6d4742ae5b2dc33bfe38d808fbe
diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
new file mode 100644
index 000000000000..b122768dea13
--- /dev/null
+++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="light-weight X11 desktop panel"
+HOMEPAGE="https://aanatoly.github.io/fbpanel/"
+SRC_URI="https://aanatoly.github.io/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2[X]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	alsa? ( media-libs/alsa-lib )
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-underlinking.patch
+	"${FILESDIR}"/${PN}-7.0-clang.patch
+	"${FILESDIR}"/${PN}-7.0-fno-common.patch
+	"${FILESDIR}"/${PN}-7.0-images.patch
+	"${FILESDIR}"/${PN}-7.0-python3-shebangs.patch
+)
+
+src_prepare() {
+	default
+	2to3 -n -w --no-diffs configure .config/*.py || die
+}
+
+src_configure() {
+	tc-export CC
+	# not autotools based
+	local myconfigure=(
+		./configure V=1
+		--mandir="${EPREFIX}"/usr/share/man/man1
+		--datadir="${EPREFIX}"/usr/share/${PN}
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
+		$(usex alsa --sound --no-sound)
+	)
+	echo ${myconfigure[@]} || die
+	${myconfigure[@]} || die
+}
+
+pkg_postinst() {
+	elog "For the volume plugin to work, you need to configure your kernel"
+	elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means"
+	elog "that provide the /dev/mixer device node."
+}
diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch b/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch
new file mode 100644
index 000000000000..5f98657b42c2
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-7.0-python3-shebangs.patch
@@ -0,0 +1,120 @@
+--- a/.config/help
++++ b/.config/help
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ 
+ import re, os, sys, textwrap
+ # Formats help message
+--- a/.config/repl.py
++++ b/.config/repl.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ 
+ import re, sys
+ 
+--- a/.config/tar.py
++++ b/.config/tar.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ 
+ import subprocess as sp
+ import re, tempfile
+--- a/configure
++++ b/configure
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ 
+ import sys
+ if sys.version_info < (2, 7):
+--- a/exec/make_profile.in
++++ b/exec/make_profile.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ umask 0077
+ # new profile directory
+--- a/exec/xlogout
++++ b/exec/xlogout
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ # xlogout - logs user out of its X session
+ # Linux specific since uses /proc
+--- a/scripts/endianess.sh
++++ b/scripts/endianess.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ # When cross compiling, you may put cross compiler directory 
+ # in PATH before native gcc (aka spoofing), or you may set CC 
+--- a/scripts/install_locale.sh
++++ b/scripts/install_locale.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ dir=/tmp/lo-$$
+ mkdir $dir
+--- a/scripts/install_locale.sh.in
++++ b/scripts/install_locale.sh.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ dir=/tmp/lo-$$
+ mkdir $dir
+--- a/scripts/install.sh
++++ b/scripts/install.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ usage () 
+ {
+--- a/scripts/mk_tar
++++ b/scripts/mk_tar
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ 
+ function info()
+--- a/scripts/rfs-pkg-config
++++ b/scripts/rfs-pkg-config
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ # Tt runs pkg-config in a way that everything is searched under RFS
+ # but reported including full path. Suitable for cross-compiling
+--- a/scripts/update-proj.sh
++++ b/scripts/update-proj.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ 
+ function usage () 
+ {
+--- a/www/plugins/mk_gallery
++++ b/www/plugins/mk_gallery
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env sh
+ 
+ echo > "$1"
+ #echo '<table cellpadding="0" cellspacing="0" border="0" align="left" bgcolor="#ffffff">' >> "$1"
+--- a/www/shots/mk_gallery
++++ b/www/shots/mk_gallery
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env sh
+ 
+ function help ()
+ {