From db682675b63597fece2de47205004115f9e68e86 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 8 Oct 2022 19:38:41 +0100
Subject: dev-dotnet/libgdiplus: fix DeprecatedDep, eutils use

Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild | 60 ------------------------
 dev-dotnet/libgdiplus/libgdiplus-6.0.2-r2.ebuild | 60 ++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 60 deletions(-)
 delete mode 100644 dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild
 create mode 100644 dev-dotnet/libgdiplus/libgdiplus-6.0.2-r2.ebuild

(limited to 'dev-dotnet/libgdiplus')

diff --git a/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild
deleted file mode 100644
index 204f30e68564..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils dotnet
-
-DESCRIPTION="Library for using System.Drawing with Mono"
-HOMEPAGE="https://www.mono-project.com"
-SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cairo"
-#skip tests due https://bugs.gentoo.org/687784
-RESTRICT="test"
-
-RDEPEND="dev-libs/glib
-	media-libs/freetype
-	media-libs/fontconfig
-	>=media-libs/giflib-5.1.2
-	media-libs/libexif
-	media-libs/libpng:0=
-	media-libs/tiff
-	x11-libs/cairo[X]
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	virtual/jpeg:0
-	!cairo? ( x11-libs/pango )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	# Don't default to pango when `--with-pango` is not given.
-	# Link against correct pango libraries. Bug #700280
-	sed -e 's/text_v=default/text_v=cairo/' \
-		-e 's/pangocairo/pangocairo pangoft2/' \
-		-i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(usex cairo "" "--with-pango")
-}
-
-src_install() {
-	default
-
-	dotnet_multilib_comply
-	local commondoc=( AUTHORS ChangeLog README TODO )
-	for docfile in "${commondoc[@]}"; do
-		[[ -e "${docfile}" ]] && dodoc "${docfile}"
-	done
-	[[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r2.ebuild
new file mode 100644
index 000000000000..728a54f9ac3a
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-6.0.2-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools dotnet
+
+DESCRIPTION="Library for using System.Drawing with Mono"
+HOMEPAGE="https://www.mono-project.com"
+SRC_URI="https://download.mono-project.com/sources/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cairo"
+#skip tests due https://bugs.gentoo.org/687784
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib
+	media-libs/freetype
+	media-libs/fontconfig
+	>=media-libs/giflib-5.1.2
+	media-libs/libexif
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/tiff
+	x11-libs/cairo[X]
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	!cairo? ( x11-libs/pango )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# Don't default to pango when `--with-pango` is not given.
+	# Link against correct pango libraries. Bug #700280
+	sed -e 's/text_v=default/text_v=cairo/' \
+		-e 's/pangocairo/pangocairo pangoft2/' \
+		-i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(usex cairo "" "--with-pango")
+}
+
+src_install() {
+	default
+
+	dotnet_multilib_comply
+	local commondoc=( AUTHORS ChangeLog README TODO )
+	for docfile in "${commondoc[@]}"; do
+		[[ -e "${docfile}" ]] && dodoc "${docfile}"
+	done
+	[[ "${DOCS[@]}" ]] && dodoc "${DOCS[@]}"
+	find "${ED}" -name '*.la' -delete || die
+}
-- 
cgit v1.2.3-65-gdbad