| 1 |
commit: a8b28895cbc0e91bb35738368d8b4ee7086ce18c |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 24 17:40:13 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 24 17:40:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b28895 |
| 7 |
|
| 8 |
x11-misc/bbppp: 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/bbppp/bbppp-0.2.5-r1.ebuild | 28 ++++++++++++---------- |
| 14 |
.../bbppp/files/bbppp-0.2.5-gcc3-multiline.patch | 6 ++--- |
| 15 |
x11-misc/bbppp/files/bbppp-asneeded.patch | 8 +++---- |
| 16 |
3 files changed, 23 insertions(+), 19 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild |
| 19 |
index ec064c74c16..a8e1a0cdbba 100644 |
| 20 |
--- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild |
| 21 |
+++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
-# Copyright 1999-2018 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 autotools eutils |
| 31 |
+inherit autotools |
| 32 |
|
| 33 |
DESCRIPTION="blackbox ppp frontend/monitor" |
| 34 |
HOMEPAGE="https://sourceforge.net/projects/bbtools/" |
| 35 |
@@ -12,30 +12,34 @@ SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz" |
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="amd64 ppc x86" |
| 39 |
-IUSE="" |
| 40 |
|
| 41 |
DEPEND="x11-libs/libX11" |
| 42 |
RDEPEND="${DEPEND} |
| 43 |
media-fonts/font-adobe-100dpi" |
| 44 |
|
| 45 |
-DOCS=( README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbppp ) |
| 46 |
+PATCHES=( |
| 47 |
+ "${FILESDIR}"/${P}-gcc3-multiline.patch |
| 48 |
+ "${FILESDIR}"/${PN}-asneeded.patch |
| 49 |
+ "${FILESDIR}"/${P}-overflows.patch |
| 50 |
+) |
| 51 |
|
| 52 |
src_prepare() { |
| 53 |
- epatch "${FILESDIR}"/${P}-gcc3-multiline.patch \ |
| 54 |
- "${FILESDIR}"/${PN}-asneeded.patch \ |
| 55 |
- "${FILESDIR}"/${P}-overflows.patch |
| 56 |
+ default |
| 57 |
+ mv configure.{in,ac} || die |
| 58 |
eautoreconf |
| 59 |
} |
| 60 |
|
| 61 |
-src_install () { |
| 62 |
+src_install() { |
| 63 |
default |
| 64 |
- rm "${D}"/usr/share/bbtools/README.bbppp |
| 65 |
+ dodoc BUGS data/README.bbppp |
| 66 |
+ |
| 67 |
+ rm "${ED}"/usr/share/bbtools/README.bbppp || die |
| 68 |
} |
| 69 |
|
| 70 |
pkg_postinst() { |
| 71 |
# don't assume blackbox exists because virtual/blackbox is installed |
| 72 |
- if [[ -x ${ROOT}/usr/bin/blackbox ]] ; then |
| 73 |
- if ! grep bbppp "${ROOT}"/usr/bin/blackbox &>/dev/null ; then |
| 74 |
+ if [[ -x ${EROOT}/usr/bin/blackbox ]] ; then |
| 75 |
+ if ! grep bbppp "${EROOT}"/usr/bin/blackbox &>/dev/null ; then |
| 76 |
sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox |
| 77 |
fi |
| 78 |
fi |
| 79 |
|
| 80 |
diff --git a/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch |
| 81 |
index ef2072faa9a..1aff6b16784 100644 |
| 82 |
--- a/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch |
| 83 |
+++ b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch |
| 84 |
@@ -1,5 +1,5 @@ |
| 85 |
---- main.cc |
| 86 |
-+++ main.cc |
| 87 |
+--- a/main.cc |
| 88 |
++++ b/main.cc |
| 89 |
@@ -24,25 +24,24 @@ |
| 90 |
|
| 91 |
void Usage() |
| 92 |
@@ -19,7 +19,7 @@ |
| 93 |
- -com[pact] Display buttons in compact style\n\ |
| 94 |
- -notime Dont display time window\n\ |
| 95 |
- -nosecs Show uptime in old-style hh:mm format\n\n"}; |
| 96 |
-+ char* usageOptions = {"Options:\n" |
| 97 |
++ const char* usageOptions = {"Options:\n" |
| 98 |
+ "-display <display name> X server to connect to\n" |
| 99 |
+ "-c[onfig] <filename> Alternate config file\n" |
| 100 |
+ "-n[obb] Fall back on default configuration\n" |
| 101 |
|
| 102 |
diff --git a/x11-misc/bbppp/files/bbppp-asneeded.patch b/x11-misc/bbppp/files/bbppp-asneeded.patch |
| 103 |
index 7e8c2b8bcfd..5feb8bcd11c 100644 |
| 104 |
--- a/x11-misc/bbppp/files/bbppp-asneeded.patch |
| 105 |
+++ b/x11-misc/bbppp/files/bbppp-asneeded.patch |
| 106 |
@@ -2,8 +2,8 @@ Fixing build with as-needed |
| 107 |
|
| 108 |
https://bugs.gentoo.org/show_bug.cgi?id=248552 |
| 109 |
|
| 110 |
---- configure.in |
| 111 |
-+++ configure.in |
| 112 |
+--- a/configure.in |
| 113 |
++++ b/configure.in |
| 114 |
@@ -86,14 +86,9 @@ |
| 115 |
AC_PATH_X |
| 116 |
AC_PATH_XTRA |
| 117 |
@@ -21,8 +21,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=248552 |
| 118 |
|
| 119 |
dnl Checks for header files. |
| 120 |
AC_HEADER_STDC |
| 121 |
---- Makefile.am |
| 122 |
-+++ Makefile.am |
| 123 |
+--- a/Makefile.am |
| 124 |
++++ b/Makefile.am |
| 125 |
@@ -1,4 +1,4 @@ |
| 126 |
-CPPFLAGS = @CPPFLAGS@ @INTERLACE@ @ISDN@\ |
| 127 |
+AM_CPPFLAGS = @INTERLACE@ @ISDN@\ |
Archives