Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, media-video/bdsup2sub++/files/, media-video/bdsup2sub++/
Date: Sun, 06 May 2018 00:40:17
Message-Id: 1525567171.8f19382a728548ae90c07a3ad7ab6b885ffdda7f.asturm@gentoo
1 commit: 8f19382a728548ae90c07a3ad7ab6b885ffdda7f
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 4 21:17:58 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun May 6 00:39:31 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f19382a
7
8 media-video/bdsup2sub++: Remove last-rited
9
10 Closes: https://bugs.gentoo.org/636472
11 Closes: https://bugs.gentoo.org/642448
12
13 media-video/bdsup2sub++/Manifest | 1 -
14 media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild | 34 --------------
15 .../files/bdsup2sub++-1.0.2-hidden-config.patch | 53 ----------------------
16 media-video/bdsup2sub++/metadata.xml | 19 --------
17 profiles/package.mask | 5 --
18 5 files changed, 112 deletions(-)
19
20 diff --git a/media-video/bdsup2sub++/Manifest b/media-video/bdsup2sub++/Manifest
21 deleted file mode 100644
22 index 8e43a094a86..00000000000
23 --- a/media-video/bdsup2sub++/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST bdsup2sub++-1.0.2.tar.gz 301413 BLAKE2B b5651623f4a49378e4069a868410cd0a5ca7acc772cc1b30f788cc8ee355b570e7b2aea131867974530b4a0986f7cb9faffdd2fd86581cf5f730d6f7016b916e SHA512 181cd241588d0fe9217b4534c377af745ff04bcf1af5fbff44c821ec8e45063bb5df0bef0b5d8ba6a9f24740387959487c6e2d3964bfefd935a098ad525b8102
27
28 diff --git a/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild b/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild
29 deleted file mode 100644
30 index aa0b4c64034..00000000000
31 --- a/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild
32 +++ /dev/null
33 @@ -1,34 +0,0 @@
34 -# Copyright 1999-2016 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit qmake-utils
40 -
41 -MY_PN="BDSup2SubPlusPlus"
42 -DESCRIPTION="C++ port of BDSup2Sub"
43 -HOMEPAGE="https://github.com/amichaelt/BDSup2SubPlusPlus"
44 -SRC_URI="https://github.com/amichaelt/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
45 -
46 -LICENSE="Apache-2.0"
47 -SLOT="0"
48 -KEYWORDS="~amd64 ~x86"
49 -
50 -RDEPEND="
51 - x11-libs/libqxt
52 - dev-qt/qtcore:4
53 - dev-qt/qtgui:4
54 -"
55 -DEPEND="${RDEPEND}"
56 -
57 -S="${WORKDIR}/${MY_PN}-${PV}/src"
58 -
59 -PATCHES=( "${FILESDIR}/${P}-hidden-config.patch" )
60 -
61 -src_configure() {
62 - eqmake4 ${PN}.pro
63 -}
64 -
65 -src_install() {
66 - dobin ${PN}
67 -}
68
69 diff --git a/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch b/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch
70 deleted file mode 100644
71 index cf75cc35ca4..00000000000
72 --- a/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch
73 +++ /dev/null
74 @@ -1,53 +0,0 @@
75 -From 2e27e6a49cc0be24b9a8efbf6a2ab2ec84fd1f92 Mon Sep 17 00:00:00 2001
76 -From: darealshinji <djcj@×××.de>
77 -Date: Thu, 23 Oct 2014 18:20:38 +0200
78 -Subject: [PATCH] save ini file in hidden directory on Unix systems
79 -
80 ----
81 - src/bdsup2sub.cpp | 6 ++++--
82 - src/types.h | 8 ++++++--
83 - 2 files changed, 10 insertions(+), 4 deletions(-)
84 -
85 -diff --git a/bdsup2sub.cpp b/bdsup2sub.cpp
86 -index 823e365..a9ccc15 100644
87 ---- a/bdsup2sub.cpp
88 -+++ b/bdsup2sub.cpp
89 -@@ -386,15 +386,17 @@ void BDSup2Sub::init()
90 -
91 - void BDSup2Sub::loadSettings()
92 - {
93 -- QString iniPath;
94 -+ QString iniPath, configPath;
95 - #ifdef Q_OS_WIN
96 - iniPath = QString(getenv("APPDATA"));
97 -+ configPath = QString("bdsup2sub++");
98 - #endif
99 - #ifndef Q_OS_WIN
100 - iniPath = QString(getenv("HOME"));
101 -+ configPath = QString(".config/bdsup2sub++");
102 - #endif
103 - QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, iniPath);
104 -- settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "bdsup2sub++", "bdsup2sub++");
105 -+ settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, configPath, iniName);
106 -
107 - if (!fromCLI)
108 - {
109 -diff --git a/types.h b/types.h
110 -index d760eca..784a81b 100644
111 ---- a/types.h
112 -+++ b/types.h
113 -@@ -28,8 +28,12 @@
114 - const QString progName = "BDSup2Sub++";
115 - const QString progNameVer = progName + " 1.0.2";
116 - const QString authorDate = "0xdeadbeef, mjuhasz, Adam T.";
117 --const QString oldIniName = "bdsup2sub.ini";
118 --const QString iniName = "bdsup2sub++.ini";
119 -+#ifdef Q_OS_WIN
120 -+ const QString iniName = "bdsup2sub++";
121 -+#endif
122 -+#ifndef Q_OS_WIN
123 -+ const QString iniName = "config";
124 -+#endif
125 -
126 - const QStringList scalingFilters = {
127 - "Bilinear", "Triangle", "Bicubic", "Bell", "B-Spline", "Hermite", "Lanczos3", "Mitchell"
128
129 diff --git a/media-video/bdsup2sub++/metadata.xml b/media-video/bdsup2sub++/metadata.xml
130 deleted file mode 100644
131 index 83f720c7ec2..00000000000
132 --- a/media-video/bdsup2sub++/metadata.xml
133 +++ /dev/null
134 @@ -1,19 +0,0 @@
135 -<?xml version="1.0" encoding="UTF-8"?>
136 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
137 -<pkgmetadata>
138 - <maintainer type="person">
139 - <email>sautier.louis@×××××.com</email>
140 - <name>Louis Sautier</name>
141 - </maintainer>
142 - <maintainer type="project">
143 - <email>proxy-maint@g.o</email>
144 - <name>Proxy Maintainers</name>
145 - </maintainer>
146 - <upstream>
147 - <remote-id type="github">amichaelt/BDSup2SubPlusPlus</remote-id>
148 - <bugs-to>https://github.com/amichaelt/BDSup2SubPlusPlus/issues</bugs-to>
149 - </upstream>
150 - <longdescription lang="en">
151 - BDSup2Sub++ (c) 2012 is a port of the original BDSup2Sub (c) 2009 by 0xdeadbeef and incorporating enhancements from Miklos Juhasz. It is a subtitle conversion tool for image based stream formats with scaling capabilities and some other nice features.
152 - </longdescription>
153 -</pkgmetadata>
154
155 diff --git a/profiles/package.mask b/profiles/package.mask
156 index 8bb42114382..b966c677709 100644
157 --- a/profiles/package.mask
158 +++ b/profiles/package.mask
159 @@ -200,11 +200,6 @@ xfce-extra/xfce-theme-manager
160 # Masked for removal in 30 days. Bugs #644478
161 x11-libs/libqxt
162
163 -# Andreas Sturmlechner <asturm@g.o> (06 Apr 2018)
164 -# Dead upstream, dead homepage, depends on dead Qt4.
165 -# Masked for removal in 30 days. Bugs #642448, #636472
166 -media-video/bdsup2sub++
167 -
168 # Rick Farina <zerochaos@g.o> (04 Apr 2018)
169 # Violates PMS and does not work with stable portage.
170 # Masked for removal in 60 days, lift mask if bug #650126 is fixed