commit: ab8f8cca9ed445db21669f178a31b397acd0fafa Author: Heather <Heather <AT> live <DOT> ru> AuthorDate: Fri Aug 14 12:42:03 2015 +0000 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org> CommitDate: Fri Aug 14 12:42:03 2015 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=ab8f8cca
sync overlay with gentoo tree .../gnome-sharp/gnome-sharp-2.24.2-r1.ebuild | 2 +- dev-dotnet/gtk-sharp/gtk-sharp-2.12.21-r1.ebuild | 60 ---------------------- dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild | 7 ++- dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild | 2 +- eclass/gtk-sharp-module.eclass | 2 +- 5 files changed, 8 insertions(+), 65 deletions(-) diff --git a/dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r1.ebuild b/dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r1.ebuild index 26fecc1..604e765 100644 --- a/dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r1.ebuild +++ b/dev-dotnet/gnome-sharp/gnome-sharp-2.24.2-r1.ebuild @@ -10,7 +10,7 @@ SLOT="2" DESCRIPTION="gnome bindings for mono" HOMEPAGE="http://www.mono-project.com/GtkSharp"; LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~ppc" +KEYWORDS="~amd64 ~x86 ~ppc ~x86-fbsd" SRC_URI="mirror://gnome/sources/gnome-sharp/2.24/${P}.tar.bz2" IUSE="debug" diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21-r1.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21-r1.ebuild deleted file mode 100644 index ca60a84..0000000 --- a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit dotnet autotools base - -SLOT="2" -DESCRIPTION="gtk bindings for mono" -LICENSE="GPL-2" -HOMEPAGE="http://www.mono-project.com/GtkSharp"; -KEYWORDS="~amd64 ~x86 ~ppc" -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_prepare() { - base_src_prepare - eautoreconf - libtoolize -} - -src_configure() { - econf --disable-static \ - --disable-dependency-tracking \ - --disable-maintainer-mode \ - $(use_enable debug) -} - -src_compile() { - emake -} - -src_install() { - default - dotnet_multilib_comply - sed -i "s/\\r//g" "${D}"/usr/bin/* || die "sed failed" -} diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild index 61e3bfa..c5d906e 100644 --- a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild +++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 inherit dotnet autotools base @@ -43,7 +43,10 @@ src_prepare() { } src_configure() { - econf $(use_enable debug) + econf --disable-static \ + --disable-dependency-tracking \ + --disable-maintainer-mode \ + $(use_enable debug) } src_compile() { diff --git a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild index 60883a6..5959db3 100644 --- a/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild +++ b/dev-dotnet/libgdiplus/libgdiplus-3.12.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 inherit base eutils dotnet flag-o-matic DESCRIPTION="Library for using System.Drawing with mono" diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass index 7ecff1d..6b457b1 100644 --- a/eclass/gtk-sharp-module.eclass +++ b/eclass/gtk-sharp-module.eclass @@ -145,7 +145,7 @@ esac case ${PF} in #gtk-sharp tarball gtk-sharp-docs*) - add_depend ">=virtual/monodoc-2.0" + add_depend ">=dev-lang/mono-2.0" ;; gtk-sharp-gapi*) add_rdepend "!<=dev-dotnet/gtk-sharp-2.12.7:2"
