From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E9401382C5 for ; Fri, 30 Apr 2021 19:03:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAFFEE087C; Fri, 30 Apr 2021 19:03:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9255EE087C for ; Fri, 30 Apr 2021 19:03:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D292340E2D for ; Fri, 30 Apr 2021 19:03:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D01573F for ; Fri, 30 Apr 2021 19:03:26 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1619809365.0438e6d3b20ae30dfc2339cca81f53c1f8b2a1d8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/, sys-devel/flex/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/flex/Manifest sys-devel/flex/files/flex-2.6.3-reentrant.patch sys-devel/flex/flex-2.6.1.ebuild sys-devel/flex/flex-2.6.3-r1.ebuild sys-devel/flex/flex-2.6.3.ebuild sys-devel/flex/flex-2.6.4.ebuild X-VCS-Directories: sys-devel/flex/files/ sys-devel/flex/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0438e6d3b20ae30dfc2339cca81f53c1f8b2a1d8 X-VCS-Branch: master Date: Fri, 30 Apr 2021 19:03:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: db6b8e17-78be-4855-bcfc-7be43fb5eb53 X-Archives-Hash: f2dd828348aa07ab6f1327aa63fd292b commit: 0438e6d3b20ae30dfc2339cca81f53c1f8b2a1d8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 18 22:46:30 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 30 19:02:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0438e6d3 sys-devel/flex: Drop 2.6.1, 2.6.3, 2.6.3-r1 and 2.6.4 (r0) Bug: https://bugs.gentoo.org/777906 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> sys-devel/flex/Manifest | 2 - sys-devel/flex/files/flex-2.6.3-reentrant.patch | 82 ------------------------ sys-devel/flex/flex-2.6.1.ebuild | 78 ----------------------- sys-devel/flex/flex-2.6.3-r1.ebuild | 85 ------------------------- sys-devel/flex/flex-2.6.3.ebuild | 79 ----------------------- sys-devel/flex/flex-2.6.4.ebuild | 82 ------------------------ 6 files changed, 408 deletions(-) diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest index 14e6b2bca98..327f0405ede 100644 --- a/sys-devel/flex/Manifest +++ b/sys-devel/flex/Manifest @@ -1,3 +1 @@ -DIST flex-2.6.1.tar.xz 835048 BLAKE2B 5b0b67774d1ba2d4b2ad8a8cba1f0b8fed9aecdae387e54e6cb8fd1c0c9ef78559bc1a6fe6b97f984f16b438d350de4dccda7e3427d71fead9073ab6616b0ecc SHA512 1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1 -DIST flex-2.6.3.tar.gz 1405560 BLAKE2B 2aa9ca18f2ab124db9567e2d2ee512881a71755342bdcbd05ef536653396d1e4ed47dafc1227531bf9e9a610d9c5aa2d924bf864b18c5a618b2ccb61db7fef4e SHA512 f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00 DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e diff --git a/sys-devel/flex/files/flex-2.6.3-reentrant.patch b/sys-devel/flex/files/flex-2.6.3-reentrant.patch deleted file mode 100644 index f2f5eb8374b..00000000000 --- a/sys-devel/flex/files/flex-2.6.3-reentrant.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 078b46c69d063aef1715b11348a2871d6036f253 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sun, 22 Jan 2017 18:34:30 +0100 -Subject: [PATCH] Add more defines in the non-reentrant part. - -Fix the reentrant part; don't "#define yyfoo yyfoo" because it breaks -code that does #ifndef yywrap .. ---- - src/flex.skl | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/src/flex.skl b/src/flex.skl -index 190700f..6a7cde4 100644 ---- a/src/flex.skl -+++ b/src/flex.skl -@@ -61,11 +61,17 @@ m4_changequote([[, ]]) - m4_ifelse(M4_YY_PREFIX,yy,, - #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] - #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] --#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] -+#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] -+#define yy_scan_string M4_YY_PREFIX[[_scan_string]] -+#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] - #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] - #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] - #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] - #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] -+#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] -+#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] -+#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] -+#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] - #define yyin M4_YY_PREFIX[[in]] - #define yyleng M4_YY_PREFIX[[leng]] - #define yylex M4_YY_PREFIX[[lex]] -@@ -107,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]]) - - m4preproc_define(`M4_GEN_PREFIX', - ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]] --m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') -+%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') - - %if-c++-only - /* The c++ scanner is a mess. The FlexLexer.h header file relies on the -@@ -120,6 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') - %endif - - %if-c-only -+m4_ifelse(M4_YY_PREFIX,yy,, - M4_GEN_PREFIX(`_create_buffer') - M4_GEN_PREFIX(`_delete_buffer') - M4_GEN_PREFIX(`_scan_buffer') -@@ -155,6 +162,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') - M4_GEN_PREFIX(`set_column') - ]]) - M4_GEN_PREFIX(`wrap') -+) - %endif - - m4_ifdef( [[M4_YY_BISON_LVAL]], -@@ -170,11 +178,14 @@ m4_ifdef( [[]], - ]]) - - -+m4_ifelse(M4_YY_PREFIX,yy,, - M4_GEN_PREFIX(`alloc') - M4_GEN_PREFIX(`realloc') - M4_GEN_PREFIX(`free') -+) - - %if-c-only -+m4_ifelse(M4_YY_PREFIX,yy,, - m4_ifdef( [[M4_YY_NOT_REENTRANT]], - [[ - M4_GEN_PREFIX(`text') -@@ -184,6 +195,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], - M4_GEN_PREFIX(`_flex_debug') - M4_GEN_PREFIX(`lineno') - ]]) -+) - %endif - - diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild deleted file mode 100644 index d732bb861ff..00000000000 --- a/sys-devel/flex/flex-2.6.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic ltprune multilib-minimal - -DESCRIPTION="The Fast Lexical Analyzer" -HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex" -SRC_URI="https://github.com/westes/flex/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="FLEX" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static test" -RESTRICT="!test? ( test )" - -# We want bison explicitly and not yacc in general #381273 -RDEPEND="sys-devel/m4" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( sys-devel/gettext ) - test? ( sys-devel/bison )" - -src_prepare() { - # Disable running in the tests/ subdir as it has a bunch of built sources - # that cannot be made conditional (automake limitation). #568842 - if ! use test ; then - sed -i \ - -e '/^SUBDIRS =/,/^$/{/tests/d}' \ - Makefile.in || die - fi -} - -src_configure() { - use static && append-ldflags -static - - multilib-minimal_src_configure -} - -multilib_src_configure() { - # Do not install shared libs #503522 - ECONF_SOURCE=${S} \ - econf \ - --disable-shared \ - $(use_enable nls) \ - --docdir='$(datarootdir)/doc/'${PF} -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - cd src || die - emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - cd src || die - emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc ONEWS - prune_libtool_files --all - rm "${ED}"/usr/share/doc/${PF}/COPYING || die - dosym flex /usr/bin/lex -} diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild b/sys-devel/flex/flex-2.6.3-r1.ebuild deleted file mode 100644 index 86c8beada8b..00000000000 --- a/sys-devel/flex/flex-2.6.3-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic libtool ltprune multilib-minimal - -DESCRIPTION="The Fast Lexical Analyzer" -HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex" -SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="FLEX" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static test" -RESTRICT="!test? ( test )" - -# We want bison explicitly and not yacc in general #381273 -RDEPEND="sys-devel/m4" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( sys-devel/gettext ) - test? ( sys-devel/bison )" - -PATCHES=( - "${FILESDIR}/${P}-reentrant.patch" -) - -src_prepare() { - epatch "${PATCHES[@]}" - - # Disable running in the tests/ subdir as it has a bunch of built sources - # that cannot be made conditional (automake limitation). #568842 - if ! use test ; then - sed -i \ - -e '/^SUBDIRS =/,/^$/{/tests/d}' \ - Makefile.in || die - fi - elibtoolize # Prefix always needs this -} - -src_configure() { - use static && append-ldflags -static - - multilib-minimal_src_configure -} - -multilib_src_configure() { - # Do not install shared libs #503522 - ECONF_SOURCE=${S} \ - econf \ - --disable-shared \ - $(use_enable nls) \ - --docdir='$(datarootdir)/doc/'${PF} -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - cd src || die - emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - cd src || die - emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc ONEWS - prune_libtool_files --all - rm "${ED}"/usr/share/doc/${PF}/COPYING || die - dosym flex /usr/bin/lex -} diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild deleted file mode 100644 index 92259329371..00000000000 --- a/sys-devel/flex/flex-2.6.3.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic libtool ltprune multilib-minimal - -DESCRIPTION="The Fast Lexical Analyzer" -HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex" -SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="FLEX" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static test" -RESTRICT="!test? ( test )" - -# We want bison explicitly and not yacc in general #381273 -RDEPEND="sys-devel/m4" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( sys-devel/gettext ) - test? ( sys-devel/bison )" - -src_prepare() { - # Disable running in the tests/ subdir as it has a bunch of built sources - # that cannot be made conditional (automake limitation). #568842 - if ! use test ; then - sed -i \ - -e '/^SUBDIRS =/,/^$/{/tests/d}' \ - Makefile.in || die - fi - elibtoolize # Prefix always needs this -} - -src_configure() { - use static && append-ldflags -static - - multilib-minimal_src_configure -} - -multilib_src_configure() { - # Do not install shared libs #503522 - ECONF_SOURCE=${S} \ - econf \ - --disable-shared \ - $(use_enable nls) \ - --docdir='$(datarootdir)/doc/'${PF} -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - cd src || die - emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - cd src || die - emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc ONEWS - prune_libtool_files --all - rm "${ED}"/usr/share/doc/${PF}/COPYING || die - dosym flex /usr/bin/lex -} diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild deleted file mode 100644 index 623bc261d89..00000000000 --- a/sys-devel/flex/flex-2.6.4.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic libtool ltprune multilib-minimal - -DESCRIPTION="The Fast Lexical Analyzer" -HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex" -SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="FLEX" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static test" -RESTRICT="!test? ( test )" - -# We want bison explicitly and not yacc in general #381273 -RDEPEND="sys-devel/m4" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( sys-devel/gettext ) - test? ( sys-devel/bison )" - -src_prepare() { - #epatch "${PATCHES[@]}" - epatch_user - - # Disable running in the tests/ subdir as it has a bunch of built sources - # that cannot be made conditional (automake limitation). #568842 - if ! use test ; then - sed -i \ - -e '/^SUBDIRS =/,/^$/{/tests/d}' \ - Makefile.in || die - fi - elibtoolize # Prefix always needs this -} - -src_configure() { - use static && append-ldflags -static - - multilib-minimal_src_configure -} - -multilib_src_configure() { - # Do not install shared libs #503522 - ECONF_SOURCE=${S} \ - econf \ - --disable-shared \ - $(use_enable nls) \ - --docdir='$(datarootdir)/doc/'${PF} -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - cd src || die - emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)' - fi -} - -multilib_src_test() { - multilib_is_native_abi && emake check -} - -multilib_src_install() { - if multilib_is_native_abi; then - default - else - cd src || die - emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc ONEWS - prune_libtool_files --all - rm "${ED}"/usr/share/doc/${PF}/COPYING || die - dosym flex /usr/bin/lex -}