Merge pull request 'feature/gtk-sharp-slot-3' (#89) from feature/gtk-sharp-slot-3 into master

Reviewed-on: #89

dev-dotnet/gtk-sharp/ChangeLog

@@ -1,3 +1,13 @@
+  22 Aug 2021; Manuel Friedli <manuel@gentoo.org> gtk-sharp-3.22.2.ebuild:
+  dev-dotnet/gtk-sharp:
+
+*gtk-sharp-3.22.2 (22 Aug 2021)
+
+  22 Aug 2021; Manuel Friedli <manuel@gentoo.org>
+  +files/01-meson-build-gio.patch, +gtk-sharp-3.22.2.ebuild,
+  -gtk-sharp-2.12.45.ebuild, -gtk-sharp-3.24.24.34.ebuild, metadata.xml:
+  dev-dotnet/gtk-sharp: Add ebuild for gtk-sharp 3.22.2.
+
 *gtk-sharp-2.12.45 (19 Mar 2020)
 
   19 Mar 2020; Manuel Friedli <manuel@fritteli.ch> +gtk-sharp-2.12.45.ebuild,

dev-dotnet/gtk-sharp/Manifest

@@ -1,4 +1,5 @@
-DIST gtk-sharp-2.12.45.tar.gz 2644209 BLAKE2B 1455e1e5594b1b91851621b37a15932cd498857c19dab51c8434f764b3918f7c5ca47674eb5089ebecfc8e55850151a642617623744cdbce1566b158af998e54 SHA512 6e11a6a3e8f7f3f9511c674cdcbda15274e597b8e72bc2cdd6970f8906e295849a94108794c11b9aef5408631bf10d2dd7d855d5e5081f58fc790e7194f6159f
+AUX 01-meson-build-gio.patch 495 BLAKE2B 4e87dde4f08d1c5fc5c4531817a7e9c5aa2467c232e4f56c086df11025f66781f0cebabb5b3e44b2902213d96878b976fc8d3b540ada8dd25ae312373c0e9bcb SHA512 629fc63017ee0e7d45568d070bb5f61a0004b9e8eb92f6befa9dde108b13c03036444dae57e90ed3a9c839a558bacb825c2014ea829ed7a49b977d2437356d5c
-EBUILD gtk-sharp-2.12.45.ebuild 1383 BLAKE2B 5e267a93b420f62d103c7d79dd16420defcfc4eda26e0ba9ee8d67730759db1c1536483cbfab99a3c5b66597e8694ce18373a6fd182e329a6e4016589ec4632b SHA512 8e105219a91781ca4b6d3256e38f57a26be4abc8fcab8b7537f89a39cf333e728917c86bea4ac7c5e1ac3106e9336c81629d62b595718d2608401fafd83c1ebe
+DIST gtk-sharp-3.22.2.tar.gz 3297236 BLAKE2B ed6f9e19cc2db3e3a86a14107239b25ec4868222d5ef3d694372e824b8f323d70f5a4847c72a0c2a780cc474375fbf74c74ca3165fbed4255e68671614b9f9fc SHA512 8d4fdcbd54ec795dd5d8bd1fd9e4ec5ea5fff5169392891c99656d3fa1fffda28bbe6ac4e32f1201e7ed03b9702f37e85cd315946bf055efdd7b264d23e6007a
-MISC ChangeLog 184 BLAKE2B 82098e9eb5b24207855e9b901e7467e960ff6438ca5c407d3b5260015b2624b0c143bc5f1a944e7d8a883003e8e14f9827306a7fb2916904972b09ad7b570e53 SHA512 8b78609d5375b4dd340c49db4a68c2df599b803e391a118a97009f258176d716cbced02fbc30fa2f6bae1a0ec3ed54151cc58eab03af3659a8aba18cd2a28336
+EBUILD gtk-sharp-3.22.2.ebuild 1040 BLAKE2B 9cba705c0ccfc008013d6085ee46c6122d3b6b95971536da4f263fa755ad1cc738a74425c8449b1b8c0ce4c5f2ae4e6ce2fccdbb646e93f52c63e7ef6639b83e SHA512 c9e7dfb8510e4008ed066761c401e805ef0286c08a4b79aef0b1784abd42866e9b25aafcbf9d3b52a45ce0211d8cd59962aeee5a683886af326fdfe24e68828e
-MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
+MISC ChangeLog 559 BLAKE2B 9b3126638cad810c9386f2a8676b1d2b943766586e0a2a679cf97bf610586b8b9c1aa98bfb76b25140b6992e61e63ba3f0c2125608203d38d2d616f82bc25362 SHA512 10c35ad687ec0c2714c74cf52d80ccfae787474bc849f4f40269d52c10ce2faff17ef902290e20bd3e767798a2f79fd75f9521938badac25b212677bcf8e7f29
+MISC metadata.xml 417 BLAKE2B cf54245e7d2fba30caddcbb70f077e33f04f8fcf24c332ba130016c35b6566ffdf1c2f322914ba6d6989fc8d2559846ea8e14c2cd5210ea3b35370f7ee098c41 SHA512 efc7406e4693faf96ac080c13026160553a95be11d01239c3f6617c60d3e8de4fd31e9787aa406bbdeeeba386cef308746f441443402f90ea6b8d69d6f85ba24

dev-dotnet/gtk-sharp/files/01-meson-build-gio.patch

@@ -0,0 +1,11 @@
+diff --git a/Source/gio/generated/meson.build b/Source/gio/generated/meson.build
+index f8e3978..416ed5c 100644
+--- a/Source/gio/generated/meson.build
++++ b/Source/gio/generated/meson.build
+@@ -413,5 +413,5 @@ pkgs += [pkg]
+ source_gen = files(generated_sources)
+ gio_api_includes = join_paths(meson.current_source_dir(), 'gio-api.xml')
+ if install
+-    install_data(gdk_api_includes, install_dir: gapi_xml_installdir)
++    install_data(gio_api_includes, install_dir: gapi_xml_installdir)
+ endif

dev-dotnet/gtk-sharp/gtk-sharp-2.12.45.ebuild

@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-#inherit dotnet autotools base
-inherit dotnet autotools
-
-SLOT="2"
-DESCRIPTION="gtk bindings for mono"
-LICENSE="GPL-2"
-HOMEPAGE="http://www.mono-project.com/GtkSharp"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-SRC_URI="http://download.mono-project.com/sources/gtk-sharp212/${P}.tar.gz"
-IUSE="debug"
-
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-lang/mono-3.0
-	x11-libs/pango
-	>=dev-libs/glib-2.31
-	dev-libs/atk
-	x11-libs/gtk+:2
-	gnome-base/libglade
-	dev-perl/XML-LibXML
-	!dev-dotnet/gtk-sharp-gapi
-	!dev-dotnet/gtk-sharp-docs
-	!dev-dotnet/gtk-dotnet-sharp
-	!dev-dotnet/gdk-sharp
-	!dev-dotnet/glib-sharp
-	!dev-dotnet/glade-sharp
-	!dev-dotnet/pango-sharp
-	!dev-dotnet/atk-sharp"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/automake:1.11"
-
-src_unpack() {
-	mkdir "${T}"/the_registry
-	default
-}
-
-src_prepare() {
-	eautoreconf
-	_elibtoolize
-	eapply_user
-}
-
-src_configure() {
-	econf	--disable-static \
-		--disable-maintainer-mode \
-		$(use_enable debug)
-}
-
-src_compile() {
-	MONO_REGISTRY_PATH="${T}/the_registry" emake
-}
-
-src_install() {
-	default
-	dotnet_multilib_comply
-	sed -i "s/\\r//g" "${D}"/usr/bin/* || die "sed failed"
-	dodir /etc/mono/registry || die "failed to create registry dir"
-	insinto /etc/mono/registry
-	doins -r "${T}"/the_registry/* || die "failed to install to registry"
-}

dev-dotnet/gtk-sharp/gtk-sharp-3.22.2.ebuild

@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#inherit dotnet autotools base
+#inherit dotnet autotools
+inherit meson
+
+MY_PN="GtkSharp"
+MY_P="${MY_PN}-${PV}"
+SLOT="3"
+DESCRIPTION="gtk bindings for mono"
+LICENSE="GPL-2"
+HOMEPAGE="https://github.com/GLibSharp/GtkSharp"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+SRC_URI="https://github.com/GLibSharp/GtkSharp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="atk cairo gdk +gtk pango"
+
+S="${WORKDIR}/${MY_P}"
+
+RDEPEND="
+	>=dev-libs/glib-2.32
+	x11-libs/gtk+:3
+"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/mono-6.12
+	atk? ( dev-libs/atk )
+	cairo? ( x11-libs/cairo )
+	gdk? ( x11-libs/gdk-pixbuf )
+	gtk? ( x11-libs/gtk+:3 )
+	pango? ( x11-libs/pango )"
+
+PATCHES=( "${FILESDIR}/01-meson-build-gio.patch" )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature atk)
+		$(meson_feature cairo)
+		$(meson_feature gdk)
+		$(meson_feature gtk)
+		$(meson_feature pango)
+		-Dinstall=true
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+}

dev-dotnet/gtk-sharp/metadata.xml

@@ -5,4 +5,9 @@
 		<email>manuel@fritteli.ch</email>
 		<name>Manuel Friedli</name>
 	</maintainer>
+	<use>
+		<flag name="atk">Build the ATK bindings.</flag>
+		<flag name="gdk">Build the GDK bindings.</flag>
+		<flag name="pango">Build the Pango bindings.</flag>
+	</use>
 </pkgmetadata>

games-rpg/ankh/ChangeLog

@@ -1,5 +0,0 @@
-  01 Sep 2016; Manuel Friedli <manuel@fritteli.ch> ankh-1.0.ebuild:
-  games-rpg/ankh:  updated to EAPI="6"
-
-  07 Jun 2016; Manuel Friedli <manuel@fritteli.ch> +ChangeLog:
-  Added ChangeLog

games-rpg/ankh/Manifest

@@ -1,3 +0,0 @@
-EBUILD ankh-1.0.ebuild 1927 BLAKE2B 8b30afbd5a74e47fb067f96be4baaf20216f4a1c3376a7a5e5cc4bf40de8a839c19d3d2c612c8047ce88b04c73bcba88a586dea887b481278def20ae7dcef0f2 SHA512 53d5bc412de7506645c92c18749d82199277425f8198d22bdb450a7bebae6082b48fba916b8c32de024efb336ecc1d5f4daea9557924c13ddab731bc8308c1b4
-MISC ChangeLog 189 BLAKE2B d0bc4ce33f780ea9c8cc9cc3dd2c96434ec65aa54b5ff7fa76e1f3308b1850beb2686be5d188b58e35ecb2386ddcac5ef560e3311ccf459f859175b770010118 SHA512 bfdf37b496e51ed0d0f3117dbac657c66f8a2ee70c8656b40f611c7dcfd8943b8065b21faf2c69875c72a81c6dbbb481f55215667bcb3c3bd8847681224b9c25
-MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2

games-rpg/ankh/ankh-1.0.ebuild

@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils cdrom multilib
-DESCRIPTION="Ankh a Adventure like Monkey Island"
-HOMEPAGE="http://www.ankh-game.de/ankh.html"
-LICENSE="all-rights-reserved"
-
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+multilib"
-RESTRICT="strip"
-ABI="x86"
-
-REQUIRED_USE="amd64? ( multilib )"
-
-DEPEND="app-arch/bzip2
-	app-arch/tar
-	app-arch/unzip"
-
-RDEPEND="sys-libs/glibc
-	multilib? (
-		virtual/opengl[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXau[abi_x86_32(-)]
-		x11-libs/libXdmcp[abi_x86_32(-)]
-		|| (
-			(
-				amd64? ( x11-drivers/nvidia-drivers[multilib(-)] )
-				x86? ( x11-drivers/nvidia-drivers )
-			)
-			x11-drivers/ati-drivers[abi_x86_32(-)]
-		)
-	)
-	!multilib? (
-		virtual/opengl
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		|| (
-			x11-drivers/nvidia-drivers
-			x11-drivers/ati-drivers
-		)
-	)"
-
-S=${WORKDIR}
-
-GAMES_CHECK_LICENSE="no"
-dir="/opt/ankh"
-Ddir="${D}/${dir}"
-
-src_install() {
-	cdrom_get_cds data/Ankh.tar.gz
-	insinto "${dir}"
-	exeinto "${dir}"
-	einfo "Unpacking common.zip from Disk..."
-	unzip -qo "${CDROM_ROOT}"/data/common.zip -d "$Ddir"
-	einfo "Unpacking bin-x86.tar.gz from Disk..."
-	tar xzf "${CDROM_ROOT}"/data/bin-x86.tar.gz -C "$Ddir"
-	einfo "Unpacking libs-x86.tar.gz from Disk..."
-	tar xzf "${CDROM_ROOT}"/data/libs-x86.tar.gz -C "$Ddir"
-	einfo "Unpacking Ankh.tar.gz from Disk..."
-	tar xzf "${CDROM_ROOT}"/data/Ankh.tar.gz -C "$Ddir"
-
-	find "${Ddir}" -exec touch '{}' \;
-	# Argh the Program saves the settings in its install dir :(
-	# so we have to set some dir to be writeable by the group
-	chmod g+w "${Ddir}"/media/     # the settings are saved here
-	chmod g+w "${Ddir}"/bin/release # the log-files are saved here
-	dosym "${dir}"/Ankh /usr/games/bin/ankh
-
-	make_desktop_entry ankh "Ankh" "${dir}"/Ankh.xpm
-}

games-rpg/ankh/metadata.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>manuel@fritteli.ch</email>
-		<name>Manuel Friedli</name>
-	</maintainer>
-</pkgmetadata>