[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-util/valkyrie/, dev-util/valkyrie/files/

[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-util/valkyrie/, dev-util/valkyrie/files/

[Andreas Sturmlechner]

commit:     bb18cb8cc3b74d2916d5bf5aaaf7d76916e64e2f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 11:30:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 20:55:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb18cb8c

dev-util/valkyrie: Remove last-rited package

Closes: https://bugs.gentoo.org/640258

 dev-util/valkyrie/Manifest                         |  1 -
 dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch | 37 ----------------------
 .../valkyrie/files/valkyrie-2.0.0-prefix.patch     | 11 -------
 dev-util/valkyrie/metadata.xml                     |  8 -----
 dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild         | 26 ---------------
 profiles/package.mask                              |  5 ---
 6 files changed, 88 deletions(-)

diff --git a/dev-util/valkyrie/Manifest b/dev-util/valkyrie/Manifest
deleted file mode 100644
index d1825a0611e..00000000000
--- a/dev-util/valkyrie/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST valkyrie-2.0.0.tar.bz2 260690 BLAKE2B 842761f7ad2dfd135e1407d3d13bf3ae81db7f9d2fd6c362c378a65d9476fc2d955be8be56e0701e4b8ccbcd7234236b0752799d8afc46e9c46536ffef925d46 SHA512 435abb17ecad114c3e492fa193e508bad7ca61884bd09bf1bf0b8398c63151d33e571fea927b84f05bc2b647183af441da1550161a6f766db9e9a15d00cfc888

diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch
deleted file mode 100644
index d2d33166a85..00000000000
--- a/dev-util/valkyrie/files/valkyrie-2.0.0-gcc47.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Fix building with gcc-4.7
-
-https://bugs.gentoo.org/show_bug.cgi?id=421867
-
-Patch written by LE GARREC Vincent <legarrec.vincent@gmail.com>
---- a/src/objects/tool_object.cpp
-+++ b/src/objects/tool_object.cpp
-@@ -50,6 +50,7 @@ stopProcess()
- #include <QKeySequence>
- #include <QString>
- #include <QStringList>
-+#include <unistd.h>              // usleep
- 
- 
- #if 1
---- a/src/utils/vk_config.cpp
-+++ b/src/utils/vk_config.cpp
-@@ -25,6 +25,8 @@
- #include "utils/vk_utils.h"
- 
- #include <pwd.h>     // getpwuid
-+#include <sys/types.h>         // getuid
-+#include <unistd.h>            // getuid
- 
- #include <QColor>
- #include <QDir>
---- a/src/utils/vk_utils.cpp
-+++ b/src/utils/vk_utils.cpp
-@@ -22,6 +22,8 @@
- #include "utils/vk_config.h"        // vkname()
- 
- #include <cstdlib>                  // exit, mkstemp, free/malloc, etc
-+#include <sys/types.h>              // getpid
-+#include <unistd.h>                 // getpid
- 
- #include <QDateTime>
- #include <QFile>

diff --git a/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch b/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch
deleted file mode 100644
index 2f18491e8f8..00000000000
--- a/dev-util/valkyrie/files/valkyrie-2.0.0-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- valkyrie-2.0.0/vk_config.pri
-+++ valkyrie-2.0.0/vk_config.pri
-@@ -14,7 +14,7 @@
- # Set a default value for PREFIX (etc) in the generated makefiles
- # Note: ignore INSTALL_ROOT: it's a qt special, can't be set from here
- isEmpty(PREFIX) {
--  PREFIX = /usr/local
-+  PREFIX = /usr
- }
- isEmpty(BINDIR) {
-   BINDIR = $$PREFIX/bin

diff --git a/dev-util/valkyrie/metadata.xml b/dev-util/valkyrie/metadata.xml
deleted file mode 100644
index a535b885282..00000000000
--- a/dev-util/valkyrie/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>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-</pkgmetadata>

diff --git a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild b/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
deleted file mode 100644
index 76a94a36b00..00000000000
--- a/dev-util/valkyrie/valkyrie-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="Graphical front-end to the Valgrind suite of tools"
-HOMEPAGE="http://www.valgrind.org/"
-SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-util/valgrind-3.6.0
-	dev-qt/qtgui:4
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-PATCHES=(
-	"${FILESDIR}"/${P}-prefix.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 088487a6c13..2bbb5cdb28d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -237,11 +237,6 @@ dev-libs/sni-qt
 # Masked for removal in 30 days. Bugs #408651, #642950, #651622
 media-gfx/structure-synth
 
-# Andreas Sturmlechner <asturm@gentoo.org> (10 May 2018)
-# Depends on dead Qt4, dead upstream.
-# Masked for removal in 30 days. Bug #640258
-dev-util/valkyrie
-
 # Hans de Graaff <graaff@gentoo.org> (7 May 2018)
 # Old slots that are ruby23-only and no longer maintained
 # upstream, and that do not have packages depend on them.