From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- dev-util/ragel/Manifest | 11 ++-- .../files/ragel-7.0.0.10-use-pkginclude.patch | 41 --------------- dev-util/ragel/metadata.xml | 9 ++-- 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 ---------- dev-util/ragel/ragel-7.0.3.ebuild | 61 ++++++++++++++++++++++ 8 files changed, 70 insertions(+), 184 deletions(-) delete mode 100644 dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch delete mode 100644 dev-util/ragel/ragel-7.0.0.10-r1.ebuild delete mode 100644 dev-util/ragel/ragel-7.0.0.10-r2.ebuild delete mode 100644 dev-util/ragel/ragel-7.0.0.10.ebuild delete mode 100644 dev-util/ragel/ragel-7.0.0.9.ebuild create mode 100644 dev-util/ragel/ragel-7.0.3.ebuild (limited to 'dev-util/ragel') diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest index 875320af03a5..689847ffb1c4 100644 --- a/dev-util/ragel/Manifest +++ b/dev-util/ragel/Manifest @@ -1,12 +1,7 @@ -AUX ragel-7.0.0.10-use-pkginclude.patch 1143 BLAKE2B 980f0248e9f33955b4653fb1a38aa7aa5ec10584650947e85592f9a9ef0a67c41020dca29fad57ab101e98f45c217d332933931ac7da68cb3ea5d3bbc2f02d9a SHA512 44ee69205b87c22d17b5cc419fba96bd69c9b3d4f8fc8133041b9d71b9aae434b1528bdbdcfe15825d663c1d441d6cce97d0586c4bfae58ff5d687b1c156529f DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38 -DIST ragel-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 EBUILD ragel-6.10.ebuild 906 BLAKE2B 4e1fc1cae8a187e92165539dce7c276ca63dfdc6eefbc55ba5448c826095f4a9f745847ccee03e5c9867a6f02ec57abb6a4831d43ee7df1c0da530a3ffb53010 SHA512 cc2c877a6162d1ee5f29e58758833391e508566201256e2241261357a6c38a2bd6c281f64e6486293faaf1bb8be74c61f5bf458fa9e4d70b4f7a902e181b772f -EBUILD ragel-7.0.0.10-r1.ebuild 758 BLAKE2B 362a2dee75eb9b744af7b0fca9f26175961029165988cf6a5f8f3aeab8d4e9a4264a553509211884c3bd7d6a7992b5fe0dee7b473f61831e6ab8dcfb1f94ba8b SHA512 12f9640eb0c51a497e274bf0d5dd7dadea78a1e21dba5d8a4a114066717badfa1de28116e133f7cc688fce02b7e2859f45479846f460865982c2ced0f4ea4fc8 -EBUILD ragel-7.0.0.10-r2.ebuild 790 BLAKE2B 83edd042aeea77d1dcc9cea68a5ae5a335b46d7411e47fbde10e6d1b0696ef248194993725aad4bc2e76d624c775b74be4c8cd968dd2d4cc5a2288be5f0c1123 SHA512 f1396bfa1bfcf74ccdcf01c8269ae2d37b06b62200e7417c129bd7fd1188ed9f838ad46f5528cb60c849c020b36f6e5c19d77b6cfd26f7c896b7807969f6d085 -EBUILD ragel-7.0.0.10.ebuild 622 BLAKE2B 4eb1438c8fd1c8e1a3f3f2a95589b719e7b1e07d0411ee0d68bbb0eb5d433471becffdc718593beed535a6f360a3bc63f5fafb058fe6d8c50a6163552ad9da99 SHA512 9f98a2fc800727b126d5db3914ebaf699b4a1095f334906d5809edd9f08b0b5c1d90699a145d303fc06a31d95e600d85aee4a7b5ebb98fd8cfd117f20ee10d2b EBUILD ragel-7.0.0.12.ebuild 771 BLAKE2B fe5abe581ce0a9c8feccf4c9a86fd9cb258af68c7a3e6aeddcc4bf1f7cb3bf79a2c24951010204f5704efb8ef7d0194ad5f47f3a3dfac9275f38dcd7958d0fdd SHA512 94e28393676e525b0a8fda907c7aa22ce66586a2fa63a881a17f90280f2c2dfbd2b38ba9acb96efe0899efe81c37ed51989886464baf22ed139a4d426fb0b0ab -EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6 -MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab +EBUILD ragel-7.0.3.ebuild 1416 BLAKE2B 817cb6f863af04d4c635f86e70ae296f077d07801a5e6fed4d868fa5558cb033b00538c789644a4eda9f6b75fe12c89afa1f4a904579d81728c7d115a3453008 SHA512 c34c6e7c3faab0aad54aec9cbe1b753373590d48d4dfc6e0853815e92375209507263d6071896a5bb748089a986dba90c3c9b47af5568baedcd3ee68bfd48887 +MISC metadata.xml 304 BLAKE2B e1fe70825ab2eaef1101ab15d8a29dfffae8b22e1a8cfdb9e97bd7243699be7bf5dff01735e9a9451f7e3207fd9659f7cad5492f1909e845c0761388b254a3fc SHA512 4c34ae1a571f693c06acd7b3611019f137e3b73796f982a0d054ce06402f8a27c44d18cf49c6e6758f010690f769a6b3a94fc46f972d38913140eb8392557f66 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 6609af5a99a2..000000000000 --- 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/metadata.xml b/dev-util/ragel/metadata.xml index 71e948fffb95..6e5b8ef64bd2 100644 --- a/dev-util/ragel/metadata.xml +++ b/dev-util/ragel/metadata.xml @@ -1,7 +1,10 @@ - - lu_zero@gentoo.org - + + lu_zero@gentoo.org + + + adrian-thurston/ragel + 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 3b71791dae1c..000000000000 --- 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 -} - -src_install() { - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins ragel.vim - fi - default -} diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild deleted file mode 100644 index 02fdab57ba4c..000000000000 --- a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Compiles finite state machines from regular languages into executable code" -HOMEPAGE="https://www.colm.net/open-source/ragel/" -SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="vim-syntax" - -DEPEND="~dev-util/colm-0.13.0.5" -RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf --disable-static -} - -src_install() { - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins ragel.vim - fi - default - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-util/ragel/ragel-7.0.0.10.ebuild b/dev-util/ragel/ragel-7.0.0.10.ebuild deleted file mode 100644 index 89ac14258778..000000000000 --- a/dev-util/ragel/ragel-7.0.0.10.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86" -IUSE="vim-syntax" - -DEPEND="~dev-util/colm-0.13.0.5" -RDEPEND="${DEPEND}" - -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 -} diff --git a/dev-util/ragel/ragel-7.0.0.9.ebuild b/dev-util/ragel/ragel-7.0.0.9.ebuild deleted file mode 100644 index fb260ba41723..000000000000 --- a/dev-util/ragel/ragel-7.0.0.9.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# 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.4" -RDEPEND="${DEPEND}" - -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 -} diff --git a/dev-util/ragel/ragel-7.0.3.ebuild b/dev-util/ragel/ragel-7.0.3.ebuild new file mode 100644 index 000000000000..a411580fcd79 --- /dev/null +++ b/dev-util/ragel/ragel-7.0.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Compiles finite state machines from regular languages into executable code" +HOMEPAGE="https://www.colm.net/open-source/ragel/" +SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +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.6" +RDEPEND="${DEPEND}" + +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 +} -- cgit v1.2.3