diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-30 01:11:30 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-30 01:11:30 +0000 |
| commit | 76dfef0cec9170000357d2f354e412daf48941fc (patch) | |
| tree | 56647120c0ee20ab3494475c86722034cd194b02 /app-arch/par | |
| parent | ccf84bcd604130256d1377cd58f0a634ae6ee20f (diff) | |
gentoo resync : 30.12.2017
Diffstat (limited to 'app-arch/par')
| -rw-r--r-- | app-arch/par/Manifest | 3 | ||||
| -rw-r--r-- | app-arch/par/files/par-1.1-fix-build-system.patch | 13 | ||||
| -rw-r--r-- | app-arch/par/par-1.1.ebuild | 20 |
3 files changed, 23 insertions, 13 deletions
diff --git a/app-arch/par/Manifest b/app-arch/par/Manifest index 9b764566184d..78b88788eba0 100644 --- a/app-arch/par/Manifest +++ b/app-arch/par/Manifest @@ -1,3 +1,4 @@ +AUX par-1.1-fix-build-system.patch 320 BLAKE2B a26b6d38129771b727fbd68340033303643f1214a1df0fc72a14d953679a0ad3161d6fd60264ef656fa330555d339b28e697ff5eabd2a759a6fdfe95bdf5d1ab SHA512 a9d802c3a2e60aa7e3be3dfd3f43365b46f3b6e8ff25ce2fca953df6db0fa97c42510665f6b191b090c267be8ab51e317e5d8df573db11a0cf72b2ade5bf5a64 DIST par-v1.1.tar.gz 40959 BLAKE2B a15a7addccf1edb036e73219cbd6c9f92ecc41c7cda16136f5a703e812d56bf8a84a31681c0fd02b9bd5e8a29ca76e4c9c61b8f2752104c8891ac9416bf169f7 SHA512 539be3cac0513429f44c9d53dcd61afa02b1e5a2935def3164398577882f47199b5a393f21ed6a1d6972409034bb0a7b63f338d69aa1fcdd3655adaf5993b95d -EBUILD par-1.1.ebuild 725 BLAKE2B 5240904752f48fa8bd578f5df8c7a781a52fc0e271f0001151a7e1ba7b36f86782f1a87fe1d4cf831cf506b412a6d14f525e708c0f83dfe80a19daadfb3a7676 SHA512 9af4730337f01df83edba8c9e2c225fa8dbf8594960e6bbdc4127cc2e04e01c1e2d62ecf4b08722bea32074fbc04c0ab7b8949672bbb9ebdecec339f500a2701 +EBUILD par-1.1.ebuild 613 BLAKE2B 2295b899a7f2fa5344468b2b511ec05ac131da2de6ed948be2f92b24c5aa0fe10ce1b26c1a4b8b13663104a963cc0a063f5818f7fcc67143b36d1d5d2b58ad15 SHA512 a7487d67500a9be2dbf7ff37c28acdfd59e25e8590d93f8ee7c01ea5741e06fd8d8aaa26479a3d4ac9213a15dd8ba8a839e75c4cebd43898bac4913134403594 MISC metadata.xml 245 BLAKE2B 2238bcaede7173c554f122293f371ef5fdbc9fcd11c670a5a729505e1dd5e9d676c42870c7cdedb3d4d60cd82575bf110d8398657d3af32007138d201b45faa6 SHA512 023dccf92d6be9a5ccefa97f75d1d4df7a5590ec62f5969e24f45ba12be7d2128e0b2bcf0e5a0b59e2616d586c830c58fa43535d17e38c00b896b05490ecdf42 diff --git a/app-arch/par/files/par-1.1-fix-build-system.patch b/app-arch/par/files/par-1.1-fix-build-system.patch new file mode 100644 index 000000000000..30361579f226 --- /dev/null +++ b/app-arch/par/files/par-1.1-fix-build-system.patch @@ -0,0 +1,13 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,8 @@ + +-CFLAGS=-g -W -Wall -Wno-unused -O2 ++CFLAGS += -W -Wall -Wno-unused + + par: backend.o checkpar.o makepar.o rwpar.o rs.o md5.o fileops.o main.o readoldpar.o interface.o ui_text.o +- $(CC) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + clean: + rm -f core par par.exe *.o diff --git a/app-arch/par/par-1.1.ebuild b/app-arch/par/par-1.1.ebuild index a0bb3fff9ad7..63ac82a7d472 100644 --- a/app-arch/par/par-1.1.ebuild +++ b/app-arch/par/par-1.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=6 inherit toolchain-funcs @@ -14,23 +14,19 @@ SLOT="0" KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" -DEPEND="!app-text/par +DEPEND=" + !app-text/par !dev-util/par" RDEPEND="${DEPEND}" S="${WORKDIR}"/par-cmdline +PATCHES=( "${FILESDIR}"/${PN}-1.1-fix-build-system.patch ) -src_prepare() { - sed -i \ - -e 's/\$(CC)/$(LINK.o)/' \ - Makefile || die "sed failed" -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" +src_configure() { + tc-export CC } src_install() { - dobin par || die "dobin failed" - dodoc AUTHORS NEWS README + dobin par + einstalldocs } |