[gentoo-commits] repo/gentoo:master commit in: dev-util/bless/, dev-util/bless/files/
commit: 35e74a126cee1741c98a8324ea272ee53395e20f Author: Mike Auty gentoo org> AuthorDate: Tue Aug 4 14:11:09 2020 + Commit: Mike Auty gentoo org> CommitDate: Tue Aug 4 14:13:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e74a12 dev-util/bless: Disambiguate Range Also removes very old versions of bless Closes: https://bugs.gentoo.org/733166 Signed-off-by: Mike Auty gentoo.org> dev-util/bless/Manifest| 1 - dev-util/bless/bless-0.6.0-r3.ebuild | 52 -- dev-util/bless/bless-0.6.0-r4.ebuild | 52 -- dev-util/bless/bless-0.6.2-r1.ebuild | 3 +- dev-util/bless/files/bless-0.6.0-docpath.patch | 71 dev-util/bless/files/bless-0.6.0-mono-4.patch | 36 dev-util/bless/files/bless-0.6.0-pixmap.patch | 20 -- .../files/bless-0.6.2-range-disambiguation.patch | 202 + 8 files changed, 204 insertions(+), 233 deletions(-) diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest index befbc79aed6..06151ce3678 100644 --- a/dev-util/bless/Manifest +++ b/dev-util/bless/Manifest @@ -1,2 +1 @@ -DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c2226bbbaf63d69ee45754d085eb105c4951c0d57fce7b284c6b0a8fb9b7e061219a55d109c9ef844b61c35 SHA512 69d2279b64503b97c8a67991c2a7a527d872835e3acfad7eafa8d87e376d2cecf3fa27de9e12726680a8f3c8ac92b888a4895a1f342c4beeaceef9e1f3ededdb DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5 diff --git a/dev-util/bless/bless-0.6.0-r3.ebuild b/dev-util/bless/bless-0.6.0-r3.ebuild deleted file mode 100644 index d4c3ef7205f..000 --- a/dev-util/bless/bless-0.6.0-r3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2 mono-env - -DESCRIPTION="GTK# Hex Editor" -HOMEPAGE="https://github.com/bwrsandman/Bless/"; -SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=" - >=dev-lang/mono-1.1.14 - >=dev-dotnet/gtk-sharp-2.12.21 -" -DEPEND="${RDEPEND} - app-text/rarian - >=sys-devel/gettext-0.15 - virtual/pkgconfig -" - -# See bug 278162 -# Waiting on nunit ebuild entering the tree -RESTRICT="test" - -pkg_setup() { - # Stolen from enlightenment.eclass - cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize" - sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" - - mono-env_pkg_setup -} - -src_prepare() { - einfo "Running gettextize -f --no-changelog..." - ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" - eapply "${FILESDIR}/${P}-pixmap.patch" - eapply "${FILESDIR}/${P}-docpath.patch" - eapply "${FILESDIR}/${P}-mono-4.patch" - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --enable-unix-specific \ - $(use_enable debug) -} diff --git a/dev-util/bless/bless-0.6.0-r4.ebuild b/dev-util/bless/bless-0.6.0-r4.ebuild deleted file mode 100644 index e7ae88c0e92..000 --- a/dev-util/bless/bless-0.6.0-r4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools gnome2 mono-env - -DESCRIPTION="GTK# Hex Editor" -HOMEPAGE="https://github.com/bwrsandman/Bless/"; -SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=" - >=dev-lang/mono-1.1.14 - >=dev-dotnet/gtk-sharp-2.12.21:2 -" -DEPEND="${RDEPEND} - app-text/rarian - >=sys-devel/gettext-0.15 - virtual/pkgconfig -" - -# See bug 278162 -# Waiting on nunit ebuild entering the tree -RESTRICT="test" - -pkg_setup() { - # Stolen from enlightenment.eclass - cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize" - sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" - - mono-env_pkg_setup -} - -src_prepare() { - einfo "Running gettextize -f --no-changelog..." - ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" - eapply "${FILESDIR}/${P}-pixmap.patch" - eapply "${FILESDIR}/${P}-docpath.patch" - eapply "${FILESDIR}/${P}-mono-4.patch" - eautoreconf - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --enable-unix-specific \ - $(use_enable debug) -} diff
[gentoo-commits] repo/gentoo:master commit in: dev-util/bless/, dev-util/bless/files/
commit: 115983161833d8f8b3531b90da89b376481854f7 Author: Pacho Ramos gentoo org> AuthorDate: Fri Nov 4 09:01:42 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Fri Nov 4 09:15:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11598316 dev-util/bless: Fix rarian dep, bump eapi. Package-Manager: portage-2.3.2 dev-util/bless/bless-0.6.0-r2.ebuild | 16 +++- dev-util/bless/files/bless-0.6.0-pixmap.patch | 4 ++-- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dev-util/bless/bless-0.6.0-r2.ebuild b/dev-util/bless/bless-0.6.0-r2.ebuild index 3f0a087..c65b564 100644 --- a/dev-util/bless/bless-0.6.0-r2.ebuild +++ b/dev-util/bless/bless-0.6.0-r2.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 mono-env +EAPI=6 +inherit autotools gnome2 mono-env DESCRIPTION="GTK# Hex Editor" HOMEPAGE="http://home.gna.org/bless/"; @@ -23,7 +21,7 @@ RDEPEND=" >=dev-dotnet/glade-sharp-2.12 ) " DEPEND="${RDEPEND} - app-text/scrollkeeper + app-text/rarian >=sys-devel/gettext-0.15 virtual/pkgconfig " @@ -41,9 +39,9 @@ pkg_setup() { src_prepare() { einfo "Running gettextize -f --no-changelog..." ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" - epatch "${FILESDIR}/${P}-pixmap.patch" - epatch "${FILESDIR}/${P}-docpath.patch" - epatch "${FILESDIR}/${P}-mono-4.patch" + eapply "${FILESDIR}/${P}-pixmap.patch" + eapply "${FILESDIR}/${P}-docpath.patch" + eapply "${FILESDIR}/${P}-mono-4.patch" eautoreconf gnome2_src_prepare } diff --git a/dev-util/bless/files/bless-0.6.0-pixmap.patch b/dev-util/bless/files/bless-0.6.0-pixmap.patch index 441a9e2..de77cb8 100644 --- a/dev-util/bless/files/bless-0.6.0-pixmap.patch +++ b/dev-util/bless/files/bless-0.6.0-pixmap.patch @@ -1,6 +1,6 @@ === modified file 'src/gui/drawers/HexDrawer.cs' src/gui/drawers/HexDrawer.cs 2007-06-13 12:20:53 + -+++ src/gui/drawers/HexDrawer.cs 2009-04-10 23:21:41 + +--- a/src/gui/drawers/HexDrawer.cs 2007-06-13 12:20:53 + b/src/gui/drawers/HexDrawer.cs 2009-04-10 23:21:41 + @@ -57,11 +57,14 @@ //System.Console.WriteLine(s);
[gentoo-commits] repo/gentoo:master commit in: dev-util/bless/, dev-util/bless/files/
commit: 4ef6927a0a6964ff3ea3fb3df864bb9b356687fb Author: Mike Auty gentoo org> AuthorDate: Sun Aug 23 00:44:11 2015 + Commit: Mike Auty gentoo org> CommitDate: Sun Aug 23 00:59:38 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef6927a dev-util/bless: Update for monolithic gtk-sharp & mono-4 Changed the dependencies to cope with the unannounced monolithic gtk-sharp ebuild which blocks on packages such as bless that need glade-sharp. Also introduced a patch to use mcs rather than the depreacted gmcs. Package-Manager: portage-2.2.20.1 Signed-off-by: Mike Auty gentoo.org> dev-util/bless/bless-0.6.0-r2.ebuild | 6 +++-- dev-util/bless/files/bless-0.6.0-mono-4.patch | 36 +++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dev-util/bless/bless-0.6.0-r2.ebuild b/dev-util/bless/bless-0.6.0-r2.ebuild index 47e9220..3f0a087 100644 --- a/dev-util/bless/bless-0.6.0-r2.ebuild +++ b/dev-util/bless/bless-0.6.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,7 +19,8 @@ IUSE="debug" RDEPEND=" >=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12 - >=dev-dotnet/glade-sharp-2.12 + || ( >=dev-dotnet/gtk-sharp-2.12.21 +>=dev-dotnet/glade-sharp-2.12 ) " DEPEND="${RDEPEND} app-text/scrollkeeper @@ -42,6 +43,7 @@ src_prepare() { ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed" epatch "${FILESDIR}/${P}-pixmap.patch" epatch "${FILESDIR}/${P}-docpath.patch" + epatch "${FILESDIR}/${P}-mono-4.patch" eautoreconf gnome2_src_prepare } diff --git a/dev-util/bless/files/bless-0.6.0-mono-4.patch b/dev-util/bless/files/bless-0.6.0-mono-4.patch new file mode 100644 index 000..92b1100 --- /dev/null +++ b/dev-util/bless/files/bless-0.6.0-mono-4.patch @@ -0,0 +1,36 @@ +diff --git a/builder/ModuleBuilder.cs b/builder/ModuleBuilder.cs +index 0f62e92..7edb1ab 100644 +--- a/builder/ModuleBuilder.cs b/builder/ModuleBuilder.cs +@@ -119,7 +119,7 @@ public class ModuleBuilder + //System.Console.WriteLine("gmcs {0}", sb.ToString()); + System.Console.WriteLine(">> Building module {0}...", module.Name); + +- Process buildProcess = Process.Start("gmcs", sb.ToString()); ++ Process buildProcess = Process.Start("mcs", sb.ToString()); + buildProcess.WaitForExit(); + + if (buildProcess.ExitCode == 0) { +@@ -137,4 +137,4 @@ public class ModuleBuilder + } + + +-} +\ No newline at end of file ++} +diff --git a/configure.ac b/configure.ac +index 415cc64..a8e527c 100644 +--- a/configure.ac b/configure.ac +@@ -24,9 +24,9 @@ if test "x$PKG_CONFIG" = "xno"; then + fi + + # C# compiler +-AC_PATH_PROG(MCS, gmcs, no) ++AC_PATH_PROG(MCS, mcs, no) + +-CS="gmcs C#" ++CS="mcs C#" + if test "x$MCS" = "xno" ; then + AC_MSG_ERROR([No $CS compiler found]) + fi