gentoo resync : 05.12.2021

6 files changed, 7 insertions, 168 deletions

diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index 83277d139495..2fce7376f9f0 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -1,10 +1,4 @@
 AUX omake-0.10.2-cflags.patch 353 BLAKE2B 87cada574eb029493f5a0d9dbe4bc705888fbaf26bf64b2bfa63ddd6694dd0e652c698a960c2c13c6a8acbb7410137075b704871ec9396ee6d4f1f14ef637d3a SHA512 460ff11b457eb99f2d3a89f862deffcddc8ccddfeac7b4c7d5cce78544bb223feffb448cc39c440e03a2d028698180cc7439f3b39dd07ce237cc60cedf7e7d37
-AUX omake-0.9.8.6.0_rc1-cflags.patch 231 BLAKE2B 9f7b587caec9991d6710c24ec6743f71a707f631c7bd2002ad10c4967fd258db7916064d0db6b80a2e5b3c4bb1f6fbbaf63f200a12028950e97306807f30809b SHA512 733aeb2288b8c6494eb4a46ceff2a88149477ae95da8470f11fa321b3f1623adae13169effb95f45c16fff893d610af05be54ad892c4d7a97019e2a12fe3d19b
-AUX omake-0.9.8.6.0_rc1-warnerror.patch 287 BLAKE2B 20b28db41f662e8f3fa75a65fd9ea8c44b091e6abe31a3813e8120684b9a078e70cfa4141766b263549ae885c2199abcb4e23e7e7fee6a0e2fc643ae810b9863 SHA512 0b099c314e2eb19ab48eca873710f3c5716b4a2b82048ddd5baf3b2c7a82de5245ca36f1f72c6dbdbd79bd023de7ab3716a6c46c87986d00db2ec3661daa9d50
-DIST omake-0.10.2.tar.gz 2434316 BLAKE2B f8ca58058ddee39f4e803b91fce061041adfdd71644c17282353b9057acddf23dcc25f836d0ae4014dd44d9c3889c32e5b14788916bcc07015aa6d93e6b5ebdb SHA512 22c454825287dd54272874ec3aa7c5a79f7eac79e18a3eefd4b2e90a08f9767307b0f627d71049a4c08776c85318ce096e89fcc5619d3ec78cc073744efd0fbd
 DIST omake-0.10.3.tar.gz 2438877 BLAKE2B c14adc4da9849b369a2cf5e3676260a2efeb6339939de95965f708b93ac5964af0a8b7e79ebaf98a20061c45530a20ca3825e7a432a3d8b86cdef3ab661cd5d9 SHA512 77eb87b819048d7d9cb9b89a73c5f922ba3adc93f0d58536b3cfa20abdbf1d2a4c576b77921c52e8ea5f80171e8a503b573bf2a92b65fa0579f6492574079733
-DIST omake-0.9.8.6-0.rc1.tar.gz 3254283 BLAKE2B 0fbb77932178e067ff771ed4d448fa2342f56e281799915ab559a606bc195f7817f710caaa44b2debb6243aabf73ebc3d11e0fa010fdfcca14060c8e6e808b15 SHA512 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0
-EBUILD omake-0.10.2.ebuild 1104 BLAKE2B 3b641a4927ebdd2cce9df0ad77ed5a0792f9bfc9b13109120f8b860a203e5a38d925880bf14138d5b2fad1f844a2539ed68611fd38d68ab4d804d68e11ddf70c SHA512 304966ee64e356477817765b4b4f5c3c62bd74b8a8eef37a661ccddbd89f28d0db3ab06a12a7af1a71e761285da74438c07e0d72f7cb382bb5d6c7d7b297bc27
-EBUILD omake-0.10.3.ebuild 1112 BLAKE2B 5ca86a8f524530497749ee72469fc8ad602abd9ca6f418be9424e52d77bdddc9f88852d6b486da068a634409255f4289491d2f76a280824c08eb6c844ecd2039 SHA512 a999127a6dee4ef6c53dc13e72fd0ca4c0f3f3c81f43c40d0d0b7eba660222207b21281403492e18428298ee267f0fec53ca631c3b61de1bdf33b88733fdecf5
-EBUILD omake-0.9.8.6.0_rc1.ebuild 1976 BLAKE2B a695ae4e6970cbfbfb4177cdb73aceb403ad7622c9dcdc0c5d6767ab3d73a3756940d463bf898b8b1cbb107244f6d8d0ffb9bcab638fcc91bc3695d52801a088 SHA512 71dbbcd01e62335e3e39efbf38f0592427398a4a90e87ed88d9b5979a554c916322dac1ee5c0aecb4e6e24be5ea4666af999489549f2db2c046da3217418618e
+EBUILD omake-0.10.3-r1.ebuild 1071 BLAKE2B f4476ed1adf0256d19a2f51557b7be08c4f63495f50f6fe4f4aef1f2b917028fb39f064ac36fbc248e6d8abe66b6781e4d9262f0c53d5e9c264f25b3d58e77c0 SHA512 df0c4169ea5a1a32f2b18a83466769ba06de7a0419e797fe147ba6da86772e156153ffa6b475b89bc97f3db75520aa3e73fabcf2bbe1b2d80bf87c7100df341f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch b/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch
deleted file mode 100644
index a6eaf707c971..000000000000
--- a/dev-util/omake/files/omake-0.9.8.6.0_rc1-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/OMakefile
-+++ b/OMakefile
-@@ -33,7 +33,7 @@
-     #
-     # Extra options for the C compiler
-     #
--    CFLAGS += -g -O2 -Wall -Werror -Wno-unused
-+    CFLAGS += -Wall -Wno-unused
- 
-     #
-     # We never need threads on Unix
diff --git a/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch b/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch
deleted file mode 100644
index cf8a7972027d..000000000000
--- a/dev-util/omake/files/omake-0.9.8.6.0_rc1-warnerror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/build/OCaml.om
-+++ b/lib/build/OCaml.om
-@@ -176,7 +176,7 @@ public.PREFIXED_OCAMLPACKS =\
- #
- declare OCAMLDEPFLAGS
- public.OCAMLPPFLAGS  =
--public.OCAMLFLAGS    = -warn-error A
-+public.OCAMLFLAGS    =
- public.OCAMLCFLAGS   = -g
- public.OCAMLOPTFLAGS =
- public.OCAMLCPPFLAGS =
diff --git a/dev-util/omake/omake-0.10.2.ebuild b/dev-util/omake/omake-0.10.3-r1.ebuild
index c57efbad6a81..fdebd689cc2c 100644
--- a/dev-util/omake/omake-0.10.2.ebuild
+++ b/dev-util/omake/omake-0.10.3-r1.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit epatch
+EAPI=8
 
 DESCRIPTION="Make replacement"
 HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
