[gentoo-commits] repo/gentoo:master commit in: app-text/htmlc/, app-text/htmlc/files/, profiles/

[gentoo-commits] repo/gentoo:master commit in: app-text/htmlc/, app-text/htmlc/files/, profiles/

[Jakov Smolić]

commit:     6f3850f963aac4e116ef5787d66c2c4a8c2a1947
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 13:54:56 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 13:58:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3850f9

app-text/htmlc: treeclean

Closes: https://bugs.gentoo.org/704464
Closes: https://bugs.gentoo.org/780090
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 app-text/htmlc/Manifest            |  2 --
 app-text/htmlc/files/werror.patch  | 18 --------------
 app-text/htmlc/htmlc-2.40.0.ebuild | 47 -----------------------------------
 app-text/htmlc/htmlc-2.60.0.ebuild | 51 --------------------------------------
 app-text/htmlc/metadata.xml        |  5 ----
 profiles/package.mask              |  6 -----
 6 files changed, 129 deletions(-)

diff --git a/app-text/htmlc/Manifest b/app-text/htmlc/Manifest
deleted file mode 100644
index 0e5f1befb819..000000000000
--- a/app-text/htmlc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST htmlc-2.4.0.tgz 132584 BLAKE2B 42f0948e7f896130b539d8d0f0936ddfa21986d3eeab2b30598572eca12952a0010edb1044b259ed13242534a66351c9855e43bbac613028d926370f6221e0d2 SHA512 8de81041cea0c6d07188cb0d8cd553c1d20ea37d01a8d7425d23a10c7fd3d93dc1f7c1e3de473cb624720dc7588a3d891432d5945a23d1f253d2109cdafc15dc
-DIST htmlc-2.6.tgz 286727 BLAKE2B 47e5460c08f7ce5010615e0dec99bc60b2e0f6857d0347c50357837930ca68b369a66001846ef3855cd54cdf6f1dac73ab45546be659a05b1e202438e4914865 SHA512 fa268cf547d60babcbf1aee73f75d3516b08e83158dc0bee36f724abfe2f46ad4b571c09d9d14f97315c70f88d3ea29000fe2d838042242325adce201d60a8f4

diff --git a/app-text/htmlc/files/werror.patch b/app-text/htmlc/files/werror.patch
deleted file mode 100644
index 4576b47b80a4..000000000000
--- a/app-text/htmlc/files/werror.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Dont build with -Werror like switches.
-Need to patch Makefile and *NOT* Makefile.in since otherwise this triggers a
-rebuild of the Makefile which needs htmlc to be installed first.
-https://bugs.gentoo.org/show_bug.cgi?id=553172
-
-Index: htmlc-2.6.0/config/Makefile
-===================================================================
---- htmlc-2.6.0.orig/config/Makefile
-+++ htmlc-2.6.0/config/Makefile
-@@ -40,7 +40,7 @@ MANDIR = $(PREFIXINSTALLDIR)/man/man$(MA
- 
- # The Caml compilers (those defaults should be OK)
- CAMLDEP = $(OCAML_COMMAND_SEARCH_PATH)ocamldep
--CAML_FLAGS = -w A -warn-error A #-safe-string
-+CAML_FLAGS = -w A #-safe-string
- CAMLBYT_FLAGS = $(CAML_FLAGS) -g -annot
- CAMLBYT = $(OCAML_COMMAND_SEARCH_PATH)ocamlc $(CAMLBYT_FLAGS)
- CAMLBIN_FLAGS = $(CAML_FLAGS) -inline 10000

diff --git a/app-text/htmlc/htmlc-2.40.0.ebuild b/app-text/htmlc/htmlc-2.40.0.ebuild
deleted file mode 100644
index 488950ddc494..000000000000
--- a/app-text/htmlc/htmlc-2.40.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Override version: 2.4.0 > 2.21.0 so we name it 2.40.0
-MY_P="${P/0[.]/.}"
-
-DESCRIPTION="HTML template files expander"
-HOMEPAGE="http://htmlc.inria.fr/"
-SRC_URI="http://htmlc.inria.fr/${MY_P}.tgz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="htmlc"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="+ocamlopt"
-# Files for the tests are missing...
-#RESTRICT="test"
-
-DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	./configure \
-		--install-root-dir "${ED}/usr" \
-		|| die
-}
-
-src_compile() {
-	if use ocamlopt ; then
-		emake bin
-	else
-		emake byt
-	fi
-}
-
-src_install() {
-	if use ocamlopt ; then
-		emake installbin
-	else
-		emake installbyt
-	fi
-
-	emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman
-	dodoc README Announce* CHANGES
-}

diff --git a/app-text/htmlc/htmlc-2.60.0.ebuild b/app-text/htmlc/htmlc-2.60.0.ebuild
deleted file mode 100644
index 38f7c831c39b..000000000000
--- a/app-text/htmlc/htmlc-2.60.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Override version: 2.4.0 > 2.21.0 so we name it 2.40.0
-MY_P="${P/0[.]/.}"
-
-DESCRIPTION="HTML template files expander"
-HOMEPAGE="http://htmlc.inria.fr/"
-SRC_URI="http://htmlc.inria.fr/${MY_P%.0}.tgz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="htmlc"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt"
-# Files for the tests are missing...
-#RESTRICT="test"
-
-DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/werror.patch
-)
-
-src_configure() {
-	./configure \
-		--install-root-dir "${ED}/usr" \
-		|| die
-}
-
-src_compile() {
-	if use ocamlopt ; then
-		emake bin
-	else
-		emake byt
-	fi
-}
-
-src_install() {
-	if use ocamlopt ; then
-		emake installbin
-	else
-		emake installbyt
-	fi
-
-	emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman
-	dodoc README Announce* CHANGES
-}

diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml
deleted file mode 100644
index 115e9d64a669..000000000000
--- a/app-text/htmlc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 6a44461e5dcb..193574d87d1e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -564,12 +564,6 @@ dev-java/netty-tcnative
 dev-dotnet/dbus-sharp
 dev-dotnet/dbus-sharp-glib
 
-# Sam James <sam@gentoo.org> (2021-10-16)
-# Fails to compile with modern OCaml
-# bug #704464, bug #780090
-# Removal on 2021-11-16.
-app-text/htmlc
-
 # Sam James <sam@gentoo.org> (2021-10-10)
 # Needs upstream build system fixes (currently in progress).
 # Python toggles don't work correctly right now.