gentoo auto-resync : 10:09:2022 - 10:42:05

4 files changed, 2 insertions, 86 deletions

diff --git a/dev-libs/foma/Manifest b/dev-libs/foma/Manifest
index 3e4c11394600..31e028041436 100644
--- a/dev-libs/foma/Manifest
+++ b/dev-libs/foma/Manifest
@@ -1,6 +1,3 @@
-AUX foma-0.9.18-clean-makefile.patch 1349 BLAKE2B 7f0dfb37d72ab9db835eff35dd5b79dca40c02c305cba23d89e2495c34592e5e4033b091763dcdb1eb64b7d4845868bf58c4754609e19a2f7ce2cef1ce7b749d SHA512 513ca1681e50c9ca7763364a510a28d86196f0685fc98842078a0b258d72cfbf4fb702e681d1433f242d7079ff4a78541a0765e261a12d7b7c2868fc15c3a7a3
 DIST foma-0.10.0_p20220612.tar.gz 179778 BLAKE2B f96bf46404ead44725b609953a01a3966506af98d82e925e981cef65b3f0dc7ae3414ad96df911e380f1f565f9c11ea3f85e93fa5962cc52db5e451d2f39d37c SHA512 4539c937bd20f74dee5274126cc3a950873a87364d0fcbf02e674eca5ef049badb1b2774c2975ec7969f7f24ccffb7dd17842840e3a818b1503957374ceff048
-DIST foma-0.9.18.tar.gz 337134 BLAKE2B b7f1eeaeaa21096f8077f0e81f3c57c49bbba30afe8db280089c40ed6cf475df33a6899fd2b6929d3f58fe8b3660a92566ae41f2bd5d8a46dacc073b48caf030 SHA512 17df4c070d1460855804aa63f97cc4a0d9568755e93de0de80821625faab7a3994a260650c5e8f43f80b5a0702dadb0cfe57136ab50eb2a9946f118991205b1a
-EBUILD foma-0.10.0_p20220612.ebuild 664 BLAKE2B 918090da7c53cb4673da318cf826f6fee4c2c920a8400862839fccf8511d4938cc88aa73bf1863a886946e41485d07122eae050cc47a213c58bbdeaaa46f14de SHA512 7e0b97cb8eb83cac8d046518f57043872b0f0e1fa9a5b2df6a4c9bf5a1b788b92eda43a313bd1323b61d6037184f4ae78998c59d88b7f785c1aa0985c4fd8058
-EBUILD foma-0.9.18-r1.ebuild 1043 BLAKE2B b7ae4ba2f23b105dc836063083df247d1c2501b78222782c60d1f3a48d9e2eb99ae70800c9b93898e97f22616c7d7c2bc946cf46db879c6501bbaaaca90de170 SHA512 47652a80ca89e70e776b539969b5b55b1f26cebd024c30d682a268fb14f563c51b0f41f168d9ec948de6fbf9eb12cdbc2a7e14ddfb8321a709fc01f353b2ed37
+EBUILD foma-0.10.0_p20220612.ebuild 662 BLAKE2B c3f567d4e713b4a34390b956dcd1d8e4cdf2d07f685a988e21132324661c8e8f247d99ab70113fb056e6b42d252575251aa3153f8c6a38e5e603c9e542e99143 SHA512 01c53216f2fb10852a88cef8d597bcff87dff5d5cb538433ed1fb89cdab550d647d2763cfd12858ba333d4d2455da5178c11d25cacb832d013877d38239c289d
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch b/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch
deleted file mode 100644
index 0ed1b811fc67..000000000000
--- a/dev-libs/foma/files/foma-0.9.18-clean-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2015-06-13 06:24:02.000000000 +0300
-+++ b/Makefile	2019-09-08 09:24:22.127655912 +0300
-@@ -1,21 +1,16 @@
--prefix = /usr/local
-+prefix = /usr
- exec_prefix = $(prefix)
- libdir = $(exec_prefix)/lib
- bindir = $(exec_prefix)/bin
- includedir = $(prefix)/include
- 
- VERSION = 0.9.18
--CC = gcc
--RANLIB = ranlib
- YACC = bison -v
- LEX = flex -8
- LEXCLEX = flex -8 --prefix=lexc
- LEXIFACE = flex -8 --prefix=interface
- LEXCMATRIX = flex -8 --prefix=cmatrix
- RM = /bin/rm -f
--LDFLAGS = -lreadline -lz -ltermcap
--FLOOKUPLDFLAGS = libfoma.a -lz
--CFLAGS = -O3 -Wall -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC
- FOMAOBJS = foma.o stack.o iface.o lex.interface.o
- LIBOBJS = int_stack.o define.o determinize.o apply.o rewrite.o lexcread.o topsort.o flags.o minimize.o reverse.o extract.o sigma.o io.o structures.o constructions.o coaccessible.o utf8.o spelling.o dynarray.o mem.o stringhash.o trie.o lex.lexc.o lex.yy.o lex.cmatrix.o regex.o
- 
-@@ -82,7 +77,7 @@
- 	if test -f $(libdir)/$(SHAREDLIB); then rm  $(libdir)/$(SHAREDLIB); fi
- 	if test -f $(libdir)/$(SHAREDLIBM); then rm  $(libdir)/$(SHAREDLIBM); fi
- 	cd $(libdir); ln -s $(SHAREDLIBV) $(SHAREDLIB); cd $(libdir);	\
--	ln -s $(SHAREDLIBV) $(SHAREDLIBM); (ldconfig || true)		\
-+	ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
- 	>/dev/null 2>&1; \
- 
- $(OBJS): foma.h
diff --git a/dev-libs/foma/foma-0.10.0_p20220612.ebuild b/dev-libs/foma/foma-0.10.0_p20220612.ebuild
index eeada44575e2..1ba9f8a3597f 100644
--- a/dev-libs/foma/foma-0.10.0_p20220612.ebuild
+++ b/dev-libs/foma/foma-0.10.0_p20220612.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mhulden/foma/archive/${MY_COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/0.10"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="sys-devel/bison
 	sys-devel/flex"
diff --git a/dev-libs/foma/foma-0.9.18-r1.ebuild b/dev-libs/foma/foma-0.9.18-r1.ebuild
deleted file mode 100644
index bc5c9d290e3c..000000000000
--- a/dev-libs/foma/foma-0.9.18-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A set of utilities for constructing finite-state automata and transducers"
-HOMEPAGE="https://github.com/mhulden/foma"
-SRC_URI="https://bitbucket.org/mhulden/foma/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-libs/readline:=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/foma-0.9.18-clean-makefile.patch" )
-
-src_prepare() {
-	default
-
-	# Install to correct libdir
-	sed "s|/lib|/$(get_libdir)|" -i Makefile || die
-
-	append-cflags -fcommon
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	export RANLIB="$(tc-getRANLIB)"
-
-	export CFLAGS="${CFLAGS} -Wl,--as-needed -D_GNU_SOURCE -std=c99 -fvisibility=hidden -fPIC"
-	export FLOOKUPLDFLAGS="${LDFLAGS} libfoma.a -lz"
-	export LDFLAGS="${LDFLAGS} -lreadline -lz -lncurses"
-
-	default
-}
-
-src_install() {
-	emake prefix="${D}"/usr install
-	einstalldocs
-	find "${D}" -name '*.a' -delete || die
-}