* [gentoo-commits] repo/gentoo:master commit in: dev-util/bless/files/, dev-util/bless/, profiles/
@ 2021-05-23 12:36 David Seifert
0 siblings, 0 replies; only message in thread
From: David Seifert @ 2021-05-23 12:36 UTC (permalink / raw
To: gentoo-commits
commit: dd2bcacd10903f2c0efac7e6a4b2381e94a157a8
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun May 23 12:35:37 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May 23 12:35:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd2bcacd
dev-util/bless: Remove last-rited pkg
Closes: https://bugs.gentoo.org/769083
Closes: https://bugs.gentoo.org/772371
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-util/bless/Manifest | 2 -
dev-util/bless/bless-0.6.2-r1.ebuild | 54 ------
dev-util/bless/bless-0.6.3.ebuild | 47 -----
.../files/bless-0.6.2-range-disambiguation.patch | 202 ---------------------
dev-util/bless/metadata.xml | 8 -
profiles/package.mask | 7 -
6 files changed, 320 deletions(-)
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
deleted file mode 100644
index 86019b44a9d..00000000000
--- a/dev-util/bless/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
-DIST bless-0.6.3.tar.gz 532687 BLAKE2B ce710ba1883fff9f0f77ca08c02573a3de756e9a2b6cdfad9dffd8d00c1d89648fc68218dd322f9e1ab6e0b42d205148c4a1d99546ba42b58689fe58511b7ed8 SHA512 22841b6f1b923ebfc7952ad9233cffb30df4ecb22a655f6461ff3cc97066a8c68ffc6bbd88e4fd83c345226928ed08c557f2f322942766da61bcd2b2c7f7d3cb
diff --git a/dev-util/bless/bless-0.6.2-r1.ebuild b/dev-util/bless/bless-0.6.2-r1.ebuild
deleted file mode 100644
index 92feecfe962..00000000000
--- a/dev-util/bless/bless-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2020 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/afrantzis/Bless/"
-SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# EGIT_REPO_URI="https://github.com/afrantzis/bless/"
-# EGIT_COMMIT="v${PV}"
-
-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"
-PATCHES=("${FILESDIR}/bless-0.6.2-range-disambiguation.patch")
-
-pkg_setup() {
- mono-env_pkg_setup
-}
-
-src_prepare() {
- eautoreconf
- # The autoreconf expects INSTALL to have been copied over by autoconf
- touch "${S}/INSTALL"
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-unix-specific \
- $(use_enable debug)
-}
-
-src_install() {
- default
-
- mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${P}" || die "Unable to make documentation version-specific."
-}
diff --git a/dev-util/bless/bless-0.6.3.ebuild b/dev-util/bless/bless-0.6.3.ebuild
deleted file mode 100644
index 1d4264121f8..00000000000
--- a/dev-util/bless/bless-0.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson gnome2
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/afrantzis/Bless/"
-SRC_URI="https://github.com/afrantzis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-# EGIT_REPO_URI="https://github.com/afrantzis/bless/"
-# EGIT_COMMIT="v${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RDEPEND="
- >=dev-util/meson-0.46
- >=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"
-
-src_configure() {
- local emesonargs=(
- $(meson_use test tests)
- )
-
- meson_src_configure
-}
-
-src_compile() {
- meson_src_compile
-}
-
-src_install() {
- meson_src_install
-}
diff --git a/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch b/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch
deleted file mode 100644
index 788a57866cb..00000000000
--- a/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 84801988f908e51d9843c3e0ee8f2cd05c0a2d97 Mon Sep 17 00:00:00 2001
-From: davidcim <david@cimaware.com>
-Date: Thu, 3 Oct 2019 12:38:25 +0200
-Subject: [PATCH] Fix building error CS0104: 'Range' is an ambiguous reference
-
----
- src/buffers/ByteBuffer.cs | 2 +-
- src/gui/DataBookFinder.cs | 4 ++--
- src/gui/areas/AreaGroup.cs | 20 ++++++++++----------
- src/tools/find/FindOperations.cs | 6 +++---
- src/tools/find/IFindStrategy.cs | 10 +++++-----
- src/tools/find/IFinder.cs | 4 ++--
- 6 files changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/src/buffers/ByteBuffer.cs b/src/buffers/ByteBuffer.cs
-index b9d9a24..72c1b42 100644
---- a/src/buffers/ByteBuffer.cs
-+++ b/src/buffers/ByteBuffer.cs
-@@ -671,7 +671,7 @@ public byte[] RangeToByteArray(IRange range)
- /// Returns as a SegmentCollection the data contained in
- /// the specified range in the buffer.
- ///</summary>
-- public SegmentCollection RangeToSegmentCollection(Range range)
-+ public SegmentCollection RangeToSegmentCollection(Util.Range range)
- {
- if (range.Size == 0)
- return null;
-diff --git a/src/gui/DataBookFinder.cs b/src/gui/DataBookFinder.cs
-index 50b5034..3248d3a 100644
---- a/src/gui/DataBookFinder.cs
-+++ b/src/gui/DataBookFinder.cs
-@@ -234,7 +234,7 @@ void FindAsyncCallback(IAsyncResult ar)
- {
- GenericFindOperation state = (GenericFindOperation)ar.AsyncState;
- ThreadedAsyncOperation.OperationResult result = state.Result;
-- Range match = state.Match;
-+ Util.Range match = state.Match;
-
- DataView dv = null;
-
-@@ -381,7 +381,7 @@ void ReplaceAllAsyncCallback(IAsyncResult ar)
- {
- ReplaceAllOperation state = (ReplaceAllOperation)ar.AsyncState;
- ThreadedAsyncOperation.OperationResult result = state.Result;
-- Range firstMatch = state.FirstMatch;
-+ Util.Range firstMatch = state.FirstMatch;
-
- DataView dv = null;
-
-diff --git a/src/gui/areas/AreaGroup.cs b/src/gui/areas/AreaGroup.cs
-index 58ee147..4a27190 100644
---- a/src/gui/areas/AreaGroup.cs
-+++ b/src/gui/areas/AreaGroup.cs
-@@ -198,7 +198,7 @@ enum Changes { Offset = 1, Cursor = 2, Highlights = 4}
- set { drawingArea = value; }
- }
-
-- public Range Selection {
-+ public Util.Range Selection {
- get { return selection; }
- set {
- if (selection == value)
-@@ -251,7 +251,7 @@ public AreaGroup()
- /// Get the range of bytes and the number of rows that
- /// are displayed in the current view.
- /// </summary>
-- public Range GetViewRange(out int nrows)
-+ public Util.Range GetViewRange(out int nrows)
- {
- // find out number of rows, bytes in current view
-
-@@ -271,9 +271,9 @@ public Range GetViewRange(out int nrows)
-
- // make sure we get an empty clipping Range when bleft==0
- if (bleft > 0)
-- return new Range(offset, offset + bleft - 1);
-+ return new Util.Range(offset, offset + bleft - 1);
- else
-- return new Range();
-+ return new Util.Range();
- }
-
- /// <summary>
-@@ -381,7 +381,7 @@ private void ClearHighlights()
- private void SetupBufferCache()
- {
- int nrows;
-- Range view = GetViewRange(out nrows);
-+ Util.Range view = GetViewRange(out nrows);
- if (view.Size != bufferCache.Length)
- bufferCache = new byte[view.Size];
-
-@@ -444,7 +444,7 @@ private void RenderExtra()
- }
- }
- /// <summary>
-- /// Renders a <see cref="Range"/> of data using a specified <see cref="Drawer.HighlightType"/>
-+ /// Renders a <see cref="Util.Range"/> of data using a specified <see cref="Drawer.HighlightType"/>
- /// </summary>
- private void RenderHighlight(AtomicHighlight h)
- {
-@@ -474,12 +474,12 @@ private AtomicHighlight[] SplitAtomicPrioritized(AtomicHighlight q, Highlight r)
-
- if (q.Type > r.Type) {
- ha = new AtomicHighlight[3]{new AtomicHighlight(r), new AtomicHighlight(q), new AtomicHighlight(r)};
-- Range.SplitAtomic(ha, r, q);
-+ Util.Range.SplitAtomic(ha, r, q);
- ha[1].AddContainer(r);
- }
- else {
- ha = new AtomicHighlight[3]{new AtomicHighlight(q), new AtomicHighlight(r), new AtomicHighlight(q)};
-- Range.SplitAtomic(ha, q, r);
-+ Util.Range.SplitAtomic(ha, q, r);
- foreach (Highlight h in q.Containers)
- ha[1].AddContainer(h);
- }
-@@ -533,7 +533,7 @@ private IntervalTree<AtomicHighlight> BreakDownHighlights(Highlight s, IList<Hig
- private IntervalTree<AtomicHighlight> GetAtomicHighlights()
- {
- int nrows;
-- Range clip = GetViewRange(out nrows);
-+ Util.Range clip = GetViewRange(out nrows);
- Highlight view = new Highlight(clip, Drawer.HighlightType.Normal);
-
- // get all highlights in current view
-@@ -618,7 +618,7 @@ private void RenderCursor(IntervalTree<AtomicHighlight> atomicHighlights)
- // if we don't find an overlap this means that either
- // 1. the prev cursor position is not visible on the screen
- // 2. the prev cursor position is at or beyond the end of the file
-- IList<AtomicHighlight> overlaps = atomicHighlights.SearchOverlap(new Range(prevCursorOffset, prevCursorOffset));
-+ IList<AtomicHighlight> overlaps = atomicHighlights.SearchOverlap(new Util.Range(prevCursorOffset, prevCursorOffset));
-
- AtomicHighlight h = null;
-
-diff --git a/src/tools/find/FindOperations.cs b/src/tools/find/FindOperations.cs
-index 0351efd..e5984f9 100644
---- a/src/tools/find/FindOperations.cs
-+++ b/src/tools/find/FindOperations.cs
-@@ -146,8 +146,8 @@ public class ReplaceAllOperation: GenericFindOperation
-
- protected override void DoOperation()
- {
-- Range m;
-- match = new Range();
-+ Util.Range m;
-+ match = new Util.Range();
- firstMatch = null;
-
- numReplaced = 0;
-@@ -159,7 +159,7 @@ protected override void DoOperation()
-
- while ((m = strategy.FindNext()) != null) {
- if (firstMatch == null) {
-- firstMatch = new Range(m);
-+ firstMatch = new Util.Range(m);
- }
-
- match.Start = m.Start;
-diff --git a/src/tools/find/IFindStrategy.cs b/src/tools/find/IFindStrategy.cs
-index bdf7a87..bc2b21b 100644
---- a/src/tools/find/IFindStrategy.cs
-+++ b/src/tools/find/IFindStrategy.cs
-@@ -31,13 +31,13 @@ public interface IFindStrategy
- ByteBuffer Buffer { get; set; }
- long Position { get; set; }
-
-- Range FindNext();
-- Range FindPrevious();
-+ Util.Range FindNext();
-+ Util.Range FindPrevious();
-
-- Range FindNext(long limit);
-- Range FindPrevious(long limit);
-+ Util.Range FindNext(long limit);
-+ Util.Range FindPrevious(long limit);
-
- bool Cancelled { get; set; }
- }
-
--} // end namespace
-\ No newline at end of file
-+} // end namespace
-diff --git a/src/tools/find/IFinder.cs b/src/tools/find/IFinder.cs
-index 594de22..a29a8fd 100644
---- a/src/tools/find/IFinder.cs
-+++ b/src/tools/find/IFinder.cs
-@@ -30,7 +30,7 @@ namespace Bless.Tools.Find {
- public interface IFinder
- {
- IFindStrategy Strategy { get; set; }
-- Range LastFound { get; set; }
-+ Util.Range LastFound { get; set; }
-
-
- event FirstFindHandler FirstFind;
-@@ -41,4 +41,4 @@ public interface IFinder
- IAsyncResult ReplaceAll(byte[] ba, AsyncCallback ac);
- }
-
--} // end namespace
-\ No newline at end of file
-+} // end namespace
diff --git a/dev-util/bless/metadata.xml b/dev-util/bless/metadata.xml
deleted file mode 100644
index fb8810c0659..00000000000
--- a/dev-util/bless/metadata.xml
+++ /dev/null
@@ -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>ikelos@gentoo.org</email>
- <name>Mike Auty</name>
- </maintainer>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index 25882301452..12377d20f11 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -616,13 +616,6 @@ dev-dotnet/gtk-sharp
# Removal on 2021-05-24
app-misc/gnutu
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-04-24)
-# Depends on deprecated dev-dotnet/gtk-sharp, bug #769083
-# Alternatives (all in app-editors category): curses-hexedit, dhex, ghex,
-# hexcurse, okteta, qhexedit2, shed, wxhexeditor
-# Removal on 2021-05-24
-dev-util/bless
-
# Stephan Hartmann <sultan@gentoo.org> (2021-04-24)
# Dev channel releases are only for people who
# are developers or want more experimental features
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-23 12:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-23 12:36 [gentoo-commits] repo/gentoo:master commit in: dev-util/bless/files/, dev-util/bless/, profiles/ David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox