From b40d5ff6fab00067924b7407a5c10ddd92fab409 Mon Sep 17 00:00:00 2001 From: Peter Alfredsen Date: Wed, 6 May 2009 11:07:46 +0000 Subject: Fix bug 268610. Thanks to Priit Laes for reporting. (Portage version: 2.2_rc28/cvs/Linux x86_64) --- dev-lang/boo/ChangeLog | 10 ++- dev-lang/boo/boo-0.9.0.3203-r1.ebuild | 72 +++++++++++++++++++++ dev-lang/boo/boo-0.9.0.3203.ebuild | 73 ---------------------- dev-lang/boo/boo-0.9.1.3287-r1.ebuild | 72 +++++++++++++++++++++ dev-lang/boo/boo-0.9.1.3287.ebuild | 73 ---------------------- .../boo/files/boo-0.9.1.3287-GACproblems.patch | 29 +++++++++ 6 files changed, 182 insertions(+), 147 deletions(-) create mode 100644 dev-lang/boo/boo-0.9.0.3203-r1.ebuild delete mode 100644 dev-lang/boo/boo-0.9.0.3203.ebuild create mode 100644 dev-lang/boo/boo-0.9.1.3287-r1.ebuild delete mode 100644 dev-lang/boo/boo-0.9.1.3287.ebuild create mode 100644 dev-lang/boo/files/boo-0.9.1.3287-GACproblems.patch (limited to 'dev-lang/boo') diff --git a/dev-lang/boo/ChangeLog b/dev-lang/boo/ChangeLog index 8894d57db9c9..d7ca488eae95 100644 --- a/dev-lang/boo/ChangeLog +++ b/dev-lang/boo/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-lang/boo # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/ChangeLog,v 1.27 2009/05/06 08:09:51 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/ChangeLog,v 1.28 2009/05/06 11:07:45 loki_val Exp $ + +*boo-0.9.1.3287-r1 (06 May 2009) +*boo-0.9.0.3203-r1 (06 May 2009) + + 06 May 2009; Peter Alfredsen -boo-0.9.0.3203.ebuild, + +boo-0.9.0.3203-r1.ebuild, -boo-0.9.1.3287.ebuild, + +boo-0.9.1.3287-r1.ebuild, +files/boo-0.9.1.3287-GACproblems.patch: + Fix bug 268610. Thanks to Priit Laes for reporting. 06 May 2009; Peter Alfredsen boo-0.9.0.3203.ebuild, boo-0.9.1.3287.ebuild: diff --git a/dev-lang/boo/boo-0.9.0.3203-r1.ebuild b/dev-lang/boo/boo-0.9.0.3203-r1.ebuild new file mode 100644 index 000000000000..ec888c7da4c1 --- /dev/null +++ b/dev-lang/boo/boo-0.9.0.3203-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.9.0.3203-r1.ebuild,v 1.1 2009/05/06 11:07:45 loki_val Exp $ + +EAPI=2 + +inherit multilib mono fdo-mime eutils + +DESCRIPTION="A wrist friendly language for the CLI" +HOMEPAGE="http://boo.codehaus.org/" +SRC_URI="http://dist.codehaus.org/boo/distributions/${P}-2-src.zip" +LICENSE="BSD" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-lang/mono-2.0 + x11-libs/gtksourceview:1.0" +DEPEND="${RDEPEND} + x11-misc/shared-mime-info + app-arch/unzip + >=dev-dotnet/nant-0.86_beta1" + +RESTRICT="test" + +pkg_setup() { + if /usr/bin/gacutil -l|grep Boo.Lang.Extensions &> /dev/null + then + eerror "$(best_version ${CATEGORY}/${PN}) has installed Boo.Lang.Extensions into the GAC." + eerror "This is a bug, that will cause compilation of ${CATEGORY}/${PF} to fail. It has" + eerror "been fixed in this version. For now, it requires that you uninstall" + eerror "${CATEGORY}/${PN} before updating." + eerror "Please run: emerge -C ${CATEGORY}/${PN} and try again." + die "Please run: emerge -C ${CATEGORY}/${PN} and try again." + fi +} + +src_prepare() { + sed -i -e 's: Boo.Microsoft.Build.Tasks, update-vs2005-env,::' default.build || die + sed -i -e 's@${libdir}/boo@${libdir}/mono/boo@g' \ + extras/boo.pc.in || die + epatch "${FILESDIR}/boo-0.9.1.3287-GACproblems.patch" +} + +src_compile() { + nant -t:mono-2.0 \ + -D:install.prefix=/usr \ + -D:install.libdir=/usr/$(get_libdir) \ + set-release-configuration all|| die "Compilation failed" +} + +src_install() { + nant install -D:install.buildroot="${D}" \ + -D:install.prefix="${D}"/usr \ + -D:install.share="${D}"/usr/share \ + -D:install.libdir="${D}"/usr/lib \ + -D:install.bindir="${D}/usr/bin" \ + -D:fakeroot.sharedmime="${D}"/usr \ + -D:fakeroot.gsv="${D}"/usr \ + || die "install failed" + rm -rf "${D}"/usr/share/gtksourceview-1.0 || die + mono_multilib_comply +} + +pkg_postinst() { + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_mime_database_update +} diff --git a/dev-lang/boo/boo-0.9.0.3203.ebuild b/dev-lang/boo/boo-0.9.0.3203.ebuild deleted file mode 100644 index ae50d2b7c283..000000000000 --- a/dev-lang/boo/boo-0.9.0.3203.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.9.0.3203.ebuild,v 1.2 2009/05/06 08:09:51 loki_val Exp $ - -EAPI=2 - -inherit multilib mono fdo-mime eutils - -DESCRIPTION="A wrist friendly language for the CLI" -HOMEPAGE="http://boo.codehaus.org/" -SRC_URI="http://dist.codehaus.org/boo/distributions/${P}-2-src.zip" -LICENSE="BSD" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/mono-2.0 - x11-libs/gtksourceview:1.0" -DEPEND="${RDEPEND} - x11-misc/shared-mime-info - app-arch/unzip - >=dev-dotnet/nant-0.86_beta1" - -MAKEOPTS="${MAKEOPTS} -j1" - -RESTRICT="test" - -# Irritating bug: Boo has to be uninstalled for boo to compile. -pkg_setup() { - if has_version ${CATEGORY}/${PN} - then - eerror "${CATEGORY}/${PN}'s install process is buggy. It requires that you remove any" - eerror "existing install before attempting to reinstall it." - eerror "Please emerge -C ${CATEGORY}/${PN} and try again." - eerror "See http://bugs.gentoo.org/268610 for details." - die "Please emerge -C ${CATEGORY}/${PN}" - fi -} - -src_prepare() { - sed -i -e 's: Boo.Microsoft.Build.Tasks, update-vs2005-env,::' default.build || die - sed -i -e 's@${libdir}/boo@${libdir}/mono/boo@g' \ - extras/boo.pc.in || die -} - -src_compile() { - nant -t:mono-2.0 \ - -D:install.prefix=/usr \ - -D:install.libdir=/usr/$(get_libdir) \ - set-release-configuration all|| die "Compilation failed" -} - -src_install() { - nant install -D:install.buildroot="${D}" \ - -D:install.prefix="${D}"/usr \ - -D:install.share="${D}"/usr/share \ - -D:install.libdir="${D}"/usr/lib \ - -D:install.bindir="${D}/usr/bin" \ - -D:fakeroot.sharedmime="${D}"/usr \ - -D:fakeroot.gsv="${D}"/usr \ - || die "install failed" - rm -rf "${D}"/usr/share/gtksourceview-1.0 || die - mono_multilib_comply -} - -pkg_postinst() { - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_mime_database_update -} diff --git a/dev-lang/boo/boo-0.9.1.3287-r1.ebuild b/dev-lang/boo/boo-0.9.1.3287-r1.ebuild new file mode 100644 index 000000000000..bc2ebc5d7ae1 --- /dev/null +++ b/dev-lang/boo/boo-0.9.1.3287-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.9.1.3287-r1.ebuild,v 1.1 2009/05/06 11:07:45 loki_val Exp $ + +EAPI=2 + +inherit multilib mono fdo-mime eutils + +DESCRIPTION="A wrist friendly language for the CLI" +HOMEPAGE="http://boo.codehaus.org/" +SRC_URI="http://dist.codehaus.org/boo/distributions/${P}-src.zip" +LICENSE="BSD" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-lang/mono-2.0 + x11-libs/gtksourceview:1.0" +DEPEND="${RDEPEND} + x11-misc/shared-mime-info + app-arch/unzip + >=dev-dotnet/nant-0.86_beta1" + +RESTRICT="test" + +pkg_setup() { + if /usr/bin/gacutil -l|grep Boo.Lang.Extensions &> /dev/null + then + eerror "$(best_version ${CATEGORY}/${PN}) has installed Boo.Lang.Extensions into the GAC." + eerror "This is a bug, that will cause compilation of ${CATEGORY}/${PF} to fail. It has" + eerror "been fixed in this version. For now, it requires that you uninstall" + eerror "${CATEGORY}/${PN} before updating." + eerror "Please run: emerge -C ${CATEGORY}/${PN} and try again." + die "Please run: emerge -C ${CATEGORY}/${PN} and try again." + fi +} + +src_prepare() { + sed -i -e 's: Boo.Microsoft.Build.Tasks, update-vs2005-env,::' default.build || die + sed -i -e 's@${libdir}/boo@${libdir}/mono/boo@g' \ + extras/boo.pc.in || die + epatch "${FILESDIR}/boo-0.9.1.3287-GACproblems.patch" +} + +src_compile() { + nant -t:mono-2.0 \ + -D:install.prefix=/usr \ + -D:install.libdir=/usr/$(get_libdir) \ + set-release-configuration all|| die "Compilation failed" +} + +src_install() { + nant install -D:install.buildroot="${D}" \ + -D:install.prefix="${D}"/usr \ + -D:install.share="${D}"/usr/share \ + -D:install.libdir="${D}"/usr/lib \ + -D:install.bindir="${D}/usr/bin" \ + -D:fakeroot.sharedmime="${D}"/usr \ + -D:fakeroot.gsv="${D}"/usr \ + || die "install failed" + rm -rf "${D}"/usr/share/gtksourceview-1.0 || die + mono_multilib_comply +} + +pkg_postinst() { + fdo-mime_mime_database_update +} + +pkg_postrm() { + fdo-mime_mime_database_update +} diff --git a/dev-lang/boo/boo-0.9.1.3287.ebuild b/dev-lang/boo/boo-0.9.1.3287.ebuild deleted file mode 100644 index a6953ede7fd9..000000000000 --- a/dev-lang/boo/boo-0.9.1.3287.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/boo/boo-0.9.1.3287.ebuild,v 1.2 2009/05/06 08:09:51 loki_val Exp $ - -EAPI=2 - -inherit multilib mono fdo-mime eutils - -DESCRIPTION="A wrist friendly language for the CLI" -HOMEPAGE="http://boo.codehaus.org/" -SRC_URI="http://dist.codehaus.org/boo/distributions/${P}-src.zip" -LICENSE="BSD" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/mono-2.0 - x11-libs/gtksourceview:1.0" -DEPEND="${RDEPEND} - x11-misc/shared-mime-info - app-arch/unzip - >=dev-dotnet/nant-0.86_beta1" - -MAKEOPTS="${MAKEOPTS} -j1" - -RESTRICT="test" - -# Irritating bug: Boo has to be uninstalled for boo to compile. -pkg_setup() { - if has_version ${CATEGORY}/${PN} - then - eerror "${CATEGORY}/${PN}'s install process is buggy. It requires that you remove any" - eerror "existing install before attempting to reinstall it." - eerror "Please emerge -C ${CATEGORY}/${PN} and try again." - eerror "See http://bugs.gentoo.org/268610 for details." - die "Please emerge -C ${CATEGORY}/${PN}" - fi -} - -src_prepare() { - sed -i -e 's: Boo.Microsoft.Build.Tasks, update-vs2005-env,::' default.build || die - sed -i -e 's@${libdir}/boo@${libdir}/mono/boo@g' \ - extras/boo.pc.in || die -} - -src_compile() { - nant -t:mono-2.0 \ - -D:install.prefix=/usr \ - -D:install.libdir=/usr/$(get_libdir) \ - set-release-configuration all|| die "Compilation failed" -} - -src_install() { - nant install -D:install.buildroot="${D}" \ - -D:install.prefix="${D}"/usr \ - -D:install.share="${D}"/usr/share \ - -D:install.libdir="${D}"/usr/lib \ - -D:install.bindir="${D}/usr/bin" \ - -D:fakeroot.sharedmime="${D}"/usr \ - -D:fakeroot.gsv="${D}"/usr \ - || die "install failed" - rm -rf "${D}"/usr/share/gtksourceview-1.0 || die - mono_multilib_comply -} - -pkg_postinst() { - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_mime_database_update -} diff --git a/dev-lang/boo/files/boo-0.9.1.3287-GACproblems.patch b/dev-lang/boo/files/boo-0.9.1.3287-GACproblems.patch new file mode 100644 index 000000000000..e563bcf8b905 --- /dev/null +++ b/dev-lang/boo/files/boo-0.9.1.3287-GACproblems.patch @@ -0,0 +1,29 @@ +diff -NrU5 boo-0.9.1.3287.orig/default.build boo-0.9.1.3287/default.build +--- boo-0.9.1.3287.orig/default.build 2009-05-06 12:07:51.000000000 +0200 ++++ boo-0.9.1.3287/default.build 2009-05-06 12:25:31.000000000 +0200 +@@ -561,17 +561,24 @@ + + + + + ++ + + + + + + +- ++ ++ ++ ++ ++ ++ ++ + + + + + -- cgit v1.2.3-65-gdbad