commit: 4696d5246e50ead084a42d5784572db2ff438cd6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jul 20 21:30:53 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 21 16:10:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4696d524
dev-util/ragel: Drop 6.7-r1, 6.8 and 6.9 Closes: https://bugs.gentoo.org/724094 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/ragel/Manifest | 3 - dev-util/ragel/files/ragel-6.7+gcc-4.7.patch | 178 --------------------- dev-util/ragel/files/ragel-6.7-cross-compile.patch | 21 --- dev-util/ragel/files/ragel-6.9-gcc6.patch | 42 ----- dev-util/ragel/ragel-6.7-r1.ebuild | 49 ------ dev-util/ragel/ragel-6.8.ebuild | 44 ----- dev-util/ragel/ragel-6.9.ebuild | 38 ----- 7 files changed, 375 deletions(-) diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest index 06082347d58..6cce5686285 100644 --- a/dev-util/ragel/Manifest +++ b/dev-util/ragel/Manifest @@ -1,7 +1,4 @@ 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 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 80eb29a46f0..00000000000 --- 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?= <[email protected]> -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ò <[email protected]> ---- - 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 e953a1aeeee..00000000000 --- 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 fb10d9fd2b7..00000000000 --- 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 df62badfb79..00000000000 --- 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 027b1b51220..00000000000 --- 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 21b79373ef5..00000000000 --- 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 -}
