subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-devel\/flex\/"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2024-03-04 Thread Sam James

commit: 380a504decd875b1eaebe3b52886312ad36c445c
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 11:08:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 11:08:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=380a504d

sys-devel/flex: drop 2.6.4-r5

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r5.ebuild | 100 
 1 file changed, 100 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.4-r5.ebuild 
b/sys-devel/flex/flex-2.6.4-r5.ebuild
deleted file mode 100644
index 8ddca7e3c8ce..
--- a/sys-devel/flex/flex-2.6.4-r5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="https://github.com/westes/flex;
-SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz;
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools-regenerate.patch.xz;
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux -arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-IUSE="nls static test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/m4"
-# We want bison explicitly and not yacc in general, bug #381273
-BDEPEND="
-   ${RDEPEND}
-   nls? ( sys-devel/gettext )
-   test? ( sys-devel/bison )
-"
-PDEPEND="app-alternatives/lex"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-libobjdir.patch
-   "${FILESDIR}"/${P}-fix-build-with-glibc2.26.patch
-
-   "${WORKDIR}"/${P}-autotools-regenerate.patch
-)
-
-src_prepare() {
-   default
-
-   # Drop on next release when we can remove 
${P}-autotools-regenerate.patch
-   touch configure.ac aclocal.m4 Makefile.in configure src/config.h.in || 
die
-
-   # Disable running in the tests/ subdir as it has a bunch of built 
sources
-   # that cannot be made conditional (automake limitation). bug #568842
-   if ! use test ; then
-   sed -i \
-   -e '/^SUBDIRS =/,/^$/{/tests/d}' \
-   Makefile.in || die
-   fi
-
-   # Prefix always needs this
-   elibtoolize
-}
-
-src_configure() {
-   use static && append-ldflags -static
-
-   multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-   # Do not install shared libs, #503522
-   ECONF_SOURCE="${S}" econf \
-   CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-   --disable-shared \
-   $(use_enable nls)
-}
-
-multilib_src_compile() {
-   if multilib_is_native_abi; then
-   default
-   else
-   emake -C src -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
-   emake -C src DESTDIR="${D}" install-libLTLIBRARIES 
install-includeHEADERS
-   fi
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   dodoc ONEWS
-   find "${ED}" -name '*.la' -type f -delete || die
-   rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-}
-
-pkg_postinst() {
-   # ensure to preserve the symlink before app-alternatives/lex
-   # is installed
-   if [[ ! -h ${EROOT}/usr/bin/lex ]]; then
-   ln -s flex "${EROOT}/usr/bin/lex" || die
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-22 Thread Sam James

commit: a6a43da374cef37508c0b7872f64bd7922b569bf
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 22 12:11:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 22 12:11:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a43da3

sys-devel/flex: keyword 2.6.4-r5 for -arm64-macos (older version only)

This version is broken on arm64-macos. Newer versions are keyworded.

Bug: https://bugs.gentoo.org/871324
Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r5.ebuild 
b/sys-devel/flex/flex-2.6.4-r5.ebuild
index fd40eb233c51..23c53fb10d52 100644
--- a/sys-devel/flex/flex-2.6.4-r5.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux -arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-07 Thread Sam James

commit: ffa80f80d66a799d502506b8435287d3d6262efc
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 06:55:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 06:55:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa80f80

sys-devel/flex: Stabilize 2.6.4-r6 hppa, #903955

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index 9ee37cff1af5..9398c43042a4 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-07 Thread Sam James

commit: 04d2254565d4209d2df9ef50621108e1c18b2d1c
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 06:37:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 06:37:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d22545

sys-devel/flex: Stabilize 2.6.4-r6 ppc, #903955

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index 0d1ffa467366..9ee37cff1af5 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-06 Thread Sam James

commit: 41732d7c61c76d4c3f6c7905d6e82f655bd059b3
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 05:06:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 05:06:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41732d7c

sys-devel/flex: Stabilize 2.6.4-r6 sparc, #903955

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index 917b5cb4fcd2..b6ce68fd3b5f 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-06 Thread Sam James

commit: f3e23a98dba9b92fbe43440e164cdb30d050a0ed
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 05:06:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 05:06:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3e23a98

sys-devel/flex: Stabilize 2.6.4-r6 arm, #903955

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index 68495610068f..0b87ba2f57c8 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-06 Thread Sam James

commit: 6d73c27bb6bbbf2630c1292e67ac1610160ecf28
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 05:06:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 05:06:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d73c27b

sys-devel/flex: Stabilize 2.6.4-r6 arm64, #903955

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index 9c0aad6051dd..68495610068f 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-06 Thread Sam James

commit: 70e05ca86f8b23616e2bf6943d0d9ea5871a075b
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 05:06:25 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 05:06:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e05ca8

sys-devel/flex: Stabilize 2.6.4-r6 ppc64, #903955

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index b6ce68fd3b5f..0d1ffa467366 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-06 Thread Sam James

commit: 899694b45fd0079d3dce1e36ac599d1e0ef14496
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 05:06:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 05:06:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899694b4

sys-devel/flex: Stabilize 2.6.4-r6 amd64, #903955

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index b4d76b9e0b1a..9c0aad6051dd 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-04-06 Thread Sam James

commit: ee2abd9f85d5394fb404caa9625846d0f99580b9
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  7 05:06:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  7 05:06:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2abd9f

sys-devel/flex: Stabilize 2.6.4-r6 x86, #903955

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index 0b87ba2f57c8..917b5cb4fcd2 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2023-02-20 Thread Sam James

commit: 7ff3874a1a6ea59ad3ea195b66921b7e332f2f4d
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 20 13:49:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 20 13:49:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff3874a

sys-devel/flex: destabilize 2.6.4-r6

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
index 6da72c3dfe33..b4d76b9e0b1a 100644
--- a/sys-devel/flex/flex-2.6.4-r6.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/, sys-devel/flex/files/

2023-02-20 Thread Sam James

commit: 3ab5b78c47ee2dcfdb2de0ae84f43c96d2e9c210
Author: Yifeng Li  tomli  me>
AuthorDate: Mon Feb 20 10:35:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 20 13:48:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab5b78c

sys-devel/flex: fix crash on Apple M1 due to undefined behavior.

Currently, when the NULL-terminated variadic function
filter_create_ext() is invoked, the value "0" is passed as
the last argument to act as a terminator. However, this is
an integer value, which is incompatible with the pointer
data type expected by filter_create_ext().

This is undefined behavior in C, correct operation is not
guaranteed. In fact, it causes flex to crash on Apple M1
when GCC is used - the loop is not terminated when it should,
instead, it keeps running, corrupting the argument list for
invoking m4. As a result, it creates the following error:

> flex: fatal internal error, exec of gm4 failed

This commit fixes the problem by explicitly casting the value
0 to the correct pointer type (char *).

Since the existence of the bug doesn't always prevent a Gentoo
Prefix bootstrapping, it can lurk inside the system and remain
undetected, furthermore, it's technically a C programming bug,
other platforms could've been affected as well in theory. Thus,
we also bump the package version.

Closes: https://bugs.gentoo.org/871324
Signed-off-by: Yifeng Li  tomli.me>
Signed-off-by: Sam James  gentoo.org>

 ...x-apple-m1-crash-by-explicit-pointer-cast.patch |  48 ++
 sys-devel/flex/flex-2.6.4-r6.ebuild| 101 +
 2 files changed, 149 insertions(+)

diff --git 
a/sys-devel/flex/files/flex-2.6.4-fix-apple-m1-crash-by-explicit-pointer-cast.patch
 
b/sys-devel/flex/files/flex-2.6.4-fix-apple-m1-crash-by-explicit-pointer-cast.patch
new file mode 100644
index ..c594262d2cb0
--- /dev/null
+++ 
b/sys-devel/flex/files/flex-2.6.4-fix-apple-m1-crash-by-explicit-pointer-cast.patch
@@ -0,0 +1,48 @@
+https://github.com/westes/flex/issues/539
+https://github.com/westes/flex/pull/554
+https://bugs.gentoo.org/871324
+
+This is a backported version for applying to v2.6.4
+instead of git.
+
+From cce2df853386d5b5b60445b1204dcca08e9f259e Mon Sep 17 00:00:00 2001
+From: Yifeng Li 
+Date: Mon, 20 Feb 2023 11:23:52 +
+Subject: [PATCH] Fix #539 crash on Apple M1 by casting 0 to (char *)
+ explicitly
+
+Currently, when the NULL-terminated variadic function
+filter_create_ext() is invoked, the value "0" is passed as
+the last argument to act as a terminator. However, this is
+an integer value, which is incompatible with the pointer
+data type expected by filter_create_ext().
+
+This is undefined behavior in C, correct operation is not
+guaranteed. In fact, it causes flex to crash on Apple M1
+when GCC is used - the loop is not terminated when it should,
+instead, it keeps running, corrupting the argument list for
+invoking m4. As a result, it creates the following error:
+
+> flex: fatal internal error, exec of gm4 failed
+
+This commit fixes the problem by explicitly casting the value 0 to
+the correct pointer type (char *).
+
+Signed-off-by: Yifeng Li 
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index e5eac44fe..5c9086183 100644
+--- a/src/main.c
 b/src/main.c
+@@ -380,7 +380,7 @@ void check_options (void)
+   }
+   }
+   }
+-filter_create_ext(output_chain, m4, "-P", 0);
++filter_create_ext(output_chain, m4, "-P", (char *) 0);
+ filter_create_int(output_chain, filter_fix_linedirs, NULL);
+ 
+ /* For debugging, only run the requested number of filters. */

diff --git a/sys-devel/flex/flex-2.6.4-r6.ebuild 
b/sys-devel/flex/flex-2.6.4-r6.ebuild
new file mode 100644
index ..6da72c3dfe33
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.4-r6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="https://github.com/westes/flex;
+SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz;
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools-regenerate.patch.xz;
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"
+
+RDEPEND="sys-devel/m4"
+# We want bison explicitly and not yacc in general, bug #381273
+BDEPEND="
+   ${RDEPEND}
+   nls? ( sys-devel/gettext )
+   test? ( sys-devel/bison )
+"
+PDEPEND="app-alternatives/lex"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-libobjdir.patch
+

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/

2022-12-27 Thread Sam James

commit: a288f455ec1f527b20e3c90ae4b3662413bf68fe
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 23:54:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 28 00:32:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a288f455

sys-devel/flex: drop 2.6.4-r2, 2.6.4-r4

Signed-off-by: Sam James  gentoo.org>

 .../flex-2.6.4-fix-build-with-glibc2.6+.patch  | 767 -
 sys-devel/flex/flex-2.6.4-r2.ebuild|  94 ---
 sys-devel/flex/flex-2.6.4-r4.ebuild|  93 ---
 3 files changed, 954 deletions(-)

diff --git a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch 
b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
deleted file mode 100644
index 328b57524565..
--- a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
+++ /dev/null
@@ -1,767 +0,0 @@
-Backport of 
https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380
-
-Bug: https://bugs.gentoo.org/628744
-
 a/configure
-+++ b/configure
-@@ -3605,13 +3605,142 @@ test -z "$SED" && SED=sed
- Xsed="$SED -e 1s/^X//"
- 
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C 
preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if ${ac_cv_prog_CPP+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  # Double quotes because CPP needs to be expanded
-+for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+do
-+  ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer  to  if __STDC__ is defined, since
-+  #  exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include 
-+#else
-+# include 
-+#endif
-+   Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include 
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
- 
-+done
-+ac_cv_prog_CPP=$CPP
- 
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer  to  if __STDC__ is defined, since
-+  #  exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include 
-+#else
-+# include 
-+#endif
-+   Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include 
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
- 
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details" "$LINENO" 5; }
-+fi
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-12-27 Thread Sam James

commit: 9c3462cfb5a91b78c622d8941ffc7e8ad3a50b3c
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 19:47:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 27 19:53:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3462cf

sys-devel/flex: Stabilize 2.6.4-r5 ppc64, #886017

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r5.ebuild 
b/sys-devel/flex/flex-2.6.4-r5.ebuild
index 31d640412abd..64dbde0f449c 100644
--- a/sys-devel/flex/flex-2.6.4-r5.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-12-27 Thread Sam James

commit: 96c48b5d1001cbbf86ef1b3d42665941c9cf7368
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 19:36:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 27 19:45:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c48b5d

sys-devel/flex: Stabilize 2.6.4-r5 hppa, #886017

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r5.ebuild 
b/sys-devel/flex/flex-2.6.4-r5.ebuild
index d15c829c2e42..83af3d244167 100644
--- a/sys-devel/flex/flex-2.6.4-r5.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-12-27 Thread Sam James

commit: c817ff3385f539dbde22fbe6f696bed92900ea2e
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 13:39:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 27 13:39:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c817ff33

sys-devel/flex: Stabilize 2.6.4-r5 arm64, #886017

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r5.ebuild 
b/sys-devel/flex/flex-2.6.4-r5.ebuild
index 24e936e9ce58..6169e8f2b21f 100644
--- a/sys-devel/flex/flex-2.6.4-r5.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-12-27 Thread Sam James

commit: 23402f1e7098e6e805be7618a7c9ba89a69528d9
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 11:31:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 27 11:31:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23402f1e

sys-devel/flex: Stabilize 2.6.4-r5 amd64, #886017

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r5.ebuild 
b/sys-devel/flex/flex-2.6.4-r5.ebuild
index e064eb4e45ac..60afd1f2b45d 100644
--- a/sys-devel/flex/flex-2.6.4-r5.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-12-02 Thread Sam James

commit: 0f4c0cca41ac0cb32d7632f6278d58d4a8cf88f1
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  2 03:56:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  2 21:09:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4c0cca

sys-devel/flex: support app-alternatives/lex

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r5.ebuild | 100 
 1 file changed, 100 insertions(+)

diff --git a/sys-devel/flex/flex-2.6.4-r5.ebuild 
b/sys-devel/flex/flex-2.6.4-r5.ebuild
new file mode 100644
index ..e064eb4e45ac
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.4-r5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="https://github.com/westes/flex;
+SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz;
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools-regenerate.patch.xz;
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"
+
+RDEPEND="sys-devel/m4"
+# We want bison explicitly and not yacc in general, bug #381273
+BDEPEND="
+   ${RDEPEND}
+   nls? ( sys-devel/gettext )
+   test? ( sys-devel/bison )
+"
+PDEPEND="app-alternatives/lex"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-libobjdir.patch
+   "${FILESDIR}"/${P}-fix-build-with-glibc2.26.patch
+
+   "${WORKDIR}"/${P}-autotools-regenerate.patch
+)
+
+src_prepare() {
+   default
+
+   # Drop on next release when we can remove 
${P}-autotools-regenerate.patch
+   touch configure.ac aclocal.m4 Makefile.in configure src/config.h.in || 
die
+
+   # Disable running in the tests/ subdir as it has a bunch of built 
sources
+   # that cannot be made conditional (automake limitation). bug #568842
+   if ! use test ; then
+   sed -i \
+   -e '/^SUBDIRS =/,/^$/{/tests/d}' \
+   Makefile.in || die
+   fi
+
+   # Prefix always needs this
+   elibtoolize
+}
+
+src_configure() {
+   use static && append-ldflags -static
+
+   multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+   # Do not install shared libs, #503522
+   ECONF_SOURCE="${S}" econf \
+   CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+   --disable-shared \
+   $(use_enable nls)
+}
+
+multilib_src_compile() {
+   if multilib_is_native_abi; then
+   default
+   else
+   emake -C src -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
+   emake -C src DESTDIR="${D}" install-libLTLIBRARIES 
install-includeHEADERS
+   fi
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   dodoc ONEWS
+   find "${ED}" -name '*.la' -type f -delete || die
+   rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+}
+
+pkg_postinst() {
+   # ensure to preserve the symlink before app-alternatives/lex
+   # is installed
+   if [[ ! -h ${EROOT}/usr/bin/lex ]]; then
+   ln -s flex "${EROOT}/usr/bin/lex" || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-11-17 Thread Arthur Zamarin

commit: 37ebd2afe651c59457d2040bda4bbdd786ea689d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 18 07:50:49 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 18 07:50:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ebd2af

sys-devel/flex: Stabilize 2.6.4-r4 hppa, #881719

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index 451c78fd7cc7..d588701fdf44 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-11-17 Thread Sam James

commit: ab5052dc3d62b28b8ab057cf3e7a9004edb823f5
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 04:54:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 04:54:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5052dc

sys-devel/flex: Stabilize 2.6.4-r4 ppc, #881719

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index 2227471b0898..451c78fd7cc7 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-11-17 Thread Sam James

commit: a425998c679823a09e9b32f226b77d9374d2f248
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 04:54:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 04:54:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a425998c

sys-devel/flex: Stabilize 2.6.4-r4 arm, #881719

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index cbf411c3090b..2227471b0898 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-11-17 Thread Sam James

commit: d78216c1095d5ee25014cb52b46c53b83eb302cb
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 04:54:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 04:54:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d78216c1

sys-devel/flex: Stabilize 2.6.4-r4 ppc64, #881719

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index 429d605e407d..cbf411c3090b 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-11-17 Thread Sam James

commit: 896f22fc3188cffc4ea86cd059d9ebc4d7d5137e
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 04:54:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 04:54:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896f22fc

sys-devel/flex: Stabilize 2.6.4-r4 x86, #881719

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index 7355fb1be9c0..9ad7ed904d1b 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-11-17 Thread Sam James

commit: 2835901e258a9880ff22964cc44f02cb9d76c8aa
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 04:54:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 04:54:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2835901e

sys-devel/flex: Stabilize 2.6.4-r4 arm64, #881719

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index 9ad7ed904d1b..429d605e407d 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-11-17 Thread Sam James

commit: 901c5244b661a3a8e9a72af489dcffa931c0ec88
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 04:54:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 04:54:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=901c5244

sys-devel/flex: Stabilize 2.6.4-r4 amd64, #881719

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index c54dfe66a311..7355fb1be9c0 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-11-17 Thread Sam James

commit: b9f85f993830b653b198d441643a0f6f7b8cb7b8
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 18 04:25:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 18 04:25:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f85f99

sys-devel/flex: Stabilize 2.6.4-r4 sparc, #881719

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index 14ad4c2ba6b1..c54dfe66a311 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotool
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-10-27 Thread Sam James

commit: 51ce26ce6dd264cab35669505333ce7bea95b545
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 01:57:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 01:57:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ce26ce

sys-devel/flex: drop obsolete cross malloc workaround

We set the right bits in crossdev for musl targets now and, in theory, while
unlikely, it is possible that some cross targets don't have the right behaviour
anyway (not that i'm aware of any in use).

Bug: https://bugs.gentoo.org/705800
Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r4.ebuild | 9 -
 1 file changed, 9 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild 
b/sys-devel/flex/flex-2.6.4-r4.ebuild
index 0fb0e60d9372..14ad4c2ba6b1 100644
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r4.ebuild
@@ -56,15 +56,6 @@ src_configure() {
 }
 
 multilib_src_configure() {
-   if tc-is-cross-compiler ; then
-   # Similar to workaround for procps:
-   # - bug #705800
-   # - https://sourceforge.net/p/psmisc/bugs/71/
-   # - 
https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html
-   export ac_cv_func_malloc_0_nonnull=yes \
-   ac_cv_func_realloc_0_nonnull=yes
-   fi
-
# Do not install shared libs, #503522
ECONF_SOURCE="${S}" econf \
CC_FOR_BUILD="$(tc-getBUILD_CC)" \

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/, sys-devel/flex/files/

2022-10-27 Thread Sam James

commit: af4a94a1b5b778c0d983fbe6370b5ded4e6b54e1
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 00:35:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 01:54:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4a94a1

sys-devel/flex: backport further macro fixes

The gist is that the original glibc-2.26 patch was incomplete
and didn't help with cross-compilation or non-glibc environments
fully.

There were a succession of further upstream commits
now backported here. Noticed when doing some more Clang 16 work.

This complements bec6a7be57fc3493dccef497b5d4b513c315f5f1 in that
more effort is taken to ensure all necessary macros are defined
so needed functions are available.

Bug: https://bugs.gentoo.org/628744
Bug: https://bugs.gentoo.org/705800
See: bec6a7be57fc3493dccef497b5d4b513c315f5f1
See: 4d77781e2db7bb8bef7f390c43efc04ba58ff7bb
See: aa6c077d00c3a21b75ae646421aefadcad527f80
Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/Manifest|   2 +-
 .../flex-2.6.4-fix-build-with-glibc2.26.patch  | 219 +
 .../{flex-2.6.4-r3.ebuild => flex-2.6.4-r4.ebuild} |  20 +-
 3 files changed, 233 insertions(+), 8 deletions(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 0e5c2985d561..34ccf066269d 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,2 +1,2 @@
-DIST flex-2.6.4-implicit-func-decl.patch.xz 6572 BLAKE2B 
7b2eb1d240e46470c4899b667fc6fbb1d0f91d784d67bb47f351c35683bda4d3c5d59479a8a26f1d9250fd9f6ce9e8b77ee7c53183c09735e898b48cd74bcb88
 SHA512 
cf7e5ac35b617b40ac3ca3dcf5c5ec5e81a1a48b99348c646aa68f61f3a83cbda3c9a6e820ad275f994220a6290518c4f56bdba9c0ed303cf27e60a75f4eb88c
+DIST flex-2.6.4-autotools-regenerate.patch.xz 282588 BLAKE2B 
3995b8b5e354a43b1a4ff72fae76027c904ddb24eb8e5d55fc6fbe81299f48fa70ac3c4a98b9ed39aca8a98190d6db5005cacb96ec1016d413860d84a434dcc0
 SHA512 
9efd3197fdf7f8435dfbf4dafbe6b99c1fafede0ec364dbeb9cca81711763d693bc5d30fc3b2af038a44f8848577d19dd737e3afe0cd3b08ab79daea64fcdefa
 DIST flex-2.6.4.tar.gz 1419096 BLAKE2B 
c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62
 SHA512 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e

diff --git a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch 
b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch
new file mode 100644
index ..9a9de8746b89
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch
@@ -0,0 +1,219 @@
+https://github.com/westes/flex/issues/436
+https://bugs.gentoo.org/705800
+https://developers.redhat.com/blog/2019/04/22/implicit-function-declarations-flexs-use-of-reallocarray
+https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda
+https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380
+https://github.com/westes/flex/commit/0db9f8903a446e7026874be519b8dc55a471f014
+https://github.com/westes/flex/commit/a17d79e9c722a6735b6d2a8f152287404f27df32
+https://github.com/westes/flex/commit/4081efa0831b15d7e4e4255401c225ad8262426d
+https://github.com/westes/flex/commit/1985bb3c7abed940e91ad816504ef08a18c3b7c1
+
+From 4b5111d9772b5c160340ca96f08d30d7f6db5cda Mon Sep 17 00:00:00 2001
+From: Explorer09 
+Date: Mon, 4 Sep 2017 08:28:53 +0800
+Subject: [PATCH] scanner: Include flexdef.h at %top block of scan.l
+
+config.h may define macros that alter the API of the standard library
+funtions, and so it should be included before any other standard
+header, even before the skeleton's standard header inclusion.
+
+For example: config.h may #define _GNU_SOURCE that would expose the
+reallocarray() prototype from  on glibc 2.26+ systems. If we
+include  before config.h, reallocarray() would not be
+available for use in lex file since the second include doesn't help
+due to header guard.
+
+For now our config.h might `#define malloc rpl_malloc` -- this
+substitution must work before including stdlib.h, or else the compiler
+will complain about missing prototypes, and may result in incorrect
+code in scan.l (gcc warning: return makes pointer from integer without
+a cast [-Wint-conversion]).
+
+Fixes #247.
+--- a/src/scan.l
 b/src/scan.l
+@@ -1,5 +1,11 @@
+ /* scan.l - scanner for flex input -*-C-*- */
+ 
++%top{
++/* flexdef.h includes config.h, which may contain macros that alter the API */
++/* of libc functions. Must include first before any libc header. */
++#include "flexdef.h"
++}
++
+ %{
+ /*  Copyright (c) 1990 The Regents of the University of California. */
+ /*  All rights reserved. */
+@@ -32,7 +38,6 @@
+ /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
+ /*  PURPOSE. */
+ 
+-#include "flexdef.h"
+ #include "parse.h"
+ extern bool tablesverify, tablesext;
+ extern int trlcontxt; /* Set in  parse.y for

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-10-27 Thread Sam James

commit: e3060be420ab7fb47daddfd126240fad02573dc2
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 01:54:42 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 01:54:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3060be4

sys-devel/flex: drop 2.6.4-r1

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r1.ebuild | 83 -
 1 file changed, 83 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
deleted file mode 100644
index 309967cc2b37..
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="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 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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"
-BDEPEND="${RDEPEND}
-   nls? ( sys-devel/gettext )
-   test? ( sys-devel/bison )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
-   "${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
-)
-
-src_prepare() {
-   default
-
-   # 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 \
-   CC_FOR_BUILD="$(tc-getBUILD_CC)" \
-   --disable-shared \
-   $(use_enable nls)
-}
-
-multilib_src_compile() {
-   if multilib_is_native_abi; then
-   default
-   else
-   emake -C src -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
-   emake -C src DESTDIR="${D}" install-libLTLIBRARIES 
install-includeHEADERS
-   fi
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   dodoc ONEWS
-   find "${ED}" -name '*.la' -type f -delete || die
-   rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-   dosym flex /usr/bin/lex
-}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/, sys-devel/flex/files/

2022-10-27 Thread Sam James

commit: 0ca92815271c88de49c6f061e9ac81e7ed2b6108
Author: Sam James  gentoo  org>
AuthorDate: Thu Oct 27 23:45:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 27 23:45:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ca92815

sys-devel/flex: fix build w/o flex

We touch a file which has a generated derivative, so regenerate that.

Closes: https://bugs.gentoo.org/878339
Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/Manifest|  1 +
 .../flex/files/flex-2.6.4-implicit-func-decl.patch | 50 --
 sys-devel/flex/flex-2.6.4-r3.ebuild|  3 +-
 3 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 327f0405ede2..0e5c2985d561 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1 +1,2 @@
+DIST flex-2.6.4-implicit-func-decl.patch.xz 6572 BLAKE2B 
7b2eb1d240e46470c4899b667fc6fbb1d0f91d784d67bb47f351c35683bda4d3c5d59479a8a26f1d9250fd9f6ce9e8b77ee7c53183c09735e898b48cd74bcb88
 SHA512 
cf7e5ac35b617b40ac3ca3dcf5c5ec5e81a1a48b99348c646aa68f61f3a83cbda3c9a6e820ad275f994220a6290518c4f56bdba9c0ed303cf27e60a75f4eb88c
 DIST flex-2.6.4.tar.gz 1419096 BLAKE2B 
c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62
 SHA512 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e

diff --git a/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch 
b/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch
deleted file mode 100644
index 1900ae0529b9..
--- a/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda
-https://github.com/westes/flex/issues/436
-https://bugs.gentoo.org/705800
-https://developers.redhat.com/blog/2019/04/22/implicit-function-declarations-flexs-use-of-reallocarray
-
-From 4b5111d9772b5c160340ca96f08d30d7f6db5cda Mon Sep 17 00:00:00 2001
-From: Explorer09 
-Date: Mon, 4 Sep 2017 08:28:53 +0800
-Subject: [PATCH] scanner: Include flexdef.h at %top block of scan.l
-
-config.h may define macros that alter the API of the standard library
-funtions, and so it should be included before any other standard
-header, even before the skeleton's standard header inclusion.
-
-For example: config.h may #define _GNU_SOURCE that would expose the
-reallocarray() prototype from  on glibc 2.26+ systems. If we
-include  before config.h, reallocarray() would not be
-available for use in lex file since the second include doesn't help
-due to header guard.
-
-For now our config.h might `#define malloc rpl_malloc` -- this
-substitution must work before including stdlib.h, or else the compiler
-will complain about missing prototypes, and may result in incorrect
-code in scan.l (gcc warning: return makes pointer from integer without
-a cast [-Wint-conversion]).
-
-Fixes #247.
 a/src/scan.l
-+++ b/src/scan.l
-@@ -1,5 +1,11 @@
- /* scan.l - scanner for flex input -*-C-*- */
- 
-+%top{
-+/* flexdef.h includes config.h, which may contain macros that alter the API */
-+/* of libc functions. Must include first before any libc header. */
-+#include "flexdef.h"
-+}
-+
- %{
- /*  Copyright (c) 1990 The Regents of the University of California. */
- /*  All rights reserved. */
-@@ -32,7 +38,6 @@
- /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
- /*  PURPOSE. */
- 
--#include "flexdef.h"
- #include "parse.h"
- extern bool tablesverify, tablesext;
- extern int trlcontxt; /* Set in  parse.y for each rule. */
-

diff --git a/sys-devel/flex/flex-2.6.4-r3.ebuild 
b/sys-devel/flex/flex-2.6.4-r3.ebuild
index 1f1ebfe61893..1fe2eb9549ec 100644
--- a/sys-devel/flex/flex-2.6.4-r3.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r3.ebuild
@@ -8,6 +8,7 @@ inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://github.com/westes/flex;
 SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz;
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-implicit-func-decl.patch.xz;
 
 LICENSE="FLEX"
 SLOT="0"
@@ -24,7 +25,7 @@ BDEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
"${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
-   "${FILESDIR}"/${P}-implicit-func-decl.patch
+   "${WORKDIR}"/${P}-implicit-func-decl.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/, sys-devel/flex/files/

2022-10-25 Thread Sam James

commit: bec6a7be57fc3493dccef497b5d4b513c315f5f1
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 25 11:41:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 25 11:42:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec6a7be

sys-devel/flex: backport "config.h" fix too

We already have the patch to config.h/configure.ac backported
but we don't have the fix to actually *use* config.h everywhere,
and clearly from bug #705800 it wasn't sufficient to just backport
it (for reasons covered in the bug & upstream bug).

Bug: https://bugs.gentoo.org/628744
Bug: https://bugs.gentoo.org/705800
Signed-off-by: Sam James  gentoo.org>

 .../flex/files/flex-2.6.4-implicit-func-decl.patch | 50 
 sys-devel/flex/flex-2.6.4-r3.ebuild| 95 ++
 2 files changed, 145 insertions(+)

diff --git a/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch 
b/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch
new file mode 100644
index ..1900ae0529b9
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch
@@ -0,0 +1,50 @@
+https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda
+https://github.com/westes/flex/issues/436
+https://bugs.gentoo.org/705800
+https://developers.redhat.com/blog/2019/04/22/implicit-function-declarations-flexs-use-of-reallocarray
+
+From 4b5111d9772b5c160340ca96f08d30d7f6db5cda Mon Sep 17 00:00:00 2001
+From: Explorer09 
+Date: Mon, 4 Sep 2017 08:28:53 +0800
+Subject: [PATCH] scanner: Include flexdef.h at %top block of scan.l
+
+config.h may define macros that alter the API of the standard library
+funtions, and so it should be included before any other standard
+header, even before the skeleton's standard header inclusion.
+
+For example: config.h may #define _GNU_SOURCE that would expose the
+reallocarray() prototype from  on glibc 2.26+ systems. If we
+include  before config.h, reallocarray() would not be
+available for use in lex file since the second include doesn't help
+due to header guard.
+
+For now our config.h might `#define malloc rpl_malloc` -- this
+substitution must work before including stdlib.h, or else the compiler
+will complain about missing prototypes, and may result in incorrect
+code in scan.l (gcc warning: return makes pointer from integer without
+a cast [-Wint-conversion]).
+
+Fixes #247.
+--- a/src/scan.l
 b/src/scan.l
+@@ -1,5 +1,11 @@
+ /* scan.l - scanner for flex input -*-C-*- */
+ 
++%top{
++/* flexdef.h includes config.h, which may contain macros that alter the API */
++/* of libc functions. Must include first before any libc header. */
++#include "flexdef.h"
++}
++
+ %{
+ /*  Copyright (c) 1990 The Regents of the University of California. */
+ /*  All rights reserved. */
+@@ -32,7 +38,6 @@
+ /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
+ /*  PURPOSE. */
+ 
+-#include "flexdef.h"
+ #include "parse.h"
+ extern bool tablesverify, tablesext;
+ extern int trlcontxt; /* Set in  parse.y for each rule. */
+

diff --git a/sys-devel/flex/flex-2.6.4-r3.ebuild 
b/sys-devel/flex/flex-2.6.4-r3.ebuild
new file mode 100644
index ..1f1ebfe61893
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.4-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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, bug #381273
+RDEPEND="sys-devel/m4"
+BDEPEND="${RDEPEND}
+   nls? ( sys-devel/gettext )
+   test? ( sys-devel/bison )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
+   "${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
+   "${FILESDIR}"/${P}-implicit-func-decl.patch
+)
+
+src_prepare() {
+   default
+
+   # Disable running in the tests/ subdir as it has a bunch of built 
sources
+   # that cannot be made conditional (automake limitation). bug #568842
+   if ! use test ; then
+   sed -i \
+   -e '/^SUBDIRS =/,/^$/{/tests/d}' \
+   Makefile.in || die
+   fi
+
+   # Prefix always needs this
+   elibtoolize
+}
+
+src_configure() {
+   use static && append-ldflags -static
+
+   multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+   if tc-is-cross-compiler ; then
+   # Similar to workaround for procps:
+   # - bug #705800
+

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-09-25 Thread Arthur Zamarin

commit: 433043c5b1f930acaae84df997d6aa4ac084a950
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Sep 26 04:15:52 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Sep 26 04:15:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433043c5

sys-devel/flex: Stabilize 2.6.4-r2 hppa, #872734

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
index 2754b8fda7fb..81df61f3d33f 100644
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -11,7 +11,7 @@ 
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 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-09-25 Thread Arthur Zamarin

commit: fda706393f93880df9be98d229098b9ef5d19f20
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Sep 25 07:21:15 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Sep 25 07:21:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda70639

sys-devel/flex: Stabilize 2.6.4-r2 sparc, #872734

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
index b456a170a5b6..2754b8fda7fb 100644
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -11,7 +11,7 @@ 
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 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-09-25 Thread Agostino Sarubbo

commit: cd1f756ff8fb97a915f11f70c1eeed85d00c0b35
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Sep 25 06:25:16 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Sep 25 06:25:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd1f756f

sys-devel/flex: Stabilize 2.6.4-r2 ppc64, #872734

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
index 93069409f061..b456a170a5b6 100644
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -11,7 +11,7 @@ 
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 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-09-25 Thread Agostino Sarubbo

commit: c6d83ec60002943593f81c6f1ba20962ed4b08bc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Sep 25 06:23:30 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Sep 25 06:23:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d83ec6

sys-devel/flex: Stabilize 2.6.4-r2 ppc, #872734

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
index 830c00de72e4..93069409f061 100644
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -11,7 +11,7 @@ 
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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-09-24 Thread Sam James

commit: e90a97d706516652341239669dc173341d93cefa
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 25 04:41:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 25 04:41:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90a97d7

sys-devel/flex: Stabilize 2.6.4-r2 arm64, #872734

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
index 80e7aa134696..2af6744f4091 100644
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -11,7 +11,7 @@ 
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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-09-24 Thread Sam James

commit: a1dc3d0b5f0ecb0759e965b1882a41197ab2ba7d
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 25 04:41:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 25 04:41:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1dc3d0b

sys-devel/flex: Stabilize 2.6.4-r2 arm, #872734

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
index 2af6744f4091..830c00de72e4 100644
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -11,7 +11,7 @@ 
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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-09-24 Thread Sam James

commit: 48d4f9e645673e1ff5bb71d575485f11c84c75f6
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 25 04:34:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 25 04:34:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48d4f9e6

sys-devel/flex: Stabilize 2.6.4-r2 x86, #872734

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
index 6f285f732065..80e7aa134696 100644
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -11,7 +11,7 @@ 
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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-09-24 Thread Sam James

commit: 9b4665554fdccc07e6004a14cd746df4d03b6b01
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 25 04:34:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 25 04:34:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b466555

sys-devel/flex: Stabilize 2.6.4-r2 amd64, #872734

Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
index b1e13e873c6d..6f285f732065 100644
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -11,7 +11,7 @@ 
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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2022-06-17 Thread Sam James

commit: 4d77781e2db7bb8bef7f390c43efc04ba58ff7bb
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 17 02:23:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 17 12:10:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d77781e

sys-devel/flex: fix segfault when cross-compiling

Temporary workaround until new crossdev is tagged, stabled,
and propagates.

Closes: https://bugs.gentoo.org/705800
Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r2.ebuild | 94 +
 1 file changed, 94 insertions(+)

diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild 
b/sys-devel/flex/flex-2.6.4-r2.ebuild
new file mode 100644
index ..b1e13e873c6d
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.4-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="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 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~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, bug #381273
+RDEPEND="sys-devel/m4"
+BDEPEND="${RDEPEND}
+   nls? ( sys-devel/gettext )
+   test? ( sys-devel/bison )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
+   "${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
+)
+
+src_prepare() {
+   default
+
+   # Disable running in the tests/ subdir as it has a bunch of built 
sources
+   # that cannot be made conditional (automake limitation). bug #568842
+   if ! use test ; then
+   sed -i \
+   -e '/^SUBDIRS =/,/^$/{/tests/d}' \
+   Makefile.in || die
+   fi
+
+   # Prefix always needs this
+   elibtoolize
+}
+
+src_configure() {
+   use static && append-ldflags -static
+
+   multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+   if tc-is-cross-compiler ; then
+   # Similar to workaround for procps:
+   # - bug #705800
+   # - https://sourceforge.net/p/psmisc/bugs/71/
+   # - 
https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html
+   export ac_cv_func_malloc_0_nonnull=yes \
+   ac_cv_func_realloc_0_nonnull=yes
+   fi
+
+   # Do not install shared libs, #503522
+   ECONF_SOURCE="${S}" econf \
+   CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+   --disable-shared \
+   $(use_enable nls)
+}
+
+multilib_src_compile() {
+   if multilib_is_native_abi; then
+   default
+   else
+   emake -C src -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
+   emake -C src DESTDIR="${D}" install-libLTLIBRARIES 
install-includeHEADERS
+   fi
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   dodoc ONEWS
+   find "${ED}" -name '*.la' -type f -delete || die
+   rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+
+   dosym flex /usr/bin/lex
+}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2021-05-17 Thread Sam James

commit: 714bfa983da16c9ab6cb10ce87cc135846e9ce61
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 23:06:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 22:34:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714bfa98

sys-devel/flex: drop dead sourceforge HOMEPAGE

Still keeping the remote-id for the (outdated)
site which is referenced in the README on github, though.

Closes: https://bugs.gentoo.org/708496
Signed-off-by: Sam James  gentoo.org>

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 9c73a8e03c3..592b017eec1 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 
 DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;
+HOMEPAGE="https://github.com/westes/flex;
 SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz;
 
 LICENSE="FLEX"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/, sys-devel/flex/files/

2021-04-30 Thread Andreas Sturmlechner

commit: 0438e6d3b20ae30dfc2339cca81f53c1f8b2a1d8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 18 22:46:30 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 30 19:02:45 2021 +
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..000
--- 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(

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2021-03-23 Thread Lars Wendler

commit: 6847596cf8255fd944662fe169ffdadca19cbbdf
Author: David Michael  gmail  com>
AuthorDate: Tue Mar 23 18:30:40 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Mar 23 20:58:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6847596c

sys-devel/flex: EAPI 7

Closes: https://bugs.gentoo.org/777906
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Lars Wendler  gentoo.org>

 sys-devel/flex/flex-2.6.4-r1.ebuild | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 71c554a4c79..2470db3ad1a 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eutils flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;
@@ -17,8 +17,7 @@ RESTRICT="!test? ( test )"
 
 # We want bison explicitly and not yacc in general #381273
 RDEPEND="sys-devel/m4"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
+BDEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
test? ( sys-devel/bison )"
 
@@ -59,8 +58,7 @@ multilib_src_compile() {
if multilib_is_native_abi; then
default
else
-   cd src || die
-   emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
+   emake -C src -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
fi
 }
 
@@ -72,15 +70,14 @@ multilib_src_install() {
if multilib_is_native_abi; then
default
else
-   cd src || die
-   emake DESTDIR="${D}" install-libLTLIBRARIES 
install-includeHEADERS
+   emake -C src DESTDIR="${D}" install-libLTLIBRARIES 
install-includeHEADERS
fi
 }
 
 multilib_src_install_all() {
einstalldocs
dodoc ONEWS
-   prune_libtool_files --all
+   find "${ED}" -name '*.la' -type f -delete || die
rm "${ED}"/usr/share/doc/${PF}/COPYING || die
dosym flex /usr/bin/lex
 }

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2021-01-06 Thread Fabian Groffen

commit: 3f11ba960e00fdc8c55acc876ddb137c473d4ad1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 15:29:37 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:29:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f11ba96

sys-devel/flex: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild| 4 ++--
 sys-devel/flex/flex-2.6.3-r1.ebuild | 4 ++--
 sys-devel/flex/flex-2.6.3.ebuild| 4 ++--
 sys-devel/flex/flex-2.6.4-r1.ebuild | 4 ++--
 sys-devel/flex/flex-2.6.4.ebuild| 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 0fdff406845..e96485aed82 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ 
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 ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 )"
 

diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild 
b/sys-devel/flex/flex-2.6.3-r1.ebuild
index aabfe555997..86c8beada8b 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ 
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 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 )"
 

diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index ddb5ad75e7d..92259329371 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ 
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 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 )"
 

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 51c7b0434be..71c554a4c79 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ 
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 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 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 )"
 

diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 1c80f7b26da..623bc261d89 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2020-12-27 Thread Fabian Groffen

commit: 349225a4327b40d68db59c23d24e62b078451323
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 27 18:16:19 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 27 18:16:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349225a4

sys-devel/flex: drop ppc-aix m68k-mint

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild| 2 +-
 sys-devel/flex/flex-2.6.3-r1.ebuild | 2 +-
 sys-devel/flex/flex-2.6.3.ebuild| 2 +-
 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 sys-devel/flex/flex-2.6.4.ebuild| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 762b101fcc0..0fdff406845 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -11,7 +11,7 @@ 
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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild 
b/sys-devel/flex/flex-2.6.3-r1.ebuild
index 845ab457766..aabfe555997 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index 8cc2ec6deb0..ddb5ad75e7d 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -11,7 +11,7 @@ 
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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 6d18e263400..51c7b0434be 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 51d7ff1d293..1c80f7b26da 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -11,7 +11,7 @@ 
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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2020-06-13 Thread Mike Gilbert

commit: 3370923f46b01137d4e48d89c58a3b13eb2c10a6
Author: Manoj Gupta  google  com>
AuthorDate: Wed Jun 10 21:40:11 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jun 13 14:57:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3370923f

sys-devel/flex: Respect portage host cc variable

Pass CC_FOR_BUILD to econf. Otherwise it invokes gcc instead of portage
specified HOST/BUILD CC.

Signed-off-by: Manoj Gupta  google.com>
Signed-off-by: Mike Gilbert  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/16177

 sys-devel/flex/flex-2.6.4-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index e040402480d..6d18e263400 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils flag-o-matic libtool ltprune multilib-minimal
+inherit eutils flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;
@@ -50,6 +50,7 @@ multilib_src_configure() {
# Do not install shared libs #503522
ECONF_SOURCE=${S} \
econf \
+   CC_FOR_BUILD="$(tc-getBUILD_CC)" \
--disable-shared \
$(use_enable nls)
 }

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2020-05-04 Thread Thomas Deutschmann

commit: bde760c4d2950b85e72cdd099a90f2a08f402a15
Author: Roy Yang  google  com>
AuthorDate: Sat May  2 22:16:49 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May  4 17:35:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde760c4

Fixed CPE tag for sys-devel/flex

Signed-off-by: Roy Yang  google.com>
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-devel/flex/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml
index 6f7c81d076d..be9974e7395 100644
--- a/sys-devel/flex/metadata.xml
+++ b/sys-devel/flex/metadata.xml
@@ -8,5 +8,6 @@

flex
westes/flex
+   cpe:/a:flex_project:flex

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2020-02-15 Thread David Seifert

commit: b9cc4a1c486059495214d6ee00df61ce22e1a91e
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 15 10:02:59 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 15 10:02:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9cc4a1c

sys-devel/flex: [QA] inherit ltprune.eclass directly

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild| 2 +-
 sys-devel/flex/flex-2.6.3-r1.ebuild | 4 ++--
 sys-devel/flex/flex-2.6.3.ebuild| 4 ++--
 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 sys-devel/flex/flex-2.6.4.ebuild| 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 3e476206523..d3b1aa4e85e 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic multilib-minimal
+inherit eutils flag-o-matic ltprune multilib-minimal
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;

diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild 
b/sys-devel/flex/flex-2.6.3-r1.ebuild
index ecb6e84db26..be6acefa30b 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils flag-o-matic libtool multilib-minimal
+inherit eutils flag-o-matic libtool ltprune multilib-minimal
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;

diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index 2f3c3a49c49..f2a60b83bbe 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils flag-o-matic libtool multilib-minimal
+inherit eutils flag-o-matic libtool ltprune multilib-minimal
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index d931860cb4f..18940acd6a1 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils flag-o-matic libtool multilib-minimal
+inherit eutils flag-o-matic libtool ltprune multilib-minimal
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;

diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 7b2cb965404..8f61cd8ee37 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils flag-o-matic libtool multilib-minimal
+inherit eutils flag-o-matic libtool ltprune multilib-minimal
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2019-05-04 Thread Andreas K. Hüttel

commit: 40507c009bfa0fe6a2399f86e7f10c9af0c93ff1
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May  4 19:46:05 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat May  4 19:51:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40507c00

sys-devel/flex: keyword ~riscv

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sys-devel/flex/flex-2.6.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index aabb6529af2..b38ee30c32d 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ 
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 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2018-04-21 Thread Mikle Kolyada

commit: 65ab2c11796223d7fca8978400e1411a2b42ceee
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Apr 21 09:29:07 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Apr 21 09:29:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65ab2c11

sys-devel/flex: m68k/s390/sh stable wrt bug #632523

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 5c546a6f020..6730a9218ee 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2018-04-14 Thread Mart Raudsepp

commit: ebd261b3291cc96838210e83db0b782bee8e3f73
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Apr 14 21:30:09 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Apr 14 21:31:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd261b3

sys-devel/flex-2.6.4-r1: arm64 stable (bug #632523)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 2e90d8e4c30..5c546a6f020 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-11-25 Thread Markus Meier

commit: 473f818c52df4f08195c6507d66cbeedc673d2a3
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Nov 25 11:52:18 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Nov 25 11:52:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473f818c

sys-devel/flex: arm stable, bug #632523

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="arm"

 sys-devel/flex/Manifest | 6 +++---
 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index db996620924..14e6b2bca98 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,3 +1,3 @@
-DIST flex-2.6.1.tar.xz 835048 SHA256 
2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 
1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 WHIRLPOOL 
d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
-DIST flex-2.6.3.tar.gz 1405560 SHA256 
68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa SHA512 
f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00
 WHIRLPOOL 
266266c4c15135fe52ec3b5226645b89c7053ec4dac257c9349d760601eaf50f7ec504d3c4b74951fd415d17299c2ca2e483e8c8c7f8ee936b4822d92603a4e2
-DIST flex-2.6.4.tar.gz 1419096 SHA256 
e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 SHA512 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
 WHIRLPOOL 
b19880ae3d760e04138ca93c848da07baa004bd193616855f1e650a170648288727d6a2bb5e657f05b204505d4b5b70e76a795037c81c6a19e1767cebadf8204
+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/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index aed8a0d69db..631409799bd 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-11-02 Thread Tobias Klausmann

commit: 85bd2a4614496b8e433ac6af5a97229d17327a27
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Thu Nov  2 13:13:08 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Thu Nov  2 14:33:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bd2a46

sys-devel/flex-2.6.4-r1: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/632523

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index f7c6bdbb1b2..aed8a0d69db 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-10-24 Thread Sergei Trofimovich

commit: 74fd0d6fe4ff393db970eb923df463e97e65beb2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Oct 24 19:14:05 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Oct 24 19:23:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74fd0d6f

sys-devel/flex: stable 2.6.4-r1 for ia64, bug #632523

Package-Manager: Portage-2.3.12, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index bbbc0839a7f..f7c6bdbb1b2 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-10-24 Thread Sergei Trofimovich

commit: 4288d13aaca779a3c54c3fa2d284dd5493651d41
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Oct 24 18:56:43 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Oct 24 18:56:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4288d13a

sys-devel/flex: stable 2.6.4-r1 for hppa/sparc, bug #632523 (thanks to Rolf 
Eike Beer)

Package-Manager: Portage-2.3.12, Repoman-2.3.3
RepoMan-Options: --include-arches="hppa sparc"

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 19cb15c97da..bbbc0839a7f 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-10-23 Thread Sergei Trofimovich

commit: 0034046b605d73bab6077b66f2cb5d23240a7615
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Oct 23 20:51:02 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Oct 23 20:51:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0034046b

sys-devel/flex: stable 2.6.4-r1 for ppc/ppc64, bug #632523

Package-Manager: Portage-2.3.12, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc ppc64"

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 8ff9c20b710..19cb15c97da 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 
~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-10-23 Thread Thomas Deutschmann

commit: 6e16907d3f82c03fc7d37ba470a79c4139896ad1
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct 23 18:31:32 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct 23 18:42:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e16907d

sys-devel/flex: x86 stable (bug #632523)

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 2a9234c5b3e..8ff9c20b710 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-10-23 Thread Manuel Rüger

commit: fcdf7e3699c3a3692ecf20623c55ec08df6220bf
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Oct 23 13:10:31 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Oct 23 13:10:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcdf7e36

sys-devel/flex: Stable on amd64

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 sys-devel/flex/flex-2.6.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index b221d35914b..2a9234c5b3e 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
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 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/, sys-devel/flex/files/

2017-10-13 Thread Thomas Deutschmann

commit: aa6c077d00c3a21b75ae646421aefadcad527f80
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct 13 20:16:10 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 13 20:19:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6c077d

sys-devel/flex: Rev bump to fix multiple problems

Closes: https://bugs.gentoo.org/628744
Closes: https://bugs.gentoo.org/625508
See: https://bugs.gentoo.org/632523
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 .../flex-2.6.4-fix-build-with-glibc2.6+.patch  | 767 +
 sys-devel/flex/files/flex-2.6.4-libobjdir.patch|  26 +
 sys-devel/flex/flex-2.6.4-r1.ebuild|  85 +++
 3 files changed, 878 insertions(+)

diff --git a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch 
b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
new file mode 100644
index 000..328b5752456
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
@@ -0,0 +1,767 @@
+Backport of 
https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380
+
+Bug: https://bugs.gentoo.org/628744
+
+--- a/configure
 b/configure
+@@ -3605,13 +3605,142 @@ test -z "$SED" && SED=sed
+ Xsed="$SED -e 1s/^X//"
+ 
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C 
preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if ${ac_cv_prog_CPP+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  # Double quotes because CPP needs to be expanded
++for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++do
++  ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer  to  if __STDC__ is defined, since
++  #  exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include 
++#else
++# include 
++#endif
++   Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include 
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++  break
++fi
+ 
++done
++ac_cv_prog_CPP=$CPP
+ 
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer  to  if __STDC__ is defined, since
++  #  exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include 
++#else
++# include 
++#endif
++   Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include 
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
+ 
++else
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "C preprocessor

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-09-09 Thread Sergei Trofimovich

commit: 80299f24589523bc633ff2698a360429ce96f3c4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep  9 08:27:32 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep  9 08:28:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80299f24

sys-devel/flex: allow user patches for cases like #628744

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-devel/flex/flex-2.6.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 6ab22250d5f..c2d32936d7c 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 
 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

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-05-07 Thread Lars Wendler

commit: 4a58589864d4a047375fff2c9f62c3006ff65f8d
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun May  7 18:55:27 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun May  7 18:55:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a585898

sys-devel/flex: Bump to version 2.6.4

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-devel/flex/Manifest  |  1 +
 sys-devel/flex/flex-2.6.4.ebuild | 80 
 2 files changed, 81 insertions(+)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 7e63a4ea6ff..db996620924 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,2 +1,3 @@
 DIST flex-2.6.1.tar.xz 835048 SHA256 
2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 
1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 WHIRLPOOL 
d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
 DIST flex-2.6.3.tar.gz 1405560 SHA256 
68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa SHA512 
f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00
 WHIRLPOOL 
266266c4c15135fe52ec3b5226645b89c7053ec4dac257c9349d760601eaf50f7ec504d3c4b74951fd415d17299c2ca2e483e8c8c7f8ee936b4822d92603a4e2
+DIST flex-2.6.4.tar.gz 1419096 SHA256 
e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 SHA512 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
 WHIRLPOOL 
b19880ae3d760e04138ca93c848da07baa004bd193616855f1e650a170648288727d6a2bb5e657f05b204505d4b5b70e76a795037c81c6a19e1767cebadf8204

diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
new file mode 100644
index 000..6ab22250d5f
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic libtool 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 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static 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[@]}"
+
+   # 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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/, sys-devel/flex/files/

2017-03-23 Thread Lars Wendler

commit: b4f455b89cd6fd4b72ee4ec1626ed7a20bd5f28a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 23 12:19:46 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 23 12:20:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f455b8

sys-devel/flex: Added upstream reentrant patch to fix wine breakage.

See https://bugs.winehq.org/show_bug.cgi?id=42132

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-devel/flex/files/flex-2.6.3-reentrant.patch | 82 
 sys-devel/flex/flex-2.6.3-r1.ebuild | 84 +
 2 files changed, 166 insertions(+)

diff --git a/sys-devel/flex/files/flex-2.6.3-reentrant.patch 
b/sys-devel/flex/files/flex-2.6.3-reentrant.patch
new file mode 100644
index 000..f2f5eb8374b
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.3-reentrant.patch
@@ -0,0 +1,82 @@
+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.3-r1.ebuild 
b/sys-devel/flex/flex-2.6.3-r1.ebuild
new file mode 100644
index 000..2cd53fc6b2f
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic libtool 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 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static 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() {

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-03-21 Thread Michael Haubenwallner

commit: a5146d4469714872bcf31ce9e610069cd58f187a
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Tue Mar 21 15:31:41 2017 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Tue Mar 21 15:41:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5146d44

sys-devel/flex: add ~x64-cygwin keyword

Package-Manager: portage-2.3.3

 sys-devel/flex/flex-2.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index 50bee4cf932..c5b8bc75421 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -11,7 +11,7 @@ 
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 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-03-19 Thread Fabian Groffen

commit: fc534600debfabeabf8bd692a6d9b4f93484755e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Mar 19 10:13:17 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Mar 19 10:13:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc534600

sys-devel/flex: remove duplicate keywords

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-devel/flex/flex-2.6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index 7eaa844b4b6..50bee4cf932 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -11,7 +11,7 @@ 
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 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~ppc-aix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-03-19 Thread Fabian Groffen

commit: 03c224737376530e05d7e278fbdba8a2baf457e3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Mar 19 10:09:55 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Mar 19 10:09:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03c22473

sys-devel/flex: add Prfix keywords and elibtoolize

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-devel/flex/flex-2.6.3.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index b0607659333..7eaa844b4b6 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic multilib-minimal
+inherit eutils flag-o-matic libtool multilib-minimal
 
 DESCRIPTION="The Fast Lexical Analyzer"
 HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex;
@@ -11,7 +11,7 @@ 
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 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~ppc-aix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273
@@ -29,6 +29,7 @@ src_prepare() {
-e '/^SUBDIRS =/,/^$/{/tests/d}' \
Makefile.in || die
fi
+   elibtoolize # Prefix always needs this
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-01-17 Thread Mike Frysinger

commit: 5683fcbde32afaa80c4b0efe90fdfaacd7b128ee
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Jan 17 20:34:00 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Jan 17 20:38:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5683fcbd

sys-devel/flex: mark 2.6.1 arm64/m68k/s390/sh stable

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index f15c038..e0d554f 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/

2017-01-11 Thread Lars Wendler

commit: 920eefba5481eef110406a2b6859c4edd0b4c48e
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 11 13:14:48 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 11 13:14:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920eefba

sys-devel/flex: Security cleanup (bug #589820).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-devel/flex/Manifest|  1 -
 .../flex/files/flex-2.6.0-out-of-tree-build.patch  | 16 
 .../flex/files/flex-2.6.0-out-of-tree-test.patch   | 90 --
 sys-devel/flex/flex-2.5.39-r1.ebuild   | 66 
 4 files changed, 173 deletions(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index a95665e..7e63a4e 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,3 +1,2 @@
-DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
 DIST flex-2.6.1.tar.xz 835048 SHA256 
2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 
1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 WHIRLPOOL 
d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
 DIST flex-2.6.3.tar.gz 1405560 SHA256 
68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa SHA512 
f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00
 WHIRLPOOL 
266266c4c15135fe52ec3b5226645b89c7053ec4dac257c9349d760601eaf50f7ec504d3c4b74951fd415d17299c2ca2e483e8c8c7f8ee936b4822d92603a4e2

diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch 
b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
deleted file mode 100644
index 36c69f2..
--- a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/567332
-
-this is a snippet taken from the upstream commit:
-09eae589d3954a1e1206aa01108ee75ef57776da Used in-tree header file for c++ 
tests.
-
 a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -35,6 +35,8 @@
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
- 
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-+
- VPATH = @srcdir@
- am__is_gnu_make = { \
-   if test -z '$(MAKELEVEL)'; then \

diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch 
b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
deleted file mode 100644
index fafa085..
--- a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/567332
-https://github.com/westes/flex/pull/39
-
-From e7761df66e8412093d0c1c25ce24e3a912076564 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Sat, 12 Dec 2015 23:28:43 -0500
-Subject: [PATCH] tests: fix paths to input files
-
-The current test wrapper works only when the inputs are specified using
-relative paths.  If they're specified with absolute paths, the driver
-fails to detect the inputs because it always prepends the input dir name
-which itself is a relative path:
-$ cd tests
-$ ./testwrapper.sh -d . -i $PWD/reject.txt -t ./reject_ver.table
-
-
-This normally doesn't show up because people run `./configure` or, for
-out of tree builds, `../configure`.  But if you happen to run configure
-with an absolute path, then automake tends to generate absolute paths
-as well leading to test failures.
-
-Fix all of this by dropping the implicit input directory prepending.
-In practice, it doesn't even make sense:
-- INPUT_NAME is often a list of files, not just a single one
-- the input directory is used to find the testname tables which are
-  usually generated, so it's impossible to use files from both source
-  and build directories
-- most of the time, the full/correct path is already specified

- tests/Makefile.am|  4 ++--
- tests/testwrapper.sh | 10 +-
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index cc9c178..6d1d9fe 100644
 a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -35,7 +35,7 @@ LOG_COMPILER = $(srcdir)/testwrapper.sh
- LOG_COMPILER = $(srcdir)/testwrapper.sh
- AM_LOG_FLAGS = -d $(srcdir) -r
- REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
--AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r
-+AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r
- TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh
- AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t
- DIRECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
-@@

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2017-01-09 Thread Jeroen Roovers

commit: 9c9b1b1ffa7e4666feab19934e8e76f30047a8a4
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Jan  9 13:52:51 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Jan  9 13:52:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c9b1b1f

sys-devel/flex: Stable for HPPA (bug #589820).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 sys-devel/flex/flex-2.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index d8bd26a..f15c038 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-12-30 Thread Lars Wendler

commit: 2601a5c0e5304ddb0b9b1d608b5b12ce04dc3a90
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec 30 21:18:40 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec 30 21:18:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2601a5c0

sys-devel/flex: Bump to version 2.6.3

Removed completely broken 2.6.2 version.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-devel/flex/Manifest | 2 +-
 sys-devel/flex/{flex-2.6.2.ebuild => flex-2.6.3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 70779ce..a95665e 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,3 +1,3 @@
 DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
 DIST flex-2.6.1.tar.xz 835048 SHA256 
2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 
1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 WHIRLPOOL 
d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
-DIST flex-2.6.2.tar.gz 1402237 SHA256 
9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9 SHA512 
481fe3f1c370fe04d5a605a826c53dd0afa5b6ea655f0d14fa9bb9cb498c016f68cef8fea806458f07baa7ae5bc1ac729be427cb4e0cc39ce744a809ef6442b3
 WHIRLPOOL 
24d5b504c0e0bf58118fb358799906a49f2757b45a65a4a95618105dee4978a7e7c4348bd8fa4f6ef44ced24d0622ec702244c3692af2f214c11b0ba0ea510de
+DIST flex-2.6.3.tar.gz 1405560 SHA256 
68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa SHA512 
f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00
 WHIRLPOOL 
266266c4c15135fe52ec3b5226645b89c7053ec4dac257c9349d760601eaf50f7ec504d3c4b74951fd415d17299c2ca2e483e8c8c7f8ee936b4822d92603a4e2

diff --git a/sys-devel/flex/flex-2.6.2.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
similarity index 100%
rename from sys-devel/flex/flex-2.6.2.ebuild
rename to sys-devel/flex/flex-2.6.3.ebuild

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-12-22 Thread Agostino Sarubbo

commit: 3fc4ff124e30095f58992ec94bdf3ab759e76648
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Dec 22 09:33:43 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Dec 22 09:34:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc4ff12

sys-devel/flex: ppc64 stable wrt bug #589820

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 9c1b57c..d8bd26a 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-12-20 Thread Agostino Sarubbo

commit: 72a407d937f28df504169254564652770328a7aa
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec 20 09:43:21 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec 20 09:44:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72a407d9

sys-devel/flex: ppc stable wrt bug #589820

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 2a81469..9c1b57c 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-12-19 Thread Agostino Sarubbo

commit: c8046b8cf8b05b7e2371204286ae9f4fca704042
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 19 15:11:36 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 19 15:12:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8046b8c

sys-devel/flex: ia64 stable wrt bug #589820

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index bf1b291..2a81469 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-12-19 Thread Agostino Sarubbo

commit: d20b3b500f15446da29473903e2fbf7d5fb2ed18
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Dec 19 14:34:48 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Dec 19 14:34:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20b3b50

sys-devel/flex: sparc stable wrt bug #589820

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 06461c7..bf1b291 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 ~sh 
~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-12-02 Thread Tobias Klausmann

commit: 7c883128b2f8d8a2cf89292a9dc644f6b9ef71d2
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Fri Dec  2 14:20:55 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Fri Dec  2 14:20:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c883128

sys-devel/flex-2.6.1-r0: stable on alpha

Gentoo-Bug: 589820

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index b3ac0fd..06461c7 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 
~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd 
~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-11-30 Thread Markus Meier

commit: d541f6996b4d1993efd5a25502cc1287f3bf57e0
Author: Markus Meier  gentoo  org>
AuthorDate: Wed Nov 30 19:33:56 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Wed Nov 30 19:33:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d541f699

sys-devel/flex: arm stable, bug #589820

Package-Manager: portage-2.3.2
RepoMan-Options: --include-arches="arm"

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 8d6b6ec..b3ac0fd 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 
~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-11-29 Thread Agostino Sarubbo

commit: c5fa55d0a41b2eaa4bb97c0d89b9edfcba7b4a05
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 29 11:23:37 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 29 11:23:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fa55d0

sys-devel/flex: x86 stable wrt bug #589820

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 37b61a6..8d6b6ec 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-11-29 Thread Agostino Sarubbo

commit: 1b3560c873118ced6cb3b871cdd9479d53283f88
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 29 11:22:37 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 29 11:22:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3560c8

sys-devel/flex: amd64 stable wrt bug #589820

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-devel/flex/flex-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index b63f0fc..37b61a6 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -12,7 +12,7 @@ 
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 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-10-26 Thread Lars Wendler

commit: f0105bccfe38868dbcc8922da7584383bb6236a6
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Oct 26 08:05:50 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Oct 26 08:06:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0105bcc

sys-devel/flex: Bump to version 2.6.2

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-devel/flex/Manifest  |  1 +
 sys-devel/flex/flex-2.6.2.ebuild | 78 
 2 files changed, 79 insertions(+)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 8309f25..c19ad96 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,3 +1,4 @@
 DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
 DIST flex-2.6.0.tar.xz 1369552 SHA256 
d39b15a856906997ced252d76e9bfe2425d7503c6ed811669665627b248e4c73 SHA512 
9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
 WHIRLPOOL 
e44cab6763699a9d4d8af29b8c45c2e5b203a643834730f35e5745d145e5b3a4605506da209aa8e4e087e2e8872926261d0d2f29751d616cc77df36021d753b2
 DIST flex-2.6.1.tar.xz 835048 SHA256 
2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 
1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 WHIRLPOOL 
d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
+DIST flex-2.6.2.tar.gz 1402237 SHA256 
9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9 SHA512 
481fe3f1c370fe04d5a605a826c53dd0afa5b6ea655f0d14fa9bb9cb498c016f68cef8fea806458f07baa7ae5bc1ac729be427cb4e0cc39ce744a809ef6442b3
 WHIRLPOOL 
24d5b504c0e0bf58118fb358799906a49f2757b45a65a4a95618105dee4978a7e7c4348bd8fa4f6ef44ced24d0622ec702244c3692af2f214c11b0ba0ea510de

diff --git a/sys-devel/flex/flex-2.6.2.ebuild b/sys-devel/flex/flex-2.6.2.ebuild
new file mode 100644
index ..9362ddd
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic 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 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static 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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-10-26 Thread Lars Wendler

commit: 93ae8bcdc44e16dd847f0961140b7939b74db8eb
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Oct 26 08:06:29 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Oct 26 08:06:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ae8bcd

sys-devel/flex: Removed old.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-devel/flex/Manifest  |  1 -
 sys-devel/flex/flex-2.6.0.ebuild | 81 
 2 files changed, 82 deletions(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index c19ad96..70779ce 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,4 +1,3 @@
 DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
-DIST flex-2.6.0.tar.xz 1369552 SHA256 
d39b15a856906997ced252d76e9bfe2425d7503c6ed811669665627b248e4c73 SHA512 
9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
 WHIRLPOOL 
e44cab6763699a9d4d8af29b8c45c2e5b203a643834730f35e5745d145e5b3a4605506da209aa8e4e087e2e8872926261d0d2f29751d616cc77df36021d753b2
 DIST flex-2.6.1.tar.xz 835048 SHA256 
2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 
1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 WHIRLPOOL 
d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
 DIST flex-2.6.2.tar.gz 1402237 SHA256 
9a01437a1155c799b7dc2508620564ef806ba66250c36bf5f9034b1c207cb2c9 SHA512 
481fe3f1c370fe04d5a605a826c53dd0afa5b6ea655f0d14fa9bb9cb498c016f68cef8fea806458f07baa7ae5bc1ac729be427cb4e0cc39ce744a809ef6442b3
 WHIRLPOOL 
24d5b504c0e0bf58118fb358799906a49f2757b45a65a4a95618105dee4978a7e7c4348bd8fa4f6ef44ced24d0622ec702244c3692af2f214c11b0ba0ea510de

diff --git a/sys-devel/flex/flex-2.6.0.ebuild b/sys-devel/flex/flex-2.6.0.ebuild
deleted file mode 100644
index 6fc951f..
--- a/sys-devel/flex/flex-2.6.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="http://flex.sourceforge.net/;
-SRC_URI="mirror://sourceforge/flex/${P}.tar.xz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static 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 "${FILESDIR}"/${P}-out-of-tree-build.patch #567332
-   epatch "${FILESDIR}"/${P}-out-of-tree-test.patch #567332
-
-   # 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,flex.pdf} || die
-   dosym flex /usr/bin/lex
-}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2016-04-02 Thread Mike Frysinger

commit: 2b3a407b661078b2b116ee79dc7a10486d16f3a4
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sat Apr  2 21:54:38 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sat Apr  2 21:54:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b3a407b

sys-devel/flex: version bump 2.6.1 #578844

 sys-devel/flex/Manifest  |  1 +
 sys-devel/flex/flex-2.6.1.ebuild | 78 
 2 files changed, 79 insertions(+)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index c9d385a..8309f25 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,2 +1,3 @@
 DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
 DIST flex-2.6.0.tar.xz 1369552 SHA256 
d39b15a856906997ced252d76e9bfe2425d7503c6ed811669665627b248e4c73 SHA512 
9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
 WHIRLPOOL 
e44cab6763699a9d4d8af29b8c45c2e5b203a643834730f35e5745d145e5b3a4605506da209aa8e4e087e2e8872926261d0d2f29751d616cc77df36021d753b2
+DIST flex-2.6.1.tar.xz 835048 SHA256 
2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 
1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 WHIRLPOOL 
d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
new file mode 100644
index 000..b63f0fc
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic 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 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static 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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2015-12-20 Thread Mike Frysinger

commit: 8edfc50dab0424fe3db9741c3e5ccb9a0e0588a9
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun Dec 20 18:02:51 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sun Dec 20 18:02:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edfc50d

sys-devel/flex: disable building tests when USE=-test #568842

 sys-devel/flex/flex-2.6.0.ebuild | 8 
 1 file changed, 8 insertions(+)

diff --git a/sys-devel/flex/flex-2.6.0.ebuild b/sys-devel/flex/flex-2.6.0.ebuild
index b603320..6fc951f 100644
--- a/sys-devel/flex/flex-2.6.0.ebuild
+++ b/sys-devel/flex/flex-2.6.0.ebuild
@@ -25,6 +25,14 @@ DEPEND="${RDEPEND}
 src_prepare() {
epatch "${FILESDIR}"/${P}-out-of-tree-build.patch #567332
epatch "${FILESDIR}"/${P}-out-of-tree-test.patch #567332
+
+   # 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() {

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/

2015-12-12 Thread Mike Frysinger

commit: 775dcc66689e18fe7c037b59a4b1b7394742a008
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun Dec 13 04:39:33 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sun Dec 13 04:45:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775dcc66

sys-devel/flex: fix tests #567332

 .../flex/files/flex-2.6.0-out-of-tree-build.patch  | 16 
 .../flex/files/flex-2.6.0-out-of-tree-test.patch   | 90 ++
 sys-devel/flex/flex-2.6.0.ebuild   |  5 ++
 3 files changed, 111 insertions(+)

diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch 
b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
new file mode 100644
index 000..36c69f2
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/567332
+
+this is a snippet taken from the upstream commit:
+09eae589d3954a1e1206aa01108ee75ef57776da Used in-tree header file for c++ 
tests.
+
+--- a/tests/Makefile.in
 b/tests/Makefile.in
+@@ -35,6 +35,8 @@
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ # PURPOSE.
+ 
++AM_CPPFLAGS = -I$(top_srcdir)/src
++
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+   if test -z '$(MAKELEVEL)'; then \

diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch 
b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
new file mode 100644
index 000..fafa085
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
@@ -0,0 +1,90 @@
+https://bugs.gentoo.org/567332
+https://github.com/westes/flex/pull/39
+
+From e7761df66e8412093d0c1c25ce24e3a912076564 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Sat, 12 Dec 2015 23:28:43 -0500
+Subject: [PATCH] tests: fix paths to input files
+
+The current test wrapper works only when the inputs are specified using
+relative paths.  If they're specified with absolute paths, the driver
+fails to detect the inputs because it always prepends the input dir name
+which itself is a relative path:
+$ cd tests
+$ ./testwrapper.sh -d . -i $PWD/reject.txt -t ./reject_ver.table
+
+
+This normally doesn't show up because people run `./configure` or, for
+out of tree builds, `../configure`.  But if you happen to run configure
+with an absolute path, then automake tends to generate absolute paths
+as well leading to test failures.
+
+Fix all of this by dropping the implicit input directory prepending.
+In practice, it doesn't even make sense:
+- INPUT_NAME is often a list of files, not just a single one
+- the input directory is used to find the testname tables which are
+  usually generated, so it's impossible to use files from both source
+  and build directories
+- most of the time, the full/correct path is already specified
+---
+ tests/Makefile.am|  4 ++--
+ tests/testwrapper.sh | 10 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index cc9c178..6d1d9fe 100644
+--- a/tests/Makefile.in
 b/tests/Makefile.in
+@@ -35,7 +35,7 @@ LOG_COMPILER = $(srcdir)/testwrapper.sh
+ LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_LOG_FLAGS = -d $(srcdir) -r
+ REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+-AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r
++AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r
+ TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t
+ DIRECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+@@ -437,7 +437,7 @@ tableopts_tests  := $(tableopts_opttests) 
$(tableopts_vertests) $(tableopts_sert
+ tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) 
$(tableopts_sertests)
+ tableopts_c := $(addsuffix .c,$(tableopts_tests))
+ OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+-AM_OPT_LOG_FLAGS = -d $(srcdir) -i tableopts.txt -r
++AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r
+ SER_LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t
+ VER_LOG_COMPILER = $(srcdir)/testwrapper.sh
+diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh
+index 30127b5..051e20b 100755
+--- a/tests/testwrapper.sh
 b/tests/testwrapper.sh
+@@ -30,10 +30,10 @@ while getopts :d:i:rt1 OPTION ; do
+ 
+ TESTNAME="${!OPTIND}"
+ 
+-INPUT_NAME=${INPUT_NAME:-`basename $TESTNAME`.txt}
++INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename $TESTNAME`.txt}
+ 
+ if [ "$DO_COMPARISON" -eq "1" ] ; then
+-test `$TESTNAME 1 < $INPUT_DIRECTORY/$INPUT_NAME` -eq `$TESTNAME < 
$INPUT_DIRECTORY/$INPUT_NAME`
++test `$TESTNAME 1 < $INPUT_NAME` -eq `$TESTNAME < $INPUT_NAME`
+ exit $?
+ fi
+ 
+@@ -42,11 +42,11 @@ if [ $INPUT_COUNT -gt 1 ] ; then
+ exit $?
+ fi
+ 
+-if [ -f ${INPUT_DIRECTORY}/${INPUT_NAME} ] ; then
++if [ -f ${INPUT_NAME} ] ; then
+ if [ $USE_REDIRECT == 1 ] ; then
+-$TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} <

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/

2015-11-23 Thread Lars Wendler

commit: bdf7db0b2fb2c0beb54caa9c9ff5bf1b362a2467
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Nov 23 10:59:18 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov 23 11:02:44 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf7db0b

sys-devel/flex: Bump to version 2.6.0

Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler  gentoo.org>

 sys-devel/flex/Manifest  |  1 +
 sys-devel/flex/flex-2.6.0.ebuild | 68 
 2 files changed, 69 insertions(+)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 2acb715..1c92cb9 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -2,4 +2,5 @@ DIST flex-2.5.35.tar.bz2 1256501 SHA256 
0becbd4b2b36b99c67f8c22ab98f7f80c9860aec
 DIST flex-2.5.37.tar.bz2 1303313 SHA256 
17aa7b4ebf19a13bc2dff4115b416365c95f090061539a932a68092349ac052a SHA512 
1f34285953a7f058e6a2dddc305fc82cfcaaa451d6dda17bf9cccbe4a08e480c8c28951fa5d2920e7c7adc40ccd0e51191b363c9a3c4137db5ded1cbbc2a
 WHIRLPOOL 
ee5a4dde9b373c57248df261a53ea951e12ccb3e6f2e6344c56c2d8393511389560b4843660edf2a0929e2ed6fc46ab8d832e36a8ee5fe4317ce85ccea14d6ca
 DIST flex-2.5.38.tar.xz 1349536 SHA256 
3621e0217f6c2088411e5b6fd9f2d83f2fbf014dcdf24e80680f66e6dd93729c SHA512 
98d4a722dcb23c0ebca997ef28ae40cebbe65e24adf8700ac9127404d1bcd0e30638d296d639afb092b65b4767f35f5ee0b0bf229ac040ef8029a04694d6d4c2
 WHIRLPOOL 
56e282bc56ef825a953d1211602de1a243164d09b9b794debffbd7c56830572d24910b20b44b8749173c9bc008bae99406320a5042a4054290b69320a1df3aed
 DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
+DIST flex-2.6.0.tar.xz 1369552 SHA256 
d39b15a856906997ced252d76e9bfe2425d7503c6ed811669665627b248e4c73 SHA512 
9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
 WHIRLPOOL 
e44cab6763699a9d4d8af29b8c45c2e5b203a643834730f35e5745d145e5b3a4605506da209aa8e4e087e2e8872926261d0d2f29751d616cc77df36021d753b2
 DIST flex_2.5.35-10.diff.gz 41011 SHA256 
1d57a2a73ae7b7d4bd95a7c3f5801ab39c0b2b55b5d838782da8d3801cc1a3b9 SHA512 
ecb64cb5d27da0c82c99958640ee5f09afff4096a93817f68ff86a838ab4f21daf959bfc650b89e0d52a827c55265cb4c4a4f9efab050a8f91dd82258820
 WHIRLPOOL 
4fa27c32d81c766e657645816e4a24e46b126e5eb38ad38fc66a7d3d3e3100b76ec694898dcbcc486687f4ec9d89d517a670f7ca20de22586d2f0b56a7fe50cd

diff --git a/sys-devel/flex/flex-2.6.0.ebuild b/sys-devel/flex/flex-2.6.0.ebuild
new file mode 100644
index 000..aa83cdc
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="http://flex.sourceforge.net/;
+SRC_URI="mirror://sourceforge/flex/${P}.tar.xz"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static 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_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,flex.pdf} || die
+   dosym flex /usr/bin/lex
+}

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/

2015-11-23 Thread Lars Wendler

commit: 2950652b36f17fcd573888d2a5cfe999afd4023d
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Nov 23 11:01:27 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov 23 11:02:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2950652b

sys-devel/flex: Removed old.

Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler  gentoo.org>

 sys-devel/flex/Manifest|   4 -
 sys-devel/flex/files/flex-2.5.33-pic.patch |  12 ---
 sys-devel/flex/files/flex-2.5.34-isatty.patch  |  53 --
 sys-devel/flex/files/flex-2.5.35-gcc44.patch   |  13 ---
 .../flex/files/flex-2.5.35-saneautotools.patch |  77 --
 sys-devel/flex/files/flex-2.5.37-proto.patch   |  27 -
 sys-devel/flex/files/flex-2.5.37-tests.patch   | 113 -
 sys-devel/flex/flex-2.5.35.ebuild  |  43 
 sys-devel/flex/flex-2.5.35_p10.ebuild  |  50 -
 sys-devel/flex/flex-2.5.37.ebuild  |  51 --
 sys-devel/flex/flex-2.5.38-r1.ebuild   |  40 
 sys-devel/flex/flex-2.5.39.ebuild  |  40 
 12 files changed, 523 deletions(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 1c92cb9..c9d385a 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,6 +1,2 @@
-DIST flex-2.5.35.tar.bz2 1256501 SHA256 
0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b SHA512 
aa5aebbc7ccaa4697d7f0cfa3ba899dd3b327bc8551ba341c26bece7f9044951d0532e3ebf6ec63760204b4ff805f9f957d064e9a213ef8aac428e565de31343
 WHIRLPOOL 
5cb46a2cec84b1c6d25e22a1e4a6ac1a5100fcf32a488918f8bfe9236339ff2aac7f2dc35a590417fe1609d89511ab47de4ba4f7db17251b7408ea0f18e6894d
-DIST flex-2.5.37.tar.bz2 1303313 SHA256 
17aa7b4ebf19a13bc2dff4115b416365c95f090061539a932a68092349ac052a SHA512 
1f34285953a7f058e6a2dddc305fc82cfcaaa451d6dda17bf9cccbe4a08e480c8c28951fa5d2920e7c7adc40ccd0e51191b363c9a3c4137db5ded1cbbc2a
 WHIRLPOOL 
ee5a4dde9b373c57248df261a53ea951e12ccb3e6f2e6344c56c2d8393511389560b4843660edf2a0929e2ed6fc46ab8d832e36a8ee5fe4317ce85ccea14d6ca
-DIST flex-2.5.38.tar.xz 1349536 SHA256 
3621e0217f6c2088411e5b6fd9f2d83f2fbf014dcdf24e80680f66e6dd93729c SHA512 
98d4a722dcb23c0ebca997ef28ae40cebbe65e24adf8700ac9127404d1bcd0e30638d296d639afb092b65b4767f35f5ee0b0bf229ac040ef8029a04694d6d4c2
 WHIRLPOOL 
56e282bc56ef825a953d1211602de1a243164d09b9b794debffbd7c56830572d24910b20b44b8749173c9bc008bae99406320a5042a4054290b69320a1df3aed
 DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
 DIST flex-2.6.0.tar.xz 1369552 SHA256 
d39b15a856906997ced252d76e9bfe2425d7503c6ed811669665627b248e4c73 SHA512 
9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
 WHIRLPOOL 
e44cab6763699a9d4d8af29b8c45c2e5b203a643834730f35e5745d145e5b3a4605506da209aa8e4e087e2e8872926261d0d2f29751d616cc77df36021d753b2
-DIST flex_2.5.35-10.diff.gz 41011 SHA256 
1d57a2a73ae7b7d4bd95a7c3f5801ab39c0b2b55b5d838782da8d3801cc1a3b9 SHA512 
ecb64cb5d27da0c82c99958640ee5f09afff4096a93817f68ff86a838ab4f21daf959bfc650b89e0d52a827c55265cb4c4a4f9efab050a8f91dd82258820
 WHIRLPOOL 
4fa27c32d81c766e657645816e4a24e46b126e5eb38ad38fc66a7d3d3e3100b76ec694898dcbcc486687f4ec9d89d517a670f7ca20de22586d2f0b56a7fe50cd

diff --git a/sys-devel/flex/files/flex-2.5.33-pic.patch 
b/sys-devel/flex/files/flex-2.5.33-pic.patch
deleted file mode 100644
index 88ac8b3..000
--- a/sys-devel/flex/files/flex-2.5.33-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 Makefile.in2007-02-06 12:27:32.0 +0100
-+++ Makefile.in.new2007-02-06 12:29:50.0 +0100
-@@ -993,7 +993,9 @@
- ecs.o: ecs.c flexdef.h flexint.h
- gen.o: gen.c flexdef.h flexint.h tables.h tables_shared.h
- libmain.o: libmain.c
-+  $(COMPILE) -fPIC -DPIC -o libmain.o -c libmain.c
- libyywrap.o: libyywrap.c
-+  $(COMPILE) -fPIC -DPIC -o libyywrap.o -c libyywrap.c
- main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \
-  tables.h tables_shared.h
- misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h

diff --git a/sys-devel/flex/files/flex-2.5.34-isatty.patch 
b/sys-devel/flex/files/flex-2.5.34-isatty.patch
deleted file mode 100644
index b397433..000
--- a/sys-devel/flex/files/flex-2.5.34-isatty.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Declare the isatty prototype all the time ... otherwise packages like
-doxygen and ttmkfdir fail to build.
-
-http://bugs.gentoo.org/119598
-
 flex/scan.c
-+++ flex/scan.c
-@@ -4179,9 +4179,19 @@
-   yyfree((void *) b  );
- }
- 
-+#ifndef

84 matches

Mail list logo