commit: a8b28895cbc0e91bb35738368d8b4ee7086ce18c Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Dec 24 17:40:13 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Dec 24 17:40:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b28895
x11-misc/bbppp: Port to EAPI 7 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: David Seifert <soap <AT> gentoo.org> x11-misc/bbppp/bbppp-0.2.5-r1.ebuild | 28 ++++++++++++---------- .../bbppp/files/bbppp-0.2.5-gcc3-multiline.patch | 6 ++--- x11-misc/bbppp/files/bbppp-asneeded.patch | 8 +++---- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild index ec064c74c16..a8e1a0cdbba 100644 --- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild +++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit autotools eutils +inherit autotools DESCRIPTION="blackbox ppp frontend/monitor" HOMEPAGE="https://sourceforge.net/projects/bbtools/"; @@ -12,30 +12,34 @@ SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" DEPEND="x11-libs/libX11" RDEPEND="${DEPEND} media-fonts/font-adobe-100dpi" -DOCS=( README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbppp ) +PATCHES=( + "${FILESDIR}"/${P}-gcc3-multiline.patch + "${FILESDIR}"/${PN}-asneeded.patch + "${FILESDIR}"/${P}-overflows.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-gcc3-multiline.patch \ - "${FILESDIR}"/${PN}-asneeded.patch \ - "${FILESDIR}"/${P}-overflows.patch + default + mv configure.{in,ac} || die eautoreconf } -src_install () { +src_install() { default - rm "${D}"/usr/share/bbtools/README.bbppp + dodoc BUGS data/README.bbppp + + rm "${ED}"/usr/share/bbtools/README.bbppp || die } pkg_postinst() { # don't assume blackbox exists because virtual/blackbox is installed - if [[ -x ${ROOT}/usr/bin/blackbox ]] ; then - if ! grep bbppp "${ROOT}"/usr/bin/blackbox &>/dev/null ; then + if [[ -x ${EROOT}/usr/bin/blackbox ]] ; then + if ! grep bbppp "${EROOT}"/usr/bin/blackbox &>/dev/null ; then sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox fi fi 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 index ef2072faa9a..1aff6b16784 100644 --- a/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch +++ b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch @@ -1,5 +1,5 @@ ---- main.cc -+++ main.cc +--- a/main.cc ++++ b/main.cc @@ -24,25 +24,24 @@ void Usage() @@ -19,7 +19,7 @@ - -com[pact] Display buttons in compact style\n\ - -notime Dont display time window\n\ - -nosecs Show uptime in old-style hh:mm format\n\n"}; -+ char* usageOptions = {"Options:\n" ++ const char* usageOptions = {"Options:\n" + "-display <display name> X server to connect to\n" + "-c[onfig] <filename> Alternate config file\n" + "-n[obb] Fall back on default configuration\n" diff --git a/x11-misc/bbppp/files/bbppp-asneeded.patch b/x11-misc/bbppp/files/bbppp-asneeded.patch index 7e8c2b8bcfd..5feb8bcd11c 100644 --- a/x11-misc/bbppp/files/bbppp-asneeded.patch +++ b/x11-misc/bbppp/files/bbppp-asneeded.patch @@ -2,8 +2,8 @@ Fixing build with as-needed https://bugs.gentoo.org/show_bug.cgi?id=248552 ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -86,14 +86,9 @@ AC_PATH_X AC_PATH_XTRA @@ -21,8 +21,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=248552 dnl Checks for header files. AC_HEADER_STDC ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -1,4 +1,4 @@ -CPPFLAGS = @CPPFLAGS@ @INTERLACE@ @ISDN@\ +AM_CPPFLAGS = @INTERLACE@ @ISDN@\
