| 1 |
commit: 81ce470c8ce8d8a04d089228a1bb0b7ef4df4493 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 24 17:40:14 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 24 17:40:14 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ce470c |
| 7 |
|
| 8 |
x11-misc/bbrun: Port to EAPI 7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.82, Repoman-2.3.20 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-misc/bbrun/bbrun-1.6-r1.ebuild | 26 +++++++++++++++----------- |
| 14 |
x11-misc/bbrun/files/bbrun-1.6-list.patch | 10 ++++------ |
| 15 |
x11-misc/bbrun/files/bbrun-1.6-makefile.patch | 4 ++-- |
| 16 |
3 files changed, 21 insertions(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild |
| 19 |
index 07fa033e05d..f9bd99cef70 100644 |
| 20 |
--- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild |
| 21 |
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
-# Copyright 1999-2016 Gentoo Foundation |
| 24 |
+# Copyright 1999-2019 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=4 |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
-inherit eutils toolchain-funcs |
| 31 |
+inherit toolchain-funcs |
| 32 |
|
| 33 |
DESCRIPTION="blackbox program execution dialog box" |
| 34 |
HOMEPAGE="http://www.darkops.net/bbrun" |
| 35 |
@@ -12,17 +12,21 @@ SRC_URI="http://www.darkops.net/${PN}/${P}.tar.gz" |
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="amd64 ppc x86" |
| 39 |
-IUSE="" |
| 40 |
|
| 41 |
-RDEPEND="x11-libs/gtk+:2" |
| 42 |
-DEPEND="${RDEPEND} |
| 43 |
- x11-libs/libXpm |
| 44 |
+RDEPEND=" |
| 45 |
+ dev-libs/glib:2 |
| 46 |
+ x11-libs/gtk+:2 |
| 47 |
+ x11-libs/libX11 |
| 48 |
+ x11-libs/libXext |
| 49 |
+ x11-libs/libXpm" |
| 50 |
+DEPEND="${RDEPEND}" |
| 51 |
+BDEPEND=" |
| 52 |
virtual/pkgconfig" |
| 53 |
|
| 54 |
-src_prepare() { |
| 55 |
- epatch "${FILESDIR}"/${P}-makefile.patch |
| 56 |
- epatch "${FILESDIR}"/${P}-list.patch |
| 57 |
-} |
| 58 |
+PATCHES=( |
| 59 |
+ "${FILESDIR}"/${P}-makefile.patch |
| 60 |
+ "${FILESDIR}"/${P}-list.patch |
| 61 |
+) |
| 62 |
|
| 63 |
src_compile() { |
| 64 |
emake -C ${PN} CC="$(tc-getCC)" |
| 65 |
|
| 66 |
diff --git a/x11-misc/bbrun/files/bbrun-1.6-list.patch b/x11-misc/bbrun/files/bbrun-1.6-list.patch |
| 67 |
index 654b4f68144..d487efc3d5a 100644 |
| 68 |
--- a/x11-misc/bbrun/files/bbrun-1.6-list.patch |
| 69 |
+++ b/x11-misc/bbrun/files/bbrun-1.6-list.patch |
| 70 |
@@ -1,6 +1,5 @@ |
| 71 |
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c |
| 72 |
---- wmgeneral.orig/list.c 2002-02-05 18:36:19.000000000 +0100 |
| 73 |
-+++ wmgeneral/list.c 2016-01-04 12:54:39.666670005 +0100 |
| 74 |
+--- a/wmgeneral/list.c |
| 75 |
++++ b/wmgeneral/list.c |
| 76 |
@@ -38,7 +38,7 @@ |
| 77 |
|
| 78 |
/* Return a cons cell produced from (head . tail) */ |
| 79 |
@@ -82,9 +81,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c |
| 80 |
list_mapcar(LinkedList* list, void(*function)(void*)) |
| 81 |
{ |
| 82 |
while(list) |
| 83 |
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h |
| 84 |
---- wmgeneral.orig/list.h 2002-02-05 18:36:19.000000000 +0100 |
| 85 |
-+++ wmgeneral/list.h 2016-01-04 12:54:39.666670005 +0100 |
| 86 |
+--- a/wmgeneral/list.h |
| 87 |
++++ b/wmgeneral/list.h |
| 88 |
@@ -29,31 +29,25 @@ |
| 89 |
#ifndef __LIST_H_ |
| 90 |
#define __LIST_H_ |
| 91 |
|
| 92 |
diff --git a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch |
| 93 |
index cf89b96df6f..21e855746d0 100644 |
| 94 |
--- a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch |
| 95 |
+++ b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch |
| 96 |
@@ -2,8 +2,8 @@ Respect {C,LD}FLAGS, fix underlinking |
| 97 |
|
| 98 |
http://bugs.gentoo.org/367853 |
| 99 |
|
| 100 |
---- bbrun/Makefile |
| 101 |
-+++ bbrun/Makefile |
| 102 |
+--- a/bbrun/Makefile |
| 103 |
++++ b/bbrun/Makefile |
| 104 |
@@ -1,7 +1,7 @@ |
| 105 |
CC = gcc |
| 106 |
LIBDIR = -L/usr/lib -L/usr/X11R6/lib |
Archives