@@ -21,10 +19,9 @@ DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-cflags.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.2-cflags.patch"
+)
 
 src_configure() {
 	./configure \
@@ -43,7 +40,7 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 	dodoc ChangeLog CONTRIBUTORS.org README.md
 	if use doc; then
-		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
-		dohtml -r doc/html/*
+		dodoc doc/ps/omake-doc.pdf doc/txt/omake-doc.txt
+		dodoc -r doc/html
 	fi
 }
diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild
deleted file mode 100644
index 56f5309054d2..000000000000
--- a/dev-util/omake/omake-0.10.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch
-
-DESCRIPTION="Make replacement"
-HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
-SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc fam ncurses +ocamlopt readline"
-RESTRICT="installsources !ocamlopt? ( strip )"
-
-DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	ncurses? ( >=sys-libs/ncurses-5.3:0= )
-	fam? ( virtual/fam )
-	readline? ( >=sys-libs/readline-4.3:0= )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-0.10.2-cflags.patch"
-}
-
-src_configure() {
-	./configure \
-		-prefix "${EPREFIX}/usr" \
-		$(use readline || echo '-disable-readline') \
-		$(use ncurses  || echo '-disable-ncurses' ) \
-		$(use fam      || echo '-disable-fam'     ) \
-		|| die
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc ChangeLog CONTRIBUTORS.org README.md
-	if use doc; then
-		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
deleted file mode 100644
index dc22875577cc..000000000000
--- a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch toolchain-funcs multilib versionator
-
-MY_PV=$(replace_version_separator 5 '.' "$(replace_version_separator 4 '-' )")
-DESCRIPTION="Make replacement"
-HOMEPAGE="http://omake.metaprl.org/"
-SRC_URI="http://omake.metaprl.org/downloads/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="doc fam ncurses +ocamlopt readline"
-RESTRICT="installsources !ocamlopt? ( strip )"
-
-DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	ncurses? ( >=sys-libs/ncurses-5.3:0= )
-	fam? ( virtual/fam )
-	readline? ( >=sys-libs/readline-4.3:0= )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${MY_PV%-*}
-
-use_boolean() {
-	if use ${1}; then
-		echo "true"
-	else
-		echo "false"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-cflags.patch" \
-		"${FILESDIR}/${P}-warnerror.patch"
-}
-
-src_configure() {
-	# Configuration steps...
-	echo "PREFIX = \$(dir \$\"/usr\")" > .config
-	echo "BINDIR = \$(dir \$\"\$(PREFIX)/bin\")" >> .config
-	echo "LIBDIR = \$(dir \$\"\$(PREFIX)/$(get_libdir)\")" >> .config
-	echo "MANDIR = \$(dir \$\"\$(PREFIX)/man\")" >> .config
-
-	echo "CC = $(tc-getCC)" >> .config
-	echo "CFLAGS = ${CFLAGS}" >> .config
-
-	if use ocamlopt; then
-		echo "NATIVE_ENABLED = true" >> .config
-		echo "BYTE_ENABLED = false" >> .config
-	else
-		echo "NATIVE_ENABLED = false" >> .config
-		echo "BYTE_ENABLED = true" >> .config
-	fi
-
-	echo "NATIVE_PROFILE = false" >> .config
-
-	echo "READLINE_ENABLED = $(use_boolean readline)" >> .config
-	echo "FAM_ENABLED = $(use_boolean fam)" >> .config
-	echo "NCURSES_ENABLED = $(use_boolean ncurses)" >> .config
-
-	echo "DEFAULT_SAVE_INTERVAL = 60" >> .config
-
-	echo "OCAMLDEP_MODULES_ENABLED = false" >> .config
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc CHANGELOG.txt
-	if use doc; then
-		dodoc doc/ps/omake-doc.{pdf,ps} doc/txt/omake-doc.txt
-		dohtml -r doc/html/*
-	fi
-}