gentoo resync : 25.08.2020

9 files changed, 41 insertions, 389 deletions

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 1645761532b8..0f9478fe597f 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,19 +1,12 @@
-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
-DIST ragel-6.9.tar.gz 1226871 BLAKE2B c6edc63eaa21a1529c5600d8491fdce39cff5180fa132046f48c32971e1698fea820c41735f4d74b332de657fdd4c81aecda71beb9d5cef71c27246d606b6b72 SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd
 DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
+DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759 SHA512 32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
 DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
 EBUILD ragel-6.10.ebuild 928 BLAKE2B 3c6d2b9df8ec41596c730b85285d7598a05dfdfa758c4d7c1ebc51eb40550d608c222db968ce536c6fc0b1ba891351dfe0aad5215741c13cf55393ee37b547f7 SHA512 efb62282412b3723b117b237b7a22c786a571028dd479ae98eaa4f8dc940b7b492d456510e67e77902bf8aec48b4395f3426d07f032b0cfeca3531d56555bd3d
-EBUILD ragel-6.7-r1.ebuild 1126 BLAKE2B 1600f6035a70a10d10dc64fb4f2a03b345464a222fbaeeaa05695040487914b091a54843101aa60f0aebf82ca3b99886013df857673dbb3fdd0dc0c4a3b91c68 SHA512 50d72b4ba6b9e6813aa033c89ac5be299f446a77213d5b71ac897e2d3c350de5bde4412d40433c2a8356109a7e0773e82770adbd4b222c85c5b20a8442d2d1ee
-EBUILD ragel-6.8.ebuild 1065 BLAKE2B 644a54768c3e873f8f5b0dbba6f43d90948e49862329b626d37125a93c40ab3dc35a63d529c70aef93ddd483bf81beabb3cba61d92b634fec365b8e548670221 SHA512 062e491ffdace06ad13ecbdadeb75352bf1a40e76875cf3b885cfd2264764032dd50c1b9924a684a60055f029d4aed4402e22b227d7eb4fbfa51308943379ea1
-EBUILD ragel-6.9.ebuild 979 BLAKE2B 781da2e2dc14dbf5edc004637a512b0cd60c22bf2625f7363cc640670195305a2794ef281ed4c19ec2453fdc5639f2c9b430e9df1da48186551f66b076cbc8cd SHA512 45148f500317f4f7ec13e9f53028b7677778390e6ae4114a84d7047e43854461025a39dfba1487bd861a796f9a712e4a57baaaf94eded22d48492cbf39159611
 EBUILD ragel-7.0.0.10-r1.ebuild 758 BLAKE2B 362a2dee75eb9b744af7b0fca9f26175961029165988cf6a5f8f3aeab8d4e9a4264a553509211884c3bd7d6a7992b5fe0dee7b473f61831e6ab8dcfb1f94ba8b SHA512 12f9640eb0c51a497e274bf0d5dd7dadea78a1e21dba5d8a4a114066717badfa1de28116e133f7cc688fce02b7e2859f45479846f460865982c2ced0f4ea4fc8
-EBUILD ragel-7.0.0.10-r2.ebuild 844 BLAKE2B 57993ee41782c71062ffc31df4af845fc54f8aaef22d8e6dd0619882cba894bacd554a1bf685158ca1d63d078cc5c1f1ffabb23660f7f5c43c904ac648223d36 SHA512 086c18195cfa190eed43c66e4ca3074d6596ff7cd465484eab7966bfae26ab2a1d733ea731d9201c18f89ae904f4dffc4800533910d49f27a50ed7e51146bf2d
+EBUILD ragel-7.0.0.10-r2.ebuild 779 BLAKE2B 373a5b4979da94d22d514197aadc6a4f67ddd863b7fd25f2dd5e0ea96b3c3bab5c7100a3aec73d62868803697462e907840318fefff6f83928ca536378bc47d4 SHA512 140311ff587643c81b229f2e576eba50aa1efc825210c34d650551f2d362e50f0a5cb4978b524e991b5a71cef773a65642e607abec2764e9775cebab4d913aed
 EBUILD ragel-7.0.0.10.ebuild 622 BLAKE2B 4eb1438c8fd1c8e1a3f3f2a95589b719e7b1e07d0411ee0d68bbb0eb5d433471becffdc718593beed535a6f360a3bc63f5fafb058fe6d8c50a6163552ad9da99 SHA512 9f98a2fc800727b126d5db3914ebaf699b4a1095f334906d5809edd9f08b0b5c1d90699a145d303fc06a31d95e600d85aee4a7b5ebb98fd8cfd117f20ee10d2b
