diff options
Diffstat (limited to 'x11-misc/bbppp')
| -rw-r--r-- | x11-misc/bbppp/bbppp-0.2.5-r1.ebuild | 39 | ||||
| -rw-r--r-- | x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch | 6 | ||||
| -rw-r--r-- | x11-misc/bbppp/files/bbppp-asneeded.patch | 8 | ||||
| -rw-r--r-- | x11-misc/bbppp/metadata.xml | 16 |
4 files changed, 39 insertions, 30 deletions
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild index ec064c74c16f..c0c325534a94 100644 --- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild +++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild @@ -1,41 +1,50 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 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/" -SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/bbtools/${PN}/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -DEPEND="x11-libs/libX11" -RDEPEND="${DEPEND} +COMMON_DEPEND="x11-libs/libX11" +DEPEND="${COMMON_DEPEND} + elibc_musl? ( net-libs/ppp-defs )" +RDEPEND="${COMMON_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 + sed -i \ + -e 's|register ||' \ + Image.cc LinkedList.cc || 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 ef2072faa9af..1aff6b167847 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 7e8c2b8bcfd4..5feb8bcd11c0 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@\ diff --git a/x11-misc/bbppp/metadata.xml b/x11-misc/bbppp/metadata.xml index bc7abb1beac9..e4a916e7d28f 100644 --- a/x11-misc/bbppp/metadata.xml +++ b/x11-misc/bbppp/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - A PPP frontend/monitor for Blackbox. - </longdescription> - <upstream> - <remote-id type="sourceforge">bbtools</remote-id> - </upstream> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">bbtools</remote-id> + </upstream> </pkgmetadata> |