[gentoo-commits] repo/gentoo:master commit in: dev-ml/cairo-ocaml/, profiles/, dev-ml/cairo-ocaml/files/

[David Seifert]

commit:     a1c7d4086d97ac0dcf6bc6f80a8b32384b3a5297
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun Apr 25 11:49:43 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 11:49:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c7d408

dev-ml/cairo-ocaml: Remove last-rited pkg

Closes: https://bugs.gentoo.org/557538
Closes: https://bugs.gentoo.org/769326
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-ml/cairo-ocaml/Manifest                        |  1 -
 dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild     | 85 ----------------------
 ...-libraries-used-by-the-stubs-to-CAIRO_LIB.patch | 26 -------
 ...akefile-to-avoid-recompiling-files-in-usr.patch | 27 -------
 .../0003-Fix-FTBFS-on-bytecode-architectures.patch | 39 ----------
 dev-ml/cairo-ocaml/files/0004-no-automagic.patch   | 25 -------
 dev-ml/cairo-ocaml/files/ocaml406.patch            | 20 -----
 dev-ml/cairo-ocaml/metadata.xml                    | 16 ----
 profiles/package.mask                              |  6 --
 9 files changed, 245 deletions(-)

diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
deleted file mode 100644
index 88a09824bf8..00000000000
--- a/dev-ml/cairo-ocaml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4

diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
deleted file mode 100644
index f05710bc733..00000000000
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib autotools
-
-DESCRIPTION="Ocaml bindings for the cairo vector graphics library"
-HOMEPAGE="https://www.cairographics.org/cairo-ocaml/"
-SRC_URI="https://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples gtk pango"
-
-RDEPEND="dev-lang/ocaml:=
-	x11-libs/cairo
-	gtk? ( dev-ml/lablgtk:2= )
-	pango? ( x11-libs/pango )"
-DEPEND="${RDEPEND}"
-
-# 3 patches from debian and one for automagic on libsvg-cairo
-PATCHES=(
-	"${FILESDIR}"/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch \
-	"${FILESDIR}"/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch \
-	"${FILESDIR}"/0003-Fix-FTBFS-on-bytecode-architectures.patch \
-	"${FILESDIR}"/0004-no-automagic.patch
-)
-
-src_prepare() {
-	default
-	has_version '>=dev-lang/ocaml-4.06.0' && eapply "${FILESDIR}"/ocaml406.patch
-	AT_M4DIR=support eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gtk) \
-		$(use_with pango pango-cairo) \
-		--without-svg-cairo
-}
-
-src_compile() {
-	emake -j1
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README ChangeLog
-	if use examples; then
-		docinto examples
-		dodoc test/*.ml
-	fi
-	# ocamlfind support
-	cat <<-EOF > META
-		name = "${PN}"
-		description = "${DESCRIPTION}"
-		requires = "bigarray"
-		version = "${PV}"
-		archive(byte) = "cairo.cma"
-		archive(native) = "cairo.cmxa"
-	EOF
-	if use gtk; then
-		cat <<-EOF >> META
-			package "lablgtk2" (
-				requires = "cairo lablgtk2"
-				archive(byte) = "cairo_lablgtk.cma"
-				archive(native) = "cairo_lablgtk.cmxa"
-			)
-		EOF
-	fi
-	if use pango; then
-		cat <<-EOF >> META
-			package "pango" (
-				requires = "cairo"
-				archive(byte) = "pango_cairo.cma"
-				archive(native) = "pango_cairo.cmxa"
-			)
-		EOF
-	fi
-	insinto /usr/$(get_libdir)/ocaml/cairo
-	doins META
-}

diff --git a/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch b/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
deleted file mode 100644
index 6b42f6d4fd5..00000000000
--- a/dev-ml/cairo-ocaml/files/0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Stephane Glondu <steph@××××××.net>
-Date: Sun, 27 Feb 2011 13:31:22 +0100
-Subject: Add missing libraries used by the stubs to CAIRO_LIBS
-
-The recent changes in DSO linking highlighted this, and were
-preventing ocaml-melt from building.
-
-Signed-off-by: Stephane Glondu <steph@××××××.net>
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6c8c4e9..0cf1f11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR(support)
- AC_PROG_OCAML()
- 
- # Check for cairo
--PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 freetype2)
-+PKG_CHECK_MODULES(CAIRO, cairo >= 1.2 cairo-ft cairo-fc cairo-ps cairo-pdf freetype2)
- 
- # Optional GTK support (for the X11 backend)
- AC_ARG_WITH(gtk, 
--- 

diff --git a/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch b/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
deleted file mode 100644
index fcb0f058322..00000000000
--- a/dev-ml/cairo-ocaml/files/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Stephane Glondu <steph@××××××.net>
-Date: Tue, 2 Aug 2011 15:34:21 +0200
-Subject: Fix Makefile to avoid recompiling files in /usr
-
-The "-I /path/to/lablgtk2" option should not be used when calling
-ocamldep, otherwise files there are considered as possible targets by
-the build system.
-
-Signed-off-by: Stephane Glondu <steph@××××××.net>
----
- src/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 46a62f6..c9c64b7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -117,7 +117,7 @@ clean :
- 
- .depend : $(wildcard *.ml *.mli)
- 	@echo "making deps"
--	@$(OCAMLDEP) $(if $(LABLGTKDIR),-I $(LABLGTKDIR)) $^ > $@
-+	@$(OCAMLDEP) $^ > $@
- 
- -include .depend
- -include .depend_c
--- 

diff --git a/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch b/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch
deleted file mode 100644
index 8882ce0a4da..00000000000
--- a/dev-ml/cairo-ocaml/files/0003-Fix-FTBFS-on-bytecode-architectures.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Stephane Glondu <steph@××××××.net>
-Date: Tue, 2 Aug 2011 21:35:59 +0200
-Subject: Fix FTBFS on bytecode architectures
-
-The new ocaml.m4 defines OCAMLOPT to "no" (instead of not defining
-it); adapt src/Makefile accordingly.
-
-Signed-off-by: Stephane Glondu <steph@××××××.net>
----
- src/Makefile |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index c9c64b7..bc223c7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -14,7 +14,11 @@ ifdef LIBPANGOCAIRO_CFLAGS
- TARGETS += pangocairo
- endif
- 
--all : $(TARGETS) $(if $(OCAMLOPT),opt)
-+ifneq ($(OCAMLOPT),no)
-+OPT_TARGET = opt
-+endif
-+
-+all : $(TARGETS) $(OPT_TARGET)
- opt : $(addsuffix .opt,$(TARGETS))
- 
- cairo     : cairo.cma  libmlcairo.a
-@@ -89,7 +93,7 @@ $(call mloptobjs,$(pangocairo_SRC))  : INCFLAGS=-I $(LABLGTKDIR)
- install: all
- 	mkdir -p $(DESTDIR)$(INSTALLDIR) $(DESTDIR)$(OCAMLLIB)/stublibs
- 	install -m 644 *.mli *.cmi *.cma lib*.a $(DESTDIR)$(INSTALLDIR)
--ifdef OCAMLOPT
-+ifneq ($(OCAMLOPT),no)
- 	install -m644 *.cmxa *.a *.cmx $(DESTDIR)$(INSTALLDIR)
- endif
- 	install -m 755 dll*.so $(DESTDIR)$(INSTALLDIR)
--- 

diff --git a/dev-ml/cairo-ocaml/files/0004-no-automagic.patch b/dev-ml/cairo-ocaml/files/0004-no-automagic.patch
deleted file mode 100644
index 46b70013fa3..00000000000
--- a/dev-ml/cairo-ocaml/files/0004-no-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- cairo-ocaml-1.2.0/configure.ac.orig	2012-06-17 20:58:38.000000000 +0100
-+++ cairo-ocaml-1.2.0/configure.ac	2012-06-17 21:05:49.000000000 +0100
-@@ -27,10 +27,20 @@
- fi
- 
- # Optional libsvg-cairo support
--PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
-+AC_ARG_WITH(svg-cairo, 
-+	    AS_HELP_STRING([--with-svg-cairo],[libsvg-cairo support]),
-+	    use_libsvg_cairo=$withval, use_libsvg_cairo=no)
-+if test x$use_libsvg_cairo != xno; then
-+   PKG_CHECK_MODULES(LIBSVG_CAIRO, libsvg-cairo, use_libsvg_cairo=yes, use_libsvg_cairo=no)
-+fi
- 
- # Optional pango-cairo support
--PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no)
-+AC_ARG_WITH(pango-cairo, 
-+	    AS_HELP_STRING([--with-pango-cairo],[pangocairo support]),
-+	    use_libpangocairo=$withval, use_libpangocairo=no)
-+if test x$use_libpangocairo != xno; then
-+   PKG_CHECK_MODULES(LIBPANGOCAIRO, pangocairo, use_libpangocairo=yes, use_libpangocairo=no)
-+ fi
- 
- echo
- echo "  GTK+         support: $use_gtk"

diff --git a/dev-ml/cairo-ocaml/files/ocaml406.patch b/dev-ml/cairo-ocaml/files/ocaml406.patch
deleted file mode 100644
index 2ef9931463b..00000000000
--- a/dev-ml/cairo-ocaml/files/ocaml406.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: cairo-ocaml-1.2.0/src/cairo_png.ml
-===================================================================
---- cairo-ocaml-1.2.0.orig/src/cairo_png.ml
-+++ cairo-ocaml-1.2.0/src/cairo_png.ml
-@@ -7,13 +7,13 @@
- (**************************************************************************)
- 
- external image_surface_create_from_stream_unsafe : 
--  (string -> int -> unit) -> Cairo.image_surface = "ml_cairo_image_surface_create_from_png_stream_unsafe"
-+  (bytes -> int -> unit) -> Cairo.image_surface = "ml_cairo_image_surface_create_from_png_stream_unsafe"
- 
- let image_surface_create_from_channel ic =
-   image_surface_create_from_stream_unsafe
-     (fun s n ->
-       for i = 0 to n - 1 do
--	String.unsafe_set s i (input_char ic)
-+	Bytes.unsafe_set s i (input_char ic)
-       done)
- 
- let image_surface_create_from_file fname =

diff --git a/dev-ml/cairo-ocaml/metadata.xml b/dev-ml/cairo-ocaml/metadata.xml
deleted file mode 100644
index 0fedfcd6cbf..00000000000
--- a/dev-ml/cairo-ocaml/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>sci@g.o</email>
-  <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
-   This package contains all the development stuff you need to use Cairo in
-   your OCaml programs. The folowing backends are supported: PostScript,
-   PDF, PNG, In-memory images and X11.
-</longdescription>
-<use>
-  <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
-</use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 42f95e3a93e..e71d4f1bc72 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -347,12 +347,6 @@ app-eselect/eselect-lcdfilter
 media-libs/fontconfig-ultimate
 media-libs/fontconfig-infinality
 
-# Andreas Sturmlechner <asturm@g.o> (2021-03-28)
-# No release since 2012, depends on deprecated dev-ml/lablgtk:2, no more
-# revdeps in Gentoo ebuild repository.
-# Removal on 2021-04-07, bug #769326
-dev-ml/cairo-ocaml
-
 # Jonas Stein <jstein@g.o> (2021-03-27)
 # Upstream is gone. Open bugs. Removal after 2021-05-01.
 # Bug #778800