gentoo resync : 09.06.2018

5 files changed, 50 insertions, 118 deletions

diff --git a/dev-util/peg/Manifest b/dev-util/peg/Manifest
index f313d297bec8..646d86969700 100644
--- a/dev-util/peg/Manifest
+++ b/dev-util/peg/Manifest
@@ -1,8 +1,5 @@
-DIST peg-0.1.13.tar.gz 55352 BLAKE2B 9b97304333d0386d7011a76638f33dcf5ce5753324a996163c5f66c770f1d67c50f96351e4947065af1e28e28300d8d26e8bc04b2d5b9e8562e6f3f3a82aa3a1 SHA512 fbec192daef2c72511cc17e6f7b301ac48d20746ac9843d61c05e8a069633c5fbc6d92155a94aad5094dc84a2f1bb92bc2b2aabaf6bc563d4401460f1047b3b0
 DIST peg-0.1.15.tar.gz 56522 BLAKE2B cfc13761d4f3de3e4906abefc04fb732e7f30e0a1eb70dcab79de6001434866329cb4263fba68a5c8aac9dd895805d0de43dafa5a9e382c4c2e12fe90189676e SHA512 70b67d57c866c24cc9ceaf029e95bacba56def7ccb289233e3816c1f6f1f210dd8a729446df94d0424b5946959dbf9a33f81a5a95f7563a9dca460d6e2320018
-DIST peg-0.1.9.tar.gz 38485 BLAKE2B 088520a98609fab2b3b419c6f7875daa20b7a3da65224301ee48b37494569f52dc1e574df503c6b53d63ebe250033e586fc91f615e1173a10b126c267bfe8816 SHA512 73d0776972243ca8cba348b63252dee837308df6d6b00d2a186396545b80cb798e3280a9af6a71d51d9ae8c381a518502f96cf3d0d651bcf0f2206276f29ed1e
-EBUILD peg-0.1.13.ebuild 803 BLAKE2B 24168f3527b851881bd0467f24ba4f388b9c2418b0badabda4c0668b0b8911c4ef75da407662e3e3d0ebe4454f09050687da051f6bf1b2d8a725c77c70270a78 SHA512 f96ccd15b32243ba527d3d803a898d416ae49b5f566415e13926c96b9e7724b24453eb839b9c1923f9f052c316ccb2ff476dd13dea78f5b3088236131ad58b0f
+DIST peg-0.1.18.tar.gz 57776 BLAKE2B 3266db2009073ee95a7fe65f3969b06001669dca095a8b77cbef3293557f9919872b44b348ff3de53cf8a132fd414c265bf0da3f77f0da0391d6d53cf4ab9217 SHA512 ca2fb9088bf87955adf6f883370ddb7d5f6f3cae3605a871094317205a124cce4f7b9f83cf4662cb470e2c5a6977608b456eb1fad98022d7e40fc384d1fec0f8
 EBUILD peg-0.1.15-r1.ebuild 896 BLAKE2B e286cf9cd51c9e14563528a27635b4fe4f0779aade712d782a2017f36de303866c0026a0f629e4bfa8185a640165938c0948f1406af94a9a60bf3a546f3d0a9b SHA512 21b10c4f565e3dd927f08e3e4a1aa70cdd572ce8777e74dc069dd830d813abb5080127d2789e91e86d5048217c94663090a4c548ad5efeab595f34200fabcaed
