gentoo resync : 23.12.2017

3 files changed, 73 insertions, 0 deletions

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 0527a4d79c67..53b504f70a76 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,6 +1,7 @@
 AUX ragel-6.7+gcc-4.7.patch 5585 BLAKE2B d8b7056d501ea0373f2a0381d59766e95741f963e48f40fca8dc81f097f4bced320dfbfc1e920858af7f37a14a206da43131c3175a839b30b7a911693dc91103 SHA512 160aea4100328accbe423e98f7f5741309b9e293aea992f287cb5d9fab25ae74c76933e924658dd4670d317b01e76d37c3defeeb47ada07370b819a16515ebf4
 AUX ragel-6.7-cross-compile.patch 576 BLAKE2B f284c71ecc8d801873e814f863eeb4315646b58e07e379844cbd5b5592774829b8ae7234361f64c6e459eb8d94a90b617a35fbd566da69a80544fa1a7a5bf3ca SHA512 0ab26720537bdb77194159145d5fc2e01ee96f3d197d947693141e0559e18b4da3ac7b058d7de4a9d4d9cf9c4ab63649839da359ed3aabcb5ea7163ec975d5b1
 AUX ragel-6.9-gcc6.patch 1902 BLAKE2B be17303b0e4af5edc2b9f97eca8ce4505a0f98ce7797b35bd341f8f09bb9f12845f190ad56ae9638d4d24de80ae15936acb4faffd8c6501ddbd51ebd93d61503 SHA512 3258201336296fd8d0ae7e3008ddbcee9112023801e7ba280de09398bbf7bcf4010e3f5d3e819bff7cdefb26a346e361be84fe5c84354fe03302e5bd9fb92c68
+AUX ragel-7.0.0.10-use-pkginclude.patch 1143 BLAKE2B 980f0248e9f33955b4653fb1a38aa7aa5ec10584650947e85592f9a9ef0a67c41020dca29fad57ab101e98f45c217d332933931ac7da68cb3ea5d3bbc2f02d9a SHA512 44ee69205b87c22d17b5cc419fba96bd69c9b3d4f8fc8133041b9d71b9aae434b1528bdbdcfe15825d663c1d441d6cce97d0586c4bfae58ff5d687b1c156529f
 DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38
 DIST ragel-6.7.tar.gz 1182734 BLAKE2B 7a74d58ddee776c5652563d2b804c12fa89d23ab98d743967ff8948d3506266c464b413ced8a2e251cd62e945947778232f483706bbdd87717190a45a9ad088c SHA512 a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a
 DIST ragel-6.8.tar.gz 1211146 BLAKE2B 41d3feecb461cede104182d918e1f052256daa292efd94b6c722904c05e30b621f754881f07252c76b0bd3af63c65ce50b8ec98d43e1eec5c1a66ef2593506c7 SHA512 3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458
@@ -11,6 +12,7 @@ EBUILD ragel-6.10.ebuild 957 BLAKE2B e4d5820035a3758a9cf4feca708ed4fbce3cdf0d4d4
 EBUILD ragel-6.7-r1.ebuild 1152 BLAKE2B 752eab3a8005ccd511727ed5f533560bdeac7d740d19362896c3b54e012a9a5c094bad5227e30920709a332dae2af48558abebf734e51b5b59b04da869ecfdf2 SHA512 46bee68ca0e22ef5f64a827af52f3dc14374920a31e2817a4430726bb2278447b0515acf1e0b77d58e3a6330e580f71c735e2170e4503734dd31186c10907822
 EBUILD ragel-6.8.ebuild 1094 BLAKE2B be60938645339d483e12693638a81e77c04c7c4c7799d73de103076c8d7e95ce4c3b6e0e167996c97e5f2f1e65f4f7cecbb300e4b3676f4b198ef1312cb94b86 SHA512 f290a2edb43b60b52a563927343cb5f3672dcac30a598b6e95afe66858cfb33f0af5bc1d960e9b8efc05e9eea9a369045fe8dc7dc77abd596813d80f324d03ce
 EBUILD ragel-6.9.ebuild 1008 BLAKE2B 07f6911e9117b311333b373b2ae9f8e178ddb6417e7ff06f8ba46260eb3c32995647b369a6cebc3a0610766aa54f20fa17ca320d8834fc7dd35a5bdd7786182d SHA512 539763d6d3b96efc6d47b82474126058859e176050380521c473211927c074cb98256050ece6557e7692867fd571d82f8fd2bb0cb03e4855aff7b8ebb060f51e
+EBUILD ragel-7.0.0.10-r1.ebuild 679 BLAKE2B 25b3a2bc82333a55459c72f7dfc5d40bfd92f052c535986470b469c5db4f79ca213480f748e42f1938865a242a21c3ba46764c8da839f9e037b027e6d28acb6b SHA512 e447d0db04d2bab7c0341ad76f9e83b7af4b9b874aac2ac9f37ab80992d151700e2125673f0162e85407fa9d08571fcd2a760f58673deca91ebd1b2bc26d177b
 EBUILD ragel-7.0.0.10.ebuild 627 BLAKE2B 929253ed83851fb333bc6c31b565b83dc30d8b02e6377824945d642a807b5ff5d8e5ea890a33f0601e0f5732c46e213c6aae93f51d19e33b5d209d3b98a9a59a SHA512 023290b91413f0a249aa409de73a22ab622290c81281f699187ea64ceb6393819a9e0e4b9b2eecaf5c25d519d09ba080f7bfbe085dc86c228ab3f7400980d9d5
 EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6
 MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch b/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
new file mode 100644
index 000000000000..6609af5a99a2
--- /dev/null
+++ b/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
@@ -0,0 +1,41 @@
+From 927f380272442ae803fdccfc001b55877f25e7dc Mon Sep 17 00:00:00 2001
+From: Adrian Thurston <thurston@colm.net>
+Date: Sat, 10 Dec 2016 15:41:30 -0500
+Subject: [PATCH] use pkginclude for the headers
+
+---
+ aapl/Makefile.am | 2 +-
+ src/Makefile.am  | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/aapl/Makefile.am b/aapl/Makefile.am
+index fd9f9cb0..80b972f1 100644
+--- a/aapl/Makefile.am
++++ b/aapl/Makefile.am
+@@ -1,4 +1,4 @@
+-include_HEADERS = \
++pkginclude_HEADERS = \
+ 	avlbasic.h avlimel.h avlmap.h bstcommon.h compare.h insertsort.h \
+ 	sbstset.h avlcommon.h avlimelkey.h avlmel.h bstmap.h dlcommon.h \
+ 	mergesort.h sbsttable.h avlibasic.h avliset.h avlmelkey.h bstset.h \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 24a19a4b..60554a99 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,11 +16,11 @@ bin_PROGRAMS = ragel
+ 
+ endif
+ 
+-include_HEADERS = \
++pkginclude_HEADERS = \
+ 	action.h fsmgraph.h ragel.h common.h \
+ 	gendata.h redfsm.h dot.h
+ 
+-nodist_include_HEADERS = config.h
++nodist_pkginclude_HEADERS = config.h
+ 
+ ragel_CPPFLAGS = -I$(top_srcdir)/aapl -DBINDIR='"@bindir@"'
+ 
+-- 
+2.15.1
+
diff --git a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
new file mode 100644
index 000000000000..5c8640303fd5
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/"
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="vim-syntax"
+
+DEPEND="~dev-util/colm-0.13.0.5"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" )
+
+src_test() {
+	cd "${S}"/test || die
+	./runtests.in || die
+}
+
+src_install() {
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ragel.vim
+	fi
+	default
+}