commit: 12272bc5a86369f1b7d7b89e84f3db2a359d28ef Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Mar 28 21:43:07 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Mar 28 21:45:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12272bc5
app-text/searchmonkey: Remove last-rited package Closes: https://bugs.gentoo.org/644534 app-text/searchmonkey/Manifest | 2 - .../files/searchmonkey-2.0.0-gcc4.7.patch | 40 -------------------- .../files/searchmonkey-2.0.0-gcc6.patch | 14 ------- .../searchmonkey/files/searchmonkey-2.0.0.desktop | 8 ---- app-text/searchmonkey/metadata.xml | 8 ---- app-text/searchmonkey/searchmonkey-0.8.1.ebuild | 25 ------------ app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild | 44 ---------------------- app-text/searchmonkey/searchmonkey-2.0.0.ebuild | 40 -------------------- profiles/package.mask | 5 --- 9 files changed, 186 deletions(-) diff --git a/app-text/searchmonkey/Manifest b/app-text/searchmonkey/Manifest deleted file mode 100644 index 6761a40605e..00000000000 --- a/app-text/searchmonkey/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST searchmonkey-0.8.1.tar.gz 364824 BLAKE2B ed107203ee0e9cba1ebe25e84a3dd8ec4db15ba88cf3c9a46354f47c31e2f0b69fe63f171090ad33b440014d815e3ef51ac3f3a77f7bef5f5bf83f42d6b7772e SHA512 9a07031fe629ef3b910c252b179f0ba33e83750b25a632631bbd50531632f8d77b0943cef87ba0f854afb590274e45c9eaf45d3cb51dc55b2faffe1a45fe0d87 -DIST searchmonkey_v2.0.0.zip 491726 BLAKE2B 92f7995ebd4eb99411732c19954844a19541defe8e4fc1f03d88a70c702b22fe47953c23065184d93d9c433ae0f1fb62bb80a7e415f6bc9b2e598ec0798b486f SHA512 bde6560c58ed2b0295fdbdf778e947926c08ab9e70ab4fde4e4fc170353a7301d5c598669975654dede88faeb367627f05ee144a7ab18443db43b2f4f7396ba3 diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch deleted file mode 100644 index f9d1718dd7b..00000000000 --- a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch +++ /dev/null @@ -1,40 +0,0 @@ - Utility.h | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Utility.h b/Utility.h -index 890eada..99f9a4e 100644 ---- a/Utility.h -+++ b/Utility.h -@@ -92,16 +92,6 @@ QRegExp::PatternSyntax uint2syntax(uint _index); - CallEach(observers, searchable, &Subject::Register); - here the Subject is the type of Caller - */ --template <typename CalleeContainer, typename Caller, typename Op> --void CallEach(const CalleeContainer& container, Caller& caller, Op op) --{ -- for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller)); --} --template <typename T> --bool IsValueInRange(T value, T lowerBound, T upperBound) --{ -- return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound); --} - template <typename T> - bool BoundSpecified(T boundValue) - { -@@ -129,5 +119,15 @@ bool UpperBoundFit(T value, T upperBound) - - return false; - } -+template <typename CalleeContainer, typename Caller, typename Op> -+void CallEach(const CalleeContainer& container, Caller& caller, Op op) -+{ -+ for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller)); -+} -+template <typename T> -+bool IsValueInRange(T value, T lowerBound, T upperBound) -+{ -+ return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound); -+} - - #endif diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch deleted file mode 100644 index ede01afa39e..00000000000 --- a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch +++ /dev/null @@ -1,14 +0,0 @@ -Bug: https://bugs.gentoo.org/602166 - -diff -Naur a/mainwindow.cpp b/mainwindow.cpp ---- a/mainwindow.cpp 2017-07-31 18:06:33.206668001 -0400 -+++ b/mainwindow.cpp 2017-07-31 18:07:09.685940997 -0400 -@@ -781,7 +781,7 @@ - ******************************************************************************/ - void MainWindow::find () throw() { - -- auto autoSettingsReset asr(sui); // dtor calls sui->reset() -+ autoSettingsReset asr(sui); // dtor calls sui->reset() - - bool modeAdvanced = ui->actionAdvanced->isChecked(); - qDebug() << "modeAdvanced-" << modeAdvanced; diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0.desktop b/app-text/searchmonkey/files/searchmonkey-2.0.0.desktop deleted file mode 100644 index cdd082e7514..00000000000 --- a/app-text/searchmonkey/files/searchmonkey-2.0.0.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Searchmonkey 2 -Exec=searchmonkey2 -Icon=/usr/share/pixmaps/searchmonkey-300x300.png -Terminal=false -Categories=FileTools;Utility;Qt; diff --git a/app-text/searchmonkey/metadata.xml b/app-text/searchmonkey/metadata.xml deleted file mode 100644 index 811e07d2e1d..00000000000 --- a/app-text/searchmonkey/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-needed --> - <upstream> - <remote-id type="sourceforge">searchmonkey</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-text/searchmonkey/searchmonkey-0.8.1.ebuild b/app-text/searchmonkey/searchmonkey-0.8.1.ebuild deleted file mode 100644 index e418a50adba..00000000000 --- a/app-text/searchmonkey/searchmonkey-0.8.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils - -DESCRIPTION="Powerful text searches using regular expressions" -HOMEPAGE="http://searchmonkey.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2.6:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog INSTALL NEWS README - make_desktop_entry ${PN} ${PN} ${PN} "Utility;GTK" -} diff --git a/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild deleted file mode 100644 index 917331f46e3..00000000000 --- a/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop qmake-utils - -MY_PN=${PN}2 -MY_P=${PN}_v${PV} - -DESCRIPTION="Powerful text searches using regular expressions" -HOMEPAGE="http://searchmonkey.sourceforge.net/"; -# Switch to ^s when we switch to EAPI=6. -SRC_URI="mirror://sourceforge/project/${PN}/S${MY_PN:1}/${PV}%20%5Bstable%5D/${MY_P}.zip" - -LICENSE="GPL-3" -SLOT="2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4" -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-gcc4.7.patch - "${FILESDIR}"/${P}-gcc6.patch -) - -src_configure() { - eqmake4 searchmonkey_2_0.pro -} - -src_install() { - newbin ${PN} ${MY_PN} - - # Hand-made desktop icon - doicon pixmaps/searchmonkey-300x300.png - domenu "${FILESDIR}"/${P}.desktop -} diff --git a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild deleted file mode 100644 index c69ce672912..00000000000 --- a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit qt4-r2 - -MY_PN=${PN}2 -MY_P=${PN}_v${PV} - -DESCRIPTION="Powerful text searches using regular expressions" -HOMEPAGE="http://searchmonkey.sourceforge.net/"; -# Switch to ^s when we switch to EAPI=6. -SRC_URI="mirror://sourceforge/project/${PN}/S${MY_PN:1}/${PV}%20%5Bstable%5D/${MY_P}.zip" - -LICENSE="GPL-3" -SLOT="2" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4" -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${P}-gcc4.7.patch - "${FILESDIR}"/${P}-gcc6.patch -) - -src_install() { - newbin ${PN} ${MY_PN} - - # Hand-made desktop icon - doicon pixmaps/searchmonkey-300x300.png - domenu "${FILESDIR}"/${P}.desktop -} diff --git a/profiles/package.mask b/profiles/package.mask index 3d036f0d175..afe7ca8ef0e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -612,11 +612,6 @@ x11-libs/motif:2.2 # Masked for removal in 30 days. dev-tex/qtexengine -# Andreas Sturmlechner <[email protected]> (27 Feb 2018) -# Depends on deprecated Qt4, no Qt5 work found. No maintainer. -# Masked for removal in 30 days. Bug #644534 -app-text/searchmonkey - # Anthony G. Basile <[email protected]> (25 Feb 2018) # Upstream has been dead since 2012. Migrate to uclibc-ng. # See https://wiki.gentoo.org/wiki/Project:Hardened_uClibc
