gentoo resync : 18.12.2020

3 files changed, 2 insertions, 84 deletions

diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
index 70fc63a89309..9eba12c62357 100644
--- a/dev-ml/cairo-ocaml/Manifest
+++ b/dev-ml/cairo-ocaml/Manifest
@@ -4,6 +4,5 @@ AUX 0003-Fix-FTBFS-on-bytecode-architectures.patch 1135 BLAKE2B 90847d27617c1c63
 AUX 0004-no-automagic.patch 1041 BLAKE2B 8cc95aabf25e768cbb03ea608b74a45aa36f7e86f72da7875bb19973512165a1e6ece9f80093ec887e49ffdbd86df23ae585317d2f65b791c186335b86fc2b50 SHA512 53bfa4cbc40b3725fa40454fb6e8521f21aaf61135dd6da1ec9fd3f1df256ceec1901022aa70dabd568c0291e37008b7c122d1d654856a13fe632f3bf2c271b8
 AUX ocaml406.patch 830 BLAKE2B 662bc72ae0f51e6b6b11a475930847fb18a34c1a812c758b0d00fe156a0b1872dd0eb3d590a3be744ef7c4231aa637571631f0d3d61e9401a1b2164a8434e6ac SHA512 d2fc42aaaac76311cc78ee5c53df6e4c029534f424430465f18acb57988169ea240af2c1d08d84fefd5c8e64e5342e8e721e72eab2e1cf240507fcf0324aff72
 DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4
-EBUILD cairo-ocaml-1.2.0-r1.ebuild 1951 BLAKE2B f2f5d85f5ca53294fefcaad7ea08c45a3b6926ed3484a6cdfd9da01ec6d8f9cb57e8de938004b44ac9306959cf2e15649773ba93d5241150f957c72b0d24396f SHA512 05a793768810c7a114f73672e1e7a58f384c1a0a834e588700878eb41d989d50276ed822775d72dd3904a001be3ca192fbc8b86bfd6e305e5a8b604e5e225780
-EBUILD cairo-ocaml-1.2.0.ebuild 1896 BLAKE2B 50549894df7f733d386d7611fa9adde2325e20acb0731adc5b1eb760c385f6292acb0ffefabcd2a0bece62c7de481997fb1dd937f68fdc216d90b92319f5dfe3 SHA512 b1ce1ed398e94271e9a608b1abd3d3be2543065111c1d6826e19db71022f3b898de1c97d524884a460de9ba841b4c7074f68561d353c5142cb2bb7b83d569707
+EBUILD cairo-ocaml-1.2.0-r1.ebuild 1950 BLAKE2B fbe82ba03868919e71c3e55e20d38e443616458a3493a8a8ab598af78e481dde3ffd31c3aa0d347093961831ca05444f62c1eb4a58724207da812bdde928836a SHA512 a772d777572b0c7b17e416c636067718d2b71029a2c017ec7b8fa8c18c438b56f737742ef40b8ea2f0ac811de0893eb81c62f5af78c0facd480280b54b1aa304
 MISC metadata.xml 572 BLAKE2B 55d9ae52f939a260daa0e05c073fb0e574a44383414e04274d58ded73bc68ae6713039ed1f51998a307c166313d93755066a9d06f7fea3525a154de856854ad0 SHA512 7ca7f4c88e7343d1ac5acbacef33cde7a437c5e70df3bede08ee893c7bea317b444585f4d4e9e010509b2ebae9586bbe5d94a5229f656b6ce996cabb895a60d2
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
index 19eead630c6c..f05710bc7330 100644
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
+++ b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples gtk pango"
 
 RDEPEND="dev-lang/ocaml:=
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
deleted file mode 100644
index c9c07c183718..000000000000
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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}"
-
-src_prepare() {
-	# 3 patches from debian and one for automagic on libsvg-cairo
-	epatch \
-		"${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
-	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
-		insinto /usr/share/doc/${PF}/examples
-		doins 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
-}