[gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/files/

2024-03-05 Thread Petr Vaněk 
commit: 58c2f8c5bea112fa7dfc1404834f6d40ffa00fbc
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Mar  4 18:19:50 2024 +
Commit: Petr Vaněk  gentoo  org>
CommitDate: Tue Mar  5 09:17:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c2f8c5

dev-util/ragel: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Petr Vaněk  gentoo.org>

 .../files/ragel-7.0.4-link-colm-properly.patch | 51 --
 1 file changed, 51 deletions(-)

diff --git a/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch 
b/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch
deleted file mode 100644
index f5f12ec4491a..
--- a/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Jan Engelhardt 
-Date: 2021-04-27 18:22:18.718396764 +0200
-
-ragel just completely lacks a block to support system colm.
-

- configure.ac|   14 --
- src/Makefile.am |2 +-
- 2 files changed, 9 insertions(+), 7 deletions(-)
-
-Index: ragel-7.0.4/configure.ac
-===
 ragel-7.0.4.orig/configure.ac
-+++ ragel-7.0.4/configure.ac
-@@ -51,14 +51,16 @@ AC_ARG_WITH(colm,
-   LIBFSM_LA="$withval/lib/libfsm.la"
-   COLM_SHARE="$withval/share"
-   ],
--  []
-+  [
-+  COLM=/usr/bin/colm
-+  COLM_WRAP=/usr/bin/colm-wrap
-+  CPPFLAGS="-I/usr/include/aapl $CPPFLAGS"
-+  LIBCOLM_LA=-lcolm
-+  LIBFSM_LA=-lfsm
-+  COLM_SHARE='${datadir}/colm'
-+  ]
- )
- 
--AC_CHECK_FILES(
--  [$COLM],
--  [],
--  [AC_ERROR([colm is required to build ragel])]
--)
- AC_SUBST(COLM)
- AC_SUBST(COLM_WRAP)
- AC_SUBST(COLM_SHARE)
-Index: ragel-7.0.4/src/Makefile.am
-===
 ragel-7.0.4.orig/src/Makefile.am
-+++ ragel-7.0.4/src/Makefile.am
-@@ -39,7 +39,7 @@ nodist_ragel_SOURCES = \
-   parse.c rlreduce.cc
- 
- ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
--ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
-+ragel_DEPENDENCIES = libragel.la
- 
- BUILT_SOURCES = \
-   version.h \
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/files/, dev-util/ragel/

2022-05-04 Thread Sam James 
commit: e155af013558a4a3164fb9867ef1d65d34c6ed3a
Author: orbea  riseup  net>
AuthorDate: Wed May  4 17:48:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 04:05:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e155af01

dev-util/ragel: Fix patch for slibtool

Upstream-PR: https://github.com/adrian-thurston/ragel/pull/85
Bug: https://bugs.gentoo.org/820260
Bug: https://bugs.gentoo.org/839048
Closes: https://bugs.gentoo.org/832391
Closes: https://github.com/gentoo/gentoo/pull/25322
Signed-off-by: orbea  riseup.net>
Signed-off-by: Sam James  gentoo.org>

 .../files/ragel-7.0.4-r2-link-colm-properly.patch  | 64 +
 dev-util/ragel/ragel-7.0.4-r2.ebuild   | 66 ++
 2 files changed, 130 insertions(+)

diff --git a/dev-util/ragel/files/ragel-7.0.4-r2-link-colm-properly.patch 
b/dev-util/ragel/files/ragel-7.0.4-r2-link-colm-properly.patch
new file mode 100644
index ..82ff98b5a15e
--- /dev/null
+++ b/dev-util/ragel/files/ragel-7.0.4-r2-link-colm-properly.patch
@@ -0,0 +1,64 @@
+From ad49af2601018298478af6ea6f8ae0ce323d7b28 Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Wed, 4 May 2022 10:23:51 -0700
+Subject: [PATCH] Fix build without .la files
+
+Many distros do no ship .la files which breaks the build
+and additionally when using slibtool instead of GNU libtool
+the .la files are not installed by default.
+
+This fixes the build to use the linker flags -lcolm and -lfsm
+instead.
+---
+ configure.ac| 16 
+ src/Makefile.am |  1 -
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6b3a5b4b..9cee5e5f 100644
+--- a/configure.ac
 b/configure.ac
+@@ -44,16 +44,24 @@ AC_ARG_WITH(colm,
+   [
+   COLM="$withval/bin/colm"
+   COLM_WRAP="$withval/bin/colm-wrap"
+-  CPPFLAGS="-I$withval/include ${CPPFLAGS}"
+   CPPFLAGS="-I$withval/include/aapl ${CPPFLAGS}"
+-  LDFLAGS="-L$withval/lib ${LDFLAGS}"
+-  LIBCOLM_LA="$withval/lib/libcolm.la"
+-  LIBFSM_LA="$withval/lib/libfsm.la"
+   COLM_SHARE="$withval/share"
+   ],
+   []
+ )
+ 
++AC_CHECK_LIB(
++  [colm],
++  [colm_run_program],
++  [LIBCOLM_LA=-lcolm],
++  [AC_ERROR([libcolm is required to build ragel])]
++)
++AC_CHECK_LIB(
++  [fsm],
++  [hostLangAsm],
++  [LIBFSM_LA=-lfsm],
++  [AC_ERROR([libfsm is required to build ragel])]
++)
+ AC_CHECK_FILES(
+   [$COLM],
+   [],
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c4fe531c..377f7aa4 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -39,7 +39,6 @@ nodist_ragel_SOURCES = \
+   parse.c rlreduce.cc
+ 
+ ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+-ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+ 
+ BUILT_SOURCES = \
+   version.h \
+-- 
+2.35.1
+

diff --git a/dev-util/ragel/ragel-7.0.4-r2.ebuild 
b/dev-util/ragel/ragel-7.0.4-r2.ebuild
new file mode 100644
index ..b83f4136930d
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.4-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Compiles finite state machines from regular languages into 
executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/;
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="doc"
+
+# Notes from bug #766090
+# dev-libs/libxml2's xmllint ends up being called by asciidoc here
+# app-text/dblatex too
+# app-text/ghostscript-gpl too
+BDEPEND="
+   doc? (
+   || ( app-text/asciidoc dev-ruby/asciidoctor )
+   app-text/dblatex
+   app-text/ghostscript-gpl
+   dev-libs/libxml2
+   dev-texlive/texlive-latex
+   dev-python/pygments
+   media-gfx/transfig
+   )
+"
+DEPEND=">=dev-util/colm-0.14.7-r1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.0.4-drop-julia-check.patch
+   "${FILESDIR}"/${PN}-7.0.4-r2-link-colm-properly.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix hardcoded search dir
+   sed -i -e "s:\$withval/lib:\$withval/$(get_libdir):" configure.ac || die
+
+   # Allow either asciidoctor or asciidoc
+   # bug #733426
+   sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], 
[asciidoc asciidoctor]/' configure.ac || die
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --with-colm="${EPREFIX}/usr" \
+   $(use_enable doc manual)
+}
+
+src_install() {
+   default
+
+   insinto /usr/share/vim/vimfiles/syntax
+   doins ragel.vim
+
+   find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/files/, dev-util/ragel/

2021-09-03 Thread Joonas Niilola 
commit: 790e49caf6e767b4406e51815b22e931bed503f0
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Sep  3 11:37:11 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Sep  3 14:25:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=790e49ca

dev-util/ragel: EAPI-8, disable static-libs

Signed-off-by: Joonas Niilola  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22203

 .../files/ragel-7.0.4-link-colm-properly.patch | 51 +
 dev-util/ragel/ragel-7.0.4-r1.ebuild   | 66 ++
 2 files changed, 117 insertions(+)

diff --git a/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch 
b/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch
new file mode 100644
index 000..f5f12ec4491
--- /dev/null
+++ b/dev-util/ragel/files/ragel-7.0.4-link-colm-properly.patch
@@ -0,0 +1,51 @@
+From: Jan Engelhardt 
+Date: 2021-04-27 18:22:18.718396764 +0200
+
+ragel just completely lacks a block to support system colm.
+
+---
+ configure.ac|   14 --
+ src/Makefile.am |2 +-
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+Index: ragel-7.0.4/configure.ac
+===
+--- ragel-7.0.4.orig/configure.ac
 ragel-7.0.4/configure.ac
+@@ -51,14 +51,16 @@ AC_ARG_WITH(colm,
+   LIBFSM_LA="$withval/lib/libfsm.la"
+   COLM_SHARE="$withval/share"
+   ],
+-  []
++  [
++  COLM=/usr/bin/colm
++  COLM_WRAP=/usr/bin/colm-wrap
++  CPPFLAGS="-I/usr/include/aapl $CPPFLAGS"
++  LIBCOLM_LA=-lcolm
++  LIBFSM_LA=-lfsm
++  COLM_SHARE='${datadir}/colm'
++  ]
+ )
+ 
+-AC_CHECK_FILES(
+-  [$COLM],
+-  [],
+-  [AC_ERROR([colm is required to build ragel])]
+-)
+ AC_SUBST(COLM)
+ AC_SUBST(COLM_WRAP)
+ AC_SUBST(COLM_SHARE)
+Index: ragel-7.0.4/src/Makefile.am
+===
+--- ragel-7.0.4.orig/src/Makefile.am
 ragel-7.0.4/src/Makefile.am
