gentoo resync : 15.01.2020

4 files changed, 24 insertions, 22 deletions

diff --git a/x11-misc/bbrun/Manifest b/x11-misc/bbrun/Manifest
index 00ad89b7beab..3a09f6d7cce5 100644
--- a/x11-misc/bbrun/Manifest
+++ b/x11-misc/bbrun/Manifest
@@ -1,5 +1,5 @@
-AUX bbrun-1.6-list.patch 2945 BLAKE2B f8cad837778fb0d197605227d751247b71e14176a6b40ed303d2a8797db84d6e89f9ad13f7c96d9afdffc3e0697ae0c4035792b4c27bf864a057eed98dd4f3a6 SHA512 9cece93b2f75891f12a39f23bafca2ae48c7ef5344b63f7fb0e36c52013ccb236c1c8398eff8a271fbee5661abba561d3152bfee5ee437e3cee42f44f125fde7
-AUX bbrun-1.6-makefile.patch 730 BLAKE2B b70a72c4337059c277e2d4cd221fceb9714e91dd435609a1962bafc9fb02864db67c8aa047fa33a8cfc5f0111521e8ce1649b03f532b36d225459ae32b33427b SHA512 c4f3d4b13fbfd8a13279a3a3cab293b251f5e89b9eedff58bd681729ed571ea4efcbaecedd972706006a263b1140c76addac0b8c6f62f7be9c344f1c12a6dc6a
+AUX bbrun-1.6-list.patch 2699 BLAKE2B dac9b37a925f628da5826388000ce9a3103814ecd1eb77d7077145e5e4911d0c7e9ed2700f4acc4d103faf8b479446e6e36b00d0d7dcb640b6e04e34f415f881 SHA512 718e4f133ce148af5f707cc7f8642a45a81f229d77d7ffc1a522d793167840f0b7c1a673f93ce14ed93315171f1545539264d3de6266a1b4fd258a13e6c12104
+AUX bbrun-1.6-makefile.patch 734 BLAKE2B 18f9a94e6c058c73868268ca9549db555838f11e660de5f89ae0fb661d803b05f4491cd45212dc50f191f6bc743b11d8072ca800874ae4c6b0656e8a7b90acaa SHA512 bcbdef094b7bc223300548dfbcc4a880a9a8e8e76e94cecca6436119b0cb5889f09c35abaf2b8ed41cec86c6ca507cca3de925e0c668ef0d0d9993ef356e3823
 DIST bbrun-1.6.tar.gz 21132 BLAKE2B 77b7cc5d55e6021f2a4347b2600c34f5168ec5fe2edc16fd2cdbb826e4ebf6ec1cb8cca04f2404b7698e6938b20fe588bcb6d70a23bd331b28b9e591cee8aa08 SHA512 7dfa73f90775ff5826b67c977184e617521cc1308f64e1445061e6b16f1cdadc81e3b12d16e1f2cb6ff0b58e59af6608c07dc0cb483c1c60794da3213e0bfe21
-EBUILD bbrun-1.6-r1.ebuild 646 BLAKE2B 66bf76c657050e31b118820ace1f3e0e12c8ceb6709da68907ff9612ba9cd6e71874ba18ff7343a7f2db374eabb3c9d33bdefe14341b5c4f19883d78b691483b SHA512 5dcf48c35ab9443f1bbe02a54247f98e20e9c3fcd0fcf2c63204efa76062b2b2ddb350e30ae69565625c6795db710c8c7a74203b7b623a03d579307494a7b4ac
+EBUILD bbrun-1.6-r1.ebuild 673 BLAKE2B 6422d8b85986c7cca55625035355b43b077d89b0d2a0c651cee45914d4f73e8713c2f822d6e9bdd32eba87e646b06b3d3457c9f6944ef07bde46bd140a4d481d SHA512 c904789a34eb14b9f3ec1cea6d7787329f82e7c77651eb4d11be35285b308031eb269cf34c25ca9018b1f5b1b1e342c1ff43c129813ec6ed4691974ff33cf894
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
index 07fa033e05dc..f9bd99cef70b 100644
--- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="blackbox program execution dialog box"
 HOMEPAGE="http://www.darkops.net/bbrun"
@@ -12,17 +12,21 @@ SRC_URI="http://www.darkops.net/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	x11-libs/libXpm
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-list.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-list.patch
+)
 
 src_compile() {
 	emake -C ${PN} CC="$(tc-getCC)"
diff --git a/x11-misc/bbrun/files/bbrun-1.6-list.patch b/x11-misc/bbrun/files/bbrun-1.6-list.patch
index 654b4f68144e..d487efc3d5a7 100644
--- a/x11-misc/bbrun/files/bbrun-1.6-list.patch
+++ b/x11-misc/bbrun/files/bbrun-1.6-list.patch
@@ -1,6 +1,5 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c	2002-02-05 18:36:19.000000000 +0100
-+++ wmgeneral/list.c	2016-01-04 12:54:39.666670005 +0100
+--- a/wmgeneral/list.c
++++ b/wmgeneral/list.c
 @@ -38,7 +38,7 @@
  
  /* Return a cons cell produced from (head . tail) */
@@ -82,9 +81,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
  list_mapcar(LinkedList* list, void(*function)(void*))
  {
    while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
---- wmgeneral.orig/list.h	2002-02-05 18:36:19.000000000 +0100
-+++ wmgeneral/list.h	2016-01-04 12:54:39.666670005 +0100
+--- a/wmgeneral/list.h
++++ b/wmgeneral/list.h
 @@ -29,31 +29,25 @@
  #ifndef __LIST_H_
  #define __LIST_H_
diff --git a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
index cf89b96df6f3..21e855746d09 100644
--- a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
+++ b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
@@ -2,8 +2,8 @@ Respect {C,LD}FLAGS, fix underlinking
 
 http://bugs.gentoo.org/367853
 
---- bbrun/Makefile
-+++ bbrun/Makefile
+--- a/bbrun/Makefile
++++ b/bbrun/Makefile
 @@ -1,7 +1,7 @@
  CC     = gcc
  LIBDIR = -L/usr/lib -L/usr/X11R6/lib