commit: 8f19382a728548ae90c07a3ad7ab6b885ffdda7f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri May 4 21:17:58 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun May 6 00:39:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f19382a
media-video/bdsup2sub++: Remove last-rited Closes: https://bugs.gentoo.org/636472 Closes: https://bugs.gentoo.org/642448 media-video/bdsup2sub++/Manifest | 1 - media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild | 34 -------------- .../files/bdsup2sub++-1.0.2-hidden-config.patch | 53 ---------------------- media-video/bdsup2sub++/metadata.xml | 19 -------- profiles/package.mask | 5 -- 5 files changed, 112 deletions(-) diff --git a/media-video/bdsup2sub++/Manifest b/media-video/bdsup2sub++/Manifest deleted file mode 100644 index 8e43a094a86..00000000000 --- a/media-video/bdsup2sub++/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST bdsup2sub++-1.0.2.tar.gz 301413 BLAKE2B b5651623f4a49378e4069a868410cd0a5ca7acc772cc1b30f788cc8ee355b570e7b2aea131867974530b4a0986f7cb9faffdd2fd86581cf5f730d6f7016b916e SHA512 181cd241588d0fe9217b4534c377af745ff04bcf1af5fbff44c821ec8e45063bb5df0bef0b5d8ba6a9f24740387959487c6e2d3964bfefd935a098ad525b8102 diff --git a/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild b/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild deleted file mode 100644 index aa0b4c64034..00000000000 --- a/media-video/bdsup2sub++/bdsup2sub++-1.0.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit qmake-utils - -MY_PN="BDSup2SubPlusPlus" -DESCRIPTION="C++ port of BDSup2Sub" -HOMEPAGE="https://github.com/amichaelt/BDSup2SubPlusPlus"; -SRC_URI="https://github.com/amichaelt/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - x11-libs/libqxt - dev-qt/qtcore:4 - dev-qt/qtgui:4 -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}/src" - -PATCHES=( "${FILESDIR}/${P}-hidden-config.patch" ) - -src_configure() { - eqmake4 ${PN}.pro -} - -src_install() { - dobin ${PN} -} 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 deleted file mode 100644 index cf75cc35ca4..00000000000 --- a/media-video/bdsup2sub++/files/bdsup2sub++-1.0.2-hidden-config.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2e27e6a49cc0be24b9a8efbf6a2ab2ec84fd1f92 Mon Sep 17 00:00:00 2001 -From: darealshinji <d...@gmx.de> -Date: Thu, 23 Oct 2014 18:20:38 +0200 -Subject: [PATCH] save ini file in hidden directory on Unix systems - ---- - src/bdsup2sub.cpp | 6 ++++-- - src/types.h | 8 ++++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/bdsup2sub.cpp b/bdsup2sub.cpp -index 823e365..a9ccc15 100644 ---- a/bdsup2sub.cpp -+++ b/bdsup2sub.cpp -@@ -386,15 +386,17 @@ void BDSup2Sub::init() - - void BDSup2Sub::loadSettings() - { -- QString iniPath; -+ QString iniPath, configPath; - #ifdef Q_OS_WIN - iniPath = QString(getenv("APPDATA")); -+ configPath = QString("bdsup2sub++"); - #endif - #ifndef Q_OS_WIN - iniPath = QString(getenv("HOME")); -+ configPath = QString(".config/bdsup2sub++"); - #endif - QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, iniPath); -- settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "bdsup2sub++", "bdsup2sub++"); -+ settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, configPath, iniName); - - if (!fromCLI) - { -diff --git a/types.h b/types.h -index d760eca..784a81b 100644 ---- a/types.h -+++ b/types.h -@@ -28,8 +28,12 @@ - const QString progName = "BDSup2Sub++"; - const QString progNameVer = progName + " 1.0.2"; - const QString authorDate = "0xdeadbeef, mjuhasz, Adam T."; --const QString oldIniName = "bdsup2sub.ini"; --const QString iniName = "bdsup2sub++.ini"; -+#ifdef Q_OS_WIN -+ const QString iniName = "bdsup2sub++"; -+#endif -+#ifndef Q_OS_WIN -+ const QString iniName = "config"; -+#endif - - const QStringList scalingFilters = { - "Bilinear", "Triangle", "Bicubic", "Bell", "B-Spline", "Hermite", "Lanczos3", "Mitchell" diff --git a/media-video/bdsup2sub++/metadata.xml b/media-video/bdsup2sub++/metadata.xml deleted file mode 100644 index 83f720c7ec2..00000000000 --- a/media-video/bdsup2sub++/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>sautier.lo...@gmail.com</email> - <name>Louis Sautier</name> - </maintainer> - <maintainer type="project"> - <email>proxy-ma...@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="github">amichaelt/BDSup2SubPlusPlus</remote-id> - <bugs-to>https://github.com/amichaelt/BDSup2SubPlusPlus/issues</bugs-to> - </upstream> - <longdescription lang="en"> - 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. - </longdescription> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 8bb42114382..b966c677709 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -200,11 +200,6 @@ xfce-extra/xfce-theme-manager # Masked for removal in 30 days. Bugs #644478 x11-libs/libqxt -# Andreas Sturmlechner <ast...@gentoo.org> (06 Apr 2018) -# Dead upstream, dead homepage, depends on dead Qt4. -# Masked for removal in 30 days. Bugs #642448, #636472 -media-video/bdsup2sub++ - # Rick Farina <zeroch...@gentoo.org> (04 Apr 2018) # Violates PMS and does not work with stable portage. # Masked for removal in 60 days, lift mask if bug #650126 is fixed