+@@ -39,7 +39,7 @@ nodist_ragel_SOURCES = \
+   parse.c rlreduce.cc
+ 
+ ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
+-ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la
++ragel_DEPENDENCIES = libragel.la
+ 
+ BUILT_SOURCES = \
+   version.h \
+

diff --git a/dev-util/ragel/ragel-7.0.4-r1.ebuild 
b/dev-util/ragel/ragel-7.0.4-r1.ebuild
new file mode 100644
index 000..48a3e7cfcf0
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Compiles finite state machines from regular languages into 
executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/;
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+IUSE="doc"
+
+# Notes from bug #766090
+# dev-libs/libxml2's xmllint ends up being called by asciidoc here
+# app-text/dblatex too
+# app-text/ghostscript-gpl too
+BDEPEND="
+   doc? (
+   || ( app-text/asciidoc dev-ruby/asciidoctor )
+   app-text/dblatex
+   app-text/ghostscript-gpl
+   dev-libs/libxml2
+   dev-texlive/texlive-latex
+   dev-python/pygments
+   media-gfx/transfig
+   )
+"
+DEPEND=">=dev-util/colm-0.14.7-r1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-7.0.4-drop-julia-check.patch
+   "${FILESDIR}"/${PN}-7.0.4-link-colm-properly.patch
+)
+
+src_prepare() {
+   default
+
+   # Fix hardcoded search dir
+   sed -i -e "s:\$withval/lib:\$withval/$(get_libdir):" configure.ac || die
+
+   # Allow either asciidoctor or asciidoc
+   # bug #733426
+   sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], 
[asciidoc asciidoctor]/' configure.ac || die
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --with-colm="${EPREFIX}/usr" \
+   $(use_enable doc manual)
+}
+
+src_install() {
+   default
+
+   insinto /usr/share/vim/vimfiles/syntax
+   doins ragel.vim
+
+   find "${ED}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/files/, dev-util/ragel/

2021-01-18 Thread Sam James 
commit: b61d1ab9e67c107fe9e323db2342e267449b844c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 18 23:22:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 18 23:22:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61d1ab9

dev-util/ragel: cleanup old

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

 dev-util/ragel/Manifest|  2 --
 .../files/ragel-7.0.0.10-use-pkginclude.patch  | 41 --
 dev-util/ragel/ragel-7.0.0.10-r1.ebuild| 37 ---
 dev-util/ragel/ragel-7.0.0.10-r2.ebuild| 37 ---
 dev-util/ragel/ragel-7.0.0.10.ebuild   | 29 ---
 dev-util/ragel/ragel-7.0.0.9.ebuild| 29 ---
 6 files changed, 175 deletions(-)

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 07b02ebcb95..bf76e35d2d5 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,5 +1,3 @@
 DIST ragel-6.10.tar.gz 1232993 BLAKE2B 
401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b
 SHA512 
6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38
-DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 
2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad
 SHA512 
2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
 DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B 
c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759
 SHA512 
32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
-DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 
0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852
 SHA512 
87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
 DIST ragel-7.0.3.tar.gz 1656577 BLAKE2B 
3a9ce560894714a3801039fb944d3c914f2647a0b76bba4a7b790f8d569eb2e9eb807ab4d8af067560b274692be2d98c5dc28632e11c853893971585e847d48e
 SHA512 
16bcb4b44a3ca94918d6c3e4bce468620cc691bf74cb69f0a264c41cbcffd595f897aa18e300952b60a68e680e1223532bbf9e500168d35d92a6559c190f6e78

diff --git a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch 
b/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
deleted file mode 100644
index 6609af5a99a..000
--- a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 927f380272442ae803fdccfc001b55877f25e7dc Mon Sep 17 00:00:00 2001
-From: Adrian Thurston 
-Date: Sat, 10 Dec 2016 15:41:30 -0500
-Subject: [PATCH] use pkginclude for the headers
-

- aapl/Makefile.am | 2 +-
- src/Makefile.am  | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/aapl/Makefile.am b/aapl/Makefile.am
-index fd9f9cb0..80b972f1 100644
 a/aapl/Makefile.am
-+++ b/aapl/Makefile.am
-@@ -1,4 +1,4 @@
--include_HEADERS = \
-+pkginclude_HEADERS = \
-   avlbasic.h avlimel.h avlmap.h bstcommon.h compare.h insertsort.h \
-   sbstset.h avlcommon.h avlimelkey.h avlmel.h bstmap.h dlcommon.h \
-   mergesort.h sbsttable.h avlibasic.h avliset.h avlmelkey.h bstset.h \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 24a19a4b..60554a99 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -16,11 +16,11 @@ bin_PROGRAMS = ragel
- 
- endif
- 
--include_HEADERS = \
-+pkginclude_HEADERS = \
-   action.h fsmgraph.h ragel.h common.h \
-   gendata.h redfsm.h dot.h
- 
--nodist_include_HEADERS = config.h
-+nodist_pkginclude_HEADERS = config.h
- 
- ragel_CPPFLAGS = -I$(top_srcdir)/aapl -DBINDIR='"@bindir@"'
- 
--- 
-2.15.1
-

diff --git a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild 
b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
deleted file mode 100644
index 3b71791dae1..000
--- a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Compiles finite state machines from regular languages into 
executable code"
-HOMEPAGE="https://www.colm.net/open-source/ragel/;
-SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="vim-syntax"
-
-DEPEND="~dev-util/colm-0.13.0.5"
-RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" )
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_test() {
-   cd "${S}"/test || die
-   ./runtests.in || die

[gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/files/, dev-util/ragel/

2020-07-21 Thread Andreas Sturmlechner 
commit: 4696d5246e50ead084a42d5784572db2ff438cd6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 20 21:30:53 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 21 16:10:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4696d524

dev-util/ragel: Drop 6.7-r1, 6.8 and 6.9

Closes: https://bugs.gentoo.org/724094
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/ragel/Manifest|   3 -
 dev-util/ragel/files/ragel-6.7+gcc-4.7.patch   | 178 -
 dev-util/ragel/files/ragel-6.7-cross-compile.patch |  21 ---
 dev-util/ragel/files/ragel-6.9-gcc6.patch  |  42 -
 dev-util/ragel/ragel-6.7-r1.ebuild |  49 --
 dev-util/ragel/ragel-6.8.ebuild|  44 -
 dev-util/ragel/ragel-6.9.ebuild|  38 -
 7 files changed, 375 deletions(-)

diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 06082347d58..6cce5686285 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,7 +1,4 @@
 DIST ragel-6.10.tar.gz 1232993 BLAKE2B 
401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b
 SHA512 
6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38
-DIST ragel-6.7.tar.gz 1182734 BLAKE2B 
7a74d58ddee776c5652563d2b804c12fa89d23ab98d743967ff8948d3506266c464b413ced8a2e251cd62e945947778232f483706bbdd87717190a45a9ad088c
 SHA512 
a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a
-DIST ragel-6.8.tar.gz 1211146 BLAKE2B 
41d3feecb461cede104182d918e1f052256daa292efd94b6c722904c05e30b621f754881f07252c76b0bd3af63c65ce50b8ec98d43e1eec5c1a66ef2593506c7
 SHA512 
3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458
-DIST ragel-6.9.tar.gz 1226871 BLAKE2B 
c6edc63eaa21a1529c5600d8491fdce39cff5180fa132046f48c32971e1698fea820c41735f4d74b332de657fdd4c81aecda71beb9d5cef71c27246d606b6b72
 SHA512 
46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd
 DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 
2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad
 SHA512 
2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
 DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B 
c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759
 SHA512 
32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
 DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 
0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852
 SHA512 
87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde

diff --git a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch 
b/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
deleted file mode 100644
index 80eb29a46f0..000
--- a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= 
-Date: Tue, 22 May 2012 16:25:37 -0700
-Subject: [PATCH] aapl: fix building with gcc-4.7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with GCC 4.7, you have to explicit methods inherited from
-base templates, otherwise it will refuse to build.
-

-
-The URL reported in the README is no longer registered, so I couldn't
-find a way to report this to an upstream project.
-
-Signed-off-by: Diego Elio Pettenò 

- aapl/avlcommon.h  |   12 ++--
- aapl/bstcommon.h  |   16 
- aapl/bubblesort.h |2 +-
- aapl/mergesort.h  |2 +-
- 4 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
-index 06983bc..2e3c190 100644
 a/aapl/avlcommon.h
-+++ b/aapl/avlcommon.h
-@@ -881,9 +881,9 @@ template  Element 
*AvlTree::
-   }
- 
- #ifdef AVL_BASIC
--  keyRelation = compare( *element, *curEl );
-+  keyRelation = this->compare( *element, *curEl );
- #else
--  keyRelation = compare( element->BASEKEY(getKey()), 
-+  keyRelation = this->compare( element->BASEKEY(getKey()),
-   curEl->BASEKEY(getKey()) );
- #endif
- 
-@@ -920,7 +920,7 @@ template  Element 
*AvlTree::
-   long

[gentoo-commits] repo/gentoo:master commit in: dev-util/ragel/files/, dev-util/ragel/

2017-12-22 Thread Luca Barbato 
commit: 3da0e31d7df42c829b18f46d9a073de8a1188d9b
Author: Luca Barbato  gentoo  org>
AuthorDate: Sat Dec 23 02:40:24 2017 +
Commit: Luca Barbato  gentoo  org>
CommitDate: Sat Dec 23 02:40:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3da0e31d

dev-util/ragel: Fix the include path

Address bug #642016.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/ragel-7.0.0.10-use-pkginclude.patch  | 41 ++
 dev-util/ragel/ragel-7.0.0.10-r1.ebuild| 30 
 2 files changed, 71 insertions(+)

diff --git a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch 
b/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
new file mode 100644
index 000..6609af5a99a
--- /dev/null
+++ b/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
@@ -0,0 +1,41 @@
+From 927f380272442ae803fdccfc001b55877f25e7dc Mon Sep 17 00:00:00 2001
+From: Adrian Thurston 
+Date: Sat, 10 Dec 2016 15:41:30 -0500
+Subject: [PATCH] use pkginclude for the headers
+
+---
+ aapl/Makefile.am | 2 +-
+ src/Makefile.am  | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/aapl/Makefile.am b/aapl/Makefile.am
+index fd9f9cb0..80b972f1 100644
+--- a/aapl/Makefile.am
 b/aapl/Makefile.am
+@@ -1,4 +1,4 @@
+-include_HEADERS = \
++pkginclude_HEADERS = \
+   avlbasic.h avlimel.h avlmap.h bstcommon.h compare.h insertsort.h \
+   sbstset.h avlcommon.h avlimelkey.h avlmel.h bstmap.h dlcommon.h \
+   mergesort.h sbsttable.h avlibasic.h avliset.h avlmelkey.h bstset.h \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 24a19a4b..60554a99 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -16,11 +16,11 @@ bin_PROGRAMS = ragel
+ 
+ endif
+ 
+-include_HEADERS = \
++pkginclude_HEADERS = \
+   action.h fsmgraph.h ragel.h common.h \
+   gendata.h redfsm.h dot.h
+ 
+-nodist_include_HEADERS = config.h
++nodist_pkginclude_HEADERS = config.h
+ 
+ ragel_CPPFLAGS = -I$(top_srcdir)/aapl -DBINDIR='"@bindir@"'
+ 
+-- 
+2.15.1
+

diff --git a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild 
b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
new file mode 100644
index 000..5c8640303fd
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Compiles finite state machines from regular languages into 
executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/;
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="vim-syntax"
+
+DEPEND="~dev-util/colm-0.13.0.5"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" )
+
+src_test() {
+   cd "${S}"/test || die
+   ./runtests.in || die
+}
+
+src_install() {
+   if use vim-syntax; then
+   insinto /usr/share/vim/vimfiles/syntax
+   doins ragel.vim
+   fi
+   default
+}