diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
| commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
| tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /x11-misc/bbppp | |
| parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) | |
gentoo resync : 15.01.2020
Diffstat (limited to 'x11-misc/bbppp')
| -rw-r--r-- | x11-misc/bbppp/Manifest | 6 | ||||
| -rw-r--r-- | x11-misc/bbppp/bbppp-0.2.5-r1.ebuild | 28 | ||||
| -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 |
4 files changed, 26 insertions, 22 deletions
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest index 610d01b3fe38..9ef0a4947ebe 100644 --- a/x11-misc/bbppp/Manifest +++ b/x11-misc/bbppp/Manifest @@ -1,6 +1,6 @@ -AUX bbppp-0.2.5-gcc3-multiline.patch 2749 BLAKE2B 78e2a36cd3fd05fcc4b1804037f73f63b27f1296e7e2958ad3514906b38e35438b4f311931c3646f981da5b819b7a240094c9ba1131d739338fb8f6923034874 SHA512 123c119dabd8be474abc28e8584c9d537bf299472806d168b67e9fb5daa010cdf3555d777c3a4e4c9b5b21dfe6d012a929ba600af928406edc37dcaa4ad8e424 +AUX bbppp-0.2.5-gcc3-multiline.patch 2759 BLAKE2B 883dc1f412f6b3c7bd33b95d27dd7971018a1c62394a025657a3e02d0106d52317bf40ebcaa4a155c1419debd4342d0d5ea15c28e69942fd956b1788feb7a24f SHA512 736eb14dd7eb027e2a7c2a1cab73bba3a59410a502e6f6670617ca85b40cb64f01291a6882de5081f7847c97ab7db18a0bd7edb130432b78138da288cb1e8da7 AUX bbppp-0.2.5-overflows.patch 453 BLAKE2B 45dcee17e6d725b3ba2e2197a75139d5b8dd86ae7b706f88069eda2ef1cf29236fc878a8de363904e88d4269302f9f9c6c49bf0ac2de607df3feeb53656a5420 SHA512 044755d73415d171ec2e0c61fe0affea912ab40dedd567f3e4f29938ca97825c1ab36be9bea50dc7c40227a06e5e2ea2541d0cdf71e5dc8013fef38a6db920eb -AUX bbppp-asneeded.patch 1054 BLAKE2B b12c871818b5a26cd8f710ee7ee682fb652d8e7c138f4c9e9574f3beff30c2627d573aff393e473057179f006570005cded6ed4ea6d51c7b1a8ce1c0fabb8845 SHA512 96d243ce1b372d718649a8c4d1e14b3210f8e679aa1c6a5dfeb373aced866676bfb0622e639d65c8cfedf8e2ae072e01253a1013c9dbfb682957936b97547347 +AUX bbppp-asneeded.patch 1062 BLAKE2B 73be09e58f573c58e2cc0afe2c316e737af0ac4a0308975f955002a3b70bb1fd68641725b62a68ca6fc7e8d8a6a1fc23446a5a7bb5b3d19721ac73ceff996091 SHA512 892a7f18ce55c099b86fbb129eee9a0750852d5f152d0619a3e79bf70f9e9a1524c52d9aec53bbb0b65999bd6248cc4eee4b341f5ad0d8f636a7dfacb3fef993 DIST bbppp-0.2.5.tar.gz 83421 BLAKE2B 3fe18ce71617b792f9430b2bbe123af78b498be9a663fc782246550ed936b81278d27f06b9b454bc47ff6db193fa2a949e97f0fd970532399c3f0b0f335beda1 SHA512 55d1e4d1a2c97ac5a5d34a48cd877891d8d6acf32083d7bfa90e4941cfbc18a91d056a0ec6b7a96182f72be440f6609caf3bc82c9071c6d0bcfbe95577f04930 -EBUILD bbppp-0.2.5-r1.ebuild 1023 BLAKE2B 3b69a48dbf5b9ef56a6d804f0c64699af218f5fe187ecfd7cb247d398fa97588b83a9a1acec651b2d81fd2f4aed2a0de3bdaaea739b54f162ce135b138dc62fe SHA512 dd1948d7753fe055cbf5c374ff2306c3fde98168d093207394ebbaba8388e83873805b58bc3d76e05e96a1691fc3c906933ca841fbf8ad97578c2390cb3ba60d +EBUILD bbppp-0.2.5-r1.ebuild 1015 BLAKE2B aaf3d1fc51511463cf22c3dfd405997ddb4f0169156bfc8f647ae34aaf4491df960f177300bd838c44cd598ee2974afdddf29d641c93b820134dd060cf5804c8 SHA512 d5fa3b2042fb1a6e202c58aaefc3b4ac20394c243a4c8e54d382a44de9901483113d860aa8b3789c538d4a77ee518f662873a04d6abe4696504426ca7f3713fa MISC metadata.xml 329 BLAKE2B 314294a4fe076008891426b44fdcd92a5fd0b8f04aeb0240fda6f52f7e4a09300b2d46efa23f7f910559089611139d2262c60e588354081b2af97a7aceae2b32 SHA512 1b2b0c0055b4f8f44734697036fe3b470d8a60bba3de1972e7a8e6e21083a9a36356d9afa1e661ccbbbb686b5db6d3c8a57dd4dbba11217eee28010af18b82cc diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild index ec064c74c16f..a8e1a0cdbba4 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 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@\ |