-EBUILD peg-0.1.15.ebuild 743 BLAKE2B 1dc373bc61b005c5ebc46b40c4d751073a2a34c7cd4a18154096a5095ccab51298c5e77917f000549782712840a1c23519de7eed0dc3e45f4e133fe98eaf4091 SHA512 f251edd6def3e93edd4e7e8a0c776e961ff49cd0d1b9062b72061379dcf83033c2b4b2be69c7bc041d951774e3a70a10faee31846b42e1d3eda01ddf27e73ef3
-EBUILD peg-0.1.9.ebuild 757 BLAKE2B 8f00cb6034c6690c9218b53d3857a364dbedb2bc04c6edc974320dcb87c1235e08aa2fefc222a8a3feb9f4ede6c330fc7bba4fb035c65da41b62cd438ded498b SHA512 eb565ee8b4a0d113dc4bdfbcbdc9f4473482b36eb80c811a7dcafd42aa60f12d6145bdd0b21d4a6e8a345e70eeae3d60f2b842b2f2470f68975ea9663e486f73
+EBUILD peg-0.1.18.ebuild 870 BLAKE2B 85683a921523c9b1c83d40f97da4d7b6cff4e152c87025f0bff948c751f3e5003436d5ce783ca636f3688178cfdcfc889642f56744f2f131d886ef17bb9e33fb SHA512 ef827b7ad368c5d0bce2de6731443366b47d6154ef0267581e668f5389940c84075b9a3f5e4da6b758694288a7a8631a841c206155ff8f94f47e7cab872fd2cc
 MISC metadata.xml 257 BLAKE2B c4675d1acb1e5dd4987811e68c4e4b23d7476dc5d5a1c90aea425f43e9f92261fea544c0fe3bb2907b43a47db5a340abce8b8b0e9b777e79a9811a7d5d96dc9f SHA512 7c68096d12fdee234074ad1256cb5075513b3a00795138a18a70003d8498c9418664d4f62772647e090796ea6b9bda9aeeac1e74c271773efa42568aeefde301
diff --git a/dev-util/peg/peg-0.1.13.ebuild b/dev-util/peg/peg-0.1.13.ebuild
deleted file mode 100644
index 9d17112ee19a..000000000000
--- a/dev-util/peg/peg-0.1.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin" || die "mkdir failed"
-	emake ROOT="${D}" PREFIX="/usr" install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/peg/peg-0.1.15.ebuild b/dev-util/peg/peg-0.1.15.ebuild
deleted file mode 100644
index 69f02c21d1e8..000000000000
--- a/dev-util/peg/peg-0.1.15.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	dodir "/usr/bin"
-	emake ROOT="${D}" PREFIX="/usr" install
-	rm -rf "${D}/usr/man" || die "rm failed"
-	doman src/${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}
diff --git a/dev-util/peg/peg-0.1.18.ebuild b/dev-util/peg/peg-0.1.18.ebuild
new file mode 100644
index 000000000000..3853be968a49
--- /dev/null
+++ b/dev-util/peg/peg-0.1.18.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Recursive-descent parser generators for C"
+HOMEPAGE="http://piumarta.com/software/peg/"
+SRC_URI="http://piumarta.com/software/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	eapply_user
+
+	sed -i \
+		-e '/strip/d' \
+		-e '/^CFLAGS/d' \
+		-e 's/$(CC) $(CFLAGS) -o/$(CC) $(CFLAGS) $(LDFLAGS) -o/g' \
+			Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dodir "/usr/bin"
+	emake \
+		ROOT="${D}" \
+		PREFIX="/usr" \
+		install
+	rm -rf "${D}/usr/man" || die "rm failed"
+	doman src/${PN}.1
+}
+
+src_test() {
+	emake check test \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
diff --git a/dev-util/peg/peg-0.1.9.ebuild b/dev-util/peg/peg-0.1.9.ebuild
deleted file mode 100644
index 6f8f2b50b211..000000000000
--- a/dev-util/peg/peg-0.1.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive-descent parser generators for C"
-HOMEPAGE="http://piumarta.com/software/peg/"
-SRC_URI="http://piumarta.com/software/${PN}/${PF}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# FIXME: tests don't respect {C,LD}FLAGS and build stuff in runtime.
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/$(CFLAGS)/$(CFLAGS) $(LDFLAGS)/g' \
-			Makefile || die "sed failed"
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin" || die "mkdir failed"
-	emake ROOT="${D}" PREFIX="/usr" install
-	doman ${PN}.1
-}
-
-src_test() {
-	emake check
-	emake test
-}