From 76dfef0cec9170000357d2f354e412daf48941fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Dec 2017 01:11:30 +0000 Subject: gentoo resync : 30.12.2017 --- app-benchmarks/pipebench/Manifest | 4 +-- .../files/pipebench-0.40-fix-build-system.patch | 21 ++++++++++++++ app-benchmarks/pipebench/pipebench-0.40-r2.ebuild | 25 ++++------------- app-benchmarks/pipebench/pipebench-0.40.ebuild | 32 ---------------------- 4 files changed, 29 insertions(+), 53 deletions(-) create mode 100644 app-benchmarks/pipebench/files/pipebench-0.40-fix-build-system.patch delete mode 100644 app-benchmarks/pipebench/pipebench-0.40.ebuild (limited to 'app-benchmarks/pipebench') diff --git a/app-benchmarks/pipebench/Manifest b/app-benchmarks/pipebench/Manifest index 0a689198a0a7..592a09cd8478 100644 --- a/app-benchmarks/pipebench/Manifest +++ b/app-benchmarks/pipebench/Manifest @@ -1,4 +1,4 @@ +AUX pipebench-0.40-fix-build-system.patch 603 BLAKE2B 69c90bad81413e22ab1be93014b9a9a8a60207e852354bf74c86aab496761102bdeabebfa1c3d33d803b30d6f42275dfb3c5b2cb9fede394cee9db4b9957a696 SHA512 a054d3393043953c56b759326d0bd72e94233673f945474aaa24fba0c78901997f864e79a255ab282b7251a6d88d6a024c08d332581aa3461bc5ce4be9a94bff DIST pipebench-0.40.tar.gz 11542 BLAKE2B b024ad8066a0adb2c1c9e1de1de93d9a9e91104380a1d955852b6281f1b4506be3b03240ed238766590c643c1d93060da43c523e773da738adb8bab333894247 SHA512 bace18d73425cf56bc3fd95eea4db47b3010cc82c16d9b433390d0ee4593046ab10101ce73df451596b34ace89fa92e93a92bb625286edb9cdfb809e630788cd -EBUILD pipebench-0.40-r2.ebuild 802 BLAKE2B 4fd03de961d3c70eb3e7c8c8edee0e08b54ba97efb53dc9c718349912571b9bbc76b644a6c688c699d761d72cfe084a8966edfa0361d59acc6a6957b75d9da64 SHA512 794dc3dc8389a531e3d7043179ba836b4ec8041386fa4fbfc308a2727a541870fcf2112b08a0b959417527cb6c0e107d5c4e6715f4823b1ad041d3448cf0917d -EBUILD pipebench-0.40.ebuild 772 BLAKE2B e2b92fef228fa8076bae6bc865c5e13d2beeb99018d7d47dc3f302c1a4970ad1a45d0ad49db7dfa7031ab7d3ad3c2bef562451e6ae16b8799bb4858042336bd3 SHA512 6d108e9a26d1aad998cda31b0db885b9fcb5d4c98b5eb2b206d369bfbaff5794755a4c58e5536e9fcf3fc18b4317dca337f361260071bdafb1cf3729cf2b97bb +EBUILD pipebench-0.40-r2.ebuild 569 BLAKE2B 1ef74acbacde5f884e6b3d828a83373f3505e0a7f97c737644197cff77d237003da2646dae367886f57f5d7848e14f1c227d8759aa9e77a45e441195e8a3fc51 SHA512 5c651e73ceeb6775183836d31e63f656248ae789649cb6ad36da697093b1822273a4757b32b48424d0cfc395c8789a858d9c6897f4acb172849b8b61726691c1 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-benchmarks/pipebench/files/pipebench-0.40-fix-build-system.patch b/app-benchmarks/pipebench/files/pipebench-0.40-fix-build-system.patch new file mode 100644 index 000000000000..2d79d80ef7bc --- /dev/null +++ b/app-benchmarks/pipebench/files/pipebench-0.40-fix-build-system.patch @@ -0,0 +1,21 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,16 +1,11 @@ + # $Id: Makefile,v 1.2 2002/12/15 19:58:36 marvin Exp $ + +-CC=gcc +-CFLAGS=-Wall -w -pedantic + + all: pipebench + doc: pipebench.1 + install: pipebench +- cp pipebench /usr/local/bin/ +- cp pipebench.1 /usr/local/man/man1/ +- +-pipebench: pipebench.c +- $(CC) $(CFLAGS) -o pipebench pipebench.c ++ mkdir -p $(DESTDIR)$(EPREFIX)/usr/bin && cp pipebench $(DESTDIR)$(EPREFIX)/usr/bin/ ++ mkdir -p $(DESTDIR)$(EPREFIX)/usr/share/man/man1 && cp pipebench.1 $(DESTDIR)$(EPREFIX)/usr/share/man/man1/ + + pipebench.1: pipebench.yodl + yodl2man -o pipebench.1 pipebench.yodl diff --git a/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild index 610bcc5df90d..0688bd665cff 100644 --- a/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild +++ b/app-benchmarks/pipebench/pipebench-0.40-r2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="Measures the speed of stdin/stdout communication" HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=pipebench" @@ -11,25 +11,12 @@ SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 ppc ppc64 x86 ~arm-linux ~x86-linux" IUSE="" -src_prepare() { - sed -i Makefile \ - -e 's:CFLAGS=-Wall:CFLAGS+= -Wall:' \ - -e 's:$(CFLAGS) -o:$(LDFLAGS) &:g' \ - -e "s:/usr/local/bin/:${ED}/usr/bin:" \ - -e "s:/usr/local/man/man1/:${ED}/usr/share/man/man1:" \ - || die "sed Makefile" - default -} - -src_compile() { - emake CC=$(tc-getCC) -} +PATCHES=( "${FILESDIR}"/${PN}-0.40-fix-build-system.patch ) -src_install() { - dodir /usr/{bin,share/man/man1} - emake install - dodoc README +src_configure() { + append-cflags -Wall -w -pedantic + tc-export CC } diff --git a/app-benchmarks/pipebench/pipebench-0.40.ebuild b/app-benchmarks/pipebench/pipebench-0.40.ebuild deleted file mode 100644 index b975c39122b1..000000000000 --- a/app-benchmarks/pipebench/pipebench-0.40.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -DESCRIPTION="Measures the speed of stdin/stdout communication" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=pipebench" -SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" || die "Manual configure failed" - cp Makefile Makefile.orig - sed \ - -e "s:CFLAGS=-Wall:CFLAGS=${CFLAGS} -Wall:" \ - -e "s:/usr/local/bin/:${D}/usr/bin:" \ - -e "s:/usr/local/man/man1/:${D}/usr/share/man/man1:" \ - Makefile.orig > Makefile -} - -src_compile() { - make || die -} - -src_install() { - dodir /usr/{bin,share/man/man1} - make install || die - dodoc README -} -- cgit v1.2.3