+EBUILD ragel-7.0.0.12.ebuild 762 BLAKE2B a23b7f6e2b3a41c2ac697b9e6453244bd15a11aa5fd3170ea0ed881f68762ea2a5380e840c95a35926f798f04aa79cd293baf9c369a7a3be61a0c9f41cdd2218 SHA512 19015e4abbc04c2be325c607232a578be66d73dc440bb06f593f41f42d2a4346e2d212e32e539cfb6341baaf61d80999061c930262ae126f6734a28fc0bbd498
 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-6.7+gcc-4.7.patch b/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
deleted file mode 100644
index 80eb29a46f05..000000000000
--- a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Tue, 22 May 2012 16:25:37 -0700
-Subject: [PATCH] aapl: fix building with gcc-4.7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with GCC 4.7, you have to explicit methods inherited from
-base templates, otherwise it will refuse to build.
-
----
-
-The URL reported in the README is no longer registered, so I couldn't
-find a way to report this to an upstream project.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- aapl/avlcommon.h  |   12 ++++++------
- aapl/bstcommon.h  |   16 ++++++++--------
- aapl/bubblesort.h |    2 +-
- aapl/mergesort.h  |    2 +-
- 4 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
-index 06983bc..2e3c190 100644
---- a/aapl/avlcommon.h
-+++ b/aapl/avlcommon.h
-@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 		}
- 
- #ifdef AVL_BASIC
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- #else
--		keyRelation = compare( element->BASEKEY(getKey()), 
-+		keyRelation = this->compare( element->BASEKEY(getKey()),
- 				curEl->BASEKEY(getKey()) );
- #endif
- 
-@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare(key, curEl->getKey());
-+		keyRelation = this->compare(key, curEl->getKey());
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
-index 888717f..7c53ff3 100644
---- a/aapl/bstcommon.h
-+++ b/aapl/bstcommon.h
-@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 
- 			lower = mid - 1;
- 			while ( lower != lowEnd && 
--					compare(key, GET_KEY(*lower)) == 0 )
-+					this->compare(key, GET_KEY(*lower)) == 0 )
- 				lower--;
- 
- 			upper = mid + 1;
- 			while ( upper != highEnd && 
--					compare(key, GET_KEY(*upper)) == 0 )
-+					this->compare(key, GET_KEY(*upper)) == 0 )
- 				upper++;
- 			
- 			low = (Element*)lower + 1;
-@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
-index bcc2fb6..f0f4ce5 100644
---- a/aapl/bubblesort.h
-+++ b/aapl/bubblesort.h
-@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
- 		changed = false;
- 		for ( long i = 0; i < len-pass; i++ ) {
- 			/* Do we swap pos with the next one? */
--			if ( compare( data[i], data[i+1] ) > 0 ) {
-+			if ( this->compare( data[i], data[i+1] ) > 0 ) {
- 				char tmp[sizeof(T)];
- 
- 				/* Swap the two items. */
-diff --git a/aapl/mergesort.h b/aapl/mergesort.h
-index 68b8426..8cefa73 100644
---- a/aapl/mergesort.h
-+++ b/aapl/mergesort.h
-@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
- 		}
- 		else {
- 			/* Both upper and lower left. */
--			if ( compare(*lower, *upper) <= 0 )
-+			if ( this->compare(*lower, *upper) <= 0 )
- 				memcpy( dest++, lower++, sizeof(T) );
- 			else
- 				memcpy( dest++, upper++, sizeof(T) );
--- 
-1.7.8.6
-
diff --git a/dev-util/ragel/files/ragel-6.7-cross-compile.patch b/dev-util/ragel/files/ragel-6.7-cross-compile.patch
deleted file mode 100644
index e953a1aeeeef..000000000000
--- a/dev-util/ragel/files/ragel-6.7-cross-compile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/473970
-
-already sent upstream
-
-patch by Jungshik Shin
-
---- ragel-6.7/configure.in
-+++ ragel-6.7/configure.in
-@@ -27,9 +27,9 @@
- 
- dnl Choose defaults for the build_parsers and build_manual vars. If the dist
- dnl file is present in the root then default to no, otherwise go for it.
--AC_CHECK_FILES( $srcdir/DIST, 
--	[ . $srcdir/DIST; ], 
--	[ build_parsers=yes; build_manual=yes; ] )
-+
-+AS_IF([test -r $srcdir/DIST], [. $srcdir/DIST], [build_parsers=yes;
-+       build_manual=yes])
- 
- dnl
- dnl Enable arg to explicitly control the building of the manual
diff --git a/dev-util/ragel/files/ragel-6.9-gcc6.patch b/dev-util/ragel/files/ragel-6.9-gcc6.patch
deleted file mode 100644
index fb10d9fd2b79..000000000000
--- a/dev-util/ragel/files/ragel-6.9-gcc6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Bug: https://bugs.gentoo.org/582606
-
---- a/ragel/common.cpp
-+++ b/ragel/common.cpp
-@@ -34,7 +34,7 @@
- 	{ "int",      0,       "int",     true,   true,  false,  INT_MIN,   INT_MAX,    sizeof(int) },
- 	{ "unsigned", "int",   "uint",    false,  true,  false,  0,         UINT_MAX,   sizeof(unsigned int) },
- 	{ "long",     0,       "long",    true,   true,  false,  LONG_MIN,  LONG_MAX,   sizeof(long) },
--	{ "unsigned", "long",  "ulong",   false,  true,  false,  0,         ULONG_MAX,  sizeof(unsigned long) }
-+	{ "unsigned", "long",  "ulong",   false,  true,  false,  0,         (long long) ULONG_MAX,  sizeof(unsigned long) }
- };
- 
- #define S8BIT_MIN  -128
-@@ -87,7 +87,7 @@
- 	{ "int32",   0,  "int32",   true,   true,  false,  S32BIT_MIN, S32BIT_MAX,  4 },
- 	{ "uint32",  0,  "uint32",  false,  true,  false,  U32BIT_MIN, U32BIT_MAX,  4 },
- 	{ "int64",   0,  "int64",   true,   true,  false,  S64BIT_MIN, S64BIT_MAX,  8 },
--	{ "uint64",  0,  "uint64",  false,  true,  false,  U64BIT_MIN, U64BIT_MAX,  8 },
-+	{ "uint64",  0,  "uint64",  false,  true,  false,  U64BIT_MIN, (long long) U64BIT_MAX,  8 },
- 	{ "rune",    0,  "int32",   true,   true,  true,   S32BIT_MIN, S32BIT_MAX,  4 }
- };
- 
-@@ -116,7 +116,7 @@
- 	{ "int",     0,  "int",     true,   true,  false,  INT_MIN,   INT_MAX,     4 },
- 	{ "uint",    0,  "uint",    false,  true,  false,  0,         UINT_MAX,    4 },
- 	{ "long",    0,  "long",    true,   true,  false,  LONG_MIN,  LONG_MAX,    8 },
--	{ "ulong",   0,  "ulong",   false,  true,  false,  0,         ULONG_MAX,   8 }
-+	{ "ulong",   0,  "ulong",   false,  true,  false,  0,         (long long) ULONG_MAX,   8 }
- };
- 
- HostType hostTypesOCaml[] =
---- a/ragel/rbxgoto.cpp
-+++ b/ragel/rbxgoto.cpp
-@@ -658,7 +658,7 @@
- 	out <<
- 		"	begin\n"
- 		"		" << P() << " += 1\n"
--		"		" << rbxGoto(ret, "_out") << "\n" 
-+		"		" << static_cast<bool>(rbxGoto(ret, "_out")) << "\n"
- 		"	end\n";
- }
- 
diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild
deleted file mode 100644
index df62badfb791..000000000000
--- a/dev-util/ragel/ragel-6.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.complang.org/ragel/"
-SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}+gcc-4.7.patch
-	epatch "${FILESDIR}"/${P}-cross-compile.patch #473970
-	sed -i -e '/CXXFLAGS/d' configure.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	default
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild
deleted file mode 100644
index 027b1b512201..000000000000
--- a/dev-util/ragel/ragel-6.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.complang.org/ragel/"
-SRC_URI="http://www.complang.org/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.7-cross-compile.patch #473970
-	sed -i -e '/CXXFLAGS/d' configure.in || die
-
-	eautoreconf
-}
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild
deleted file mode 100644
index 21b79373ef5f..000000000000
--- a/dev-util/ragel/ragel-6.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools autotools-utils
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="http://www.colm.net/open-source/ragel/"
-SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="vim-syntax"
-
-DEPEND=""
-RDEPEND=""
-
-# We need to get the txl language in Portage to have the tests :(
-RESTRICT=test
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-DOCS=( ChangeLog CREDITS README TODO )
-
-src_test() {
-	cd "${S}"/test
-	./runtests.in || die
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ragel.vim
-	fi
-}
diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
index c26cbce821da..5cd81dac09e4 100644
--- a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
 IUSE="vim-syntax"
 
 DEPEND="~dev-util/colm-0.13.0.5"
@@ -27,11 +27,6 @@ src_configure() {
 	econf --disable-static
 }
 
-src_test() {
-	cd "${S}"/test || die
-	./runtests.in || die
-}
-
 src_install() {
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
diff --git a/dev-util/ragel/ragel-7.0.0.12.ebuild b/dev-util/ragel/ragel-7.0.0.12.ebuild
new file mode 100644
index 000000000000..fd53d7f1912f
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.0.12.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+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="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="vim-syntax"
+
+DEPEND="~dev-util/colm-0.13.0.7"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ragel.vim
+	fi
+	default
+	find "${D}" -name '*.la' -delete || die
+}