[gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/, profiles/, media-sound/karlyriceditor/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/, profiles/, media-sound/karlyriceditor/files/

[Michał Górny]

commit:     ea35d574fd21f9f8d1cfa681e6dc6a298bd7ffab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  9 14:08:33 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr  9 14:10:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea35d574

media-sound/karlyriceditor: Remove last-rited pkg

Closes: https://bugs.gentoo.org/673352
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-sound/karlyriceditor/Manifest                |  1 -
 .../files/karlyriceditor-2.2-ffmpeg-4.patch        | 34 ------------------
 .../karlyriceditor/karlyriceditor-2.2-r1.ebuild    | 41 ----------------------
 media-sound/karlyriceditor/metadata.xml            | 15 --------
 profiles/package.mask                              |  5 ---
 5 files changed, 96 deletions(-)

diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
deleted file mode 100644
index f8ffc53a170..00000000000
--- a/media-sound/karlyriceditor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST karlyriceditor-2.2.tar.gz 280119 BLAKE2B 1cfd3c681e7f8c52b0e67fdff96bf929ef86aa607615be832907b3d933628b8cfe2d94066acfe1739aa83c0dfc4884de7063180dc3e4acb54fb73eadfbbd2a66 SHA512 bce3aed1402c8fff3e04940527773d2855d3d67e47b159478c53e63eaadfbb70df3f4fbefb75490cc17b750455e1359963468ce14dd504f37219e1268a213103

diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch
deleted file mode 100644
index b7ae9d6e90b..00000000000
--- a/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Fix FTBFS with FFmpeg 4.0
-Author: James Cowgill <jcowgill@debian.org>
-Bug-Debian: https://bugs.debian.org/888377
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/ffmpegvideoencoder.cpp
-+++ b/src/ffmpegvideoencoder.cpp
-@@ -345,7 +345,7 @@ av_log_set_level(AV_LOG_VERBOSE);
- 
- 	// Enable interlacing if needed
- 	if ( m_videoformat->flags & VIFO_INTERLACED )
--		videoCodecCtx->flags |= CODEC_FLAG_INTERLACED_DCT;
-+		videoCodecCtx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
- 
- 	// Enable multithreaded encoding: breaks FLV!
- 	//videoCodecCtx->thread_count = 4;
-@@ -373,7 +373,7 @@ av_log_set_level(AV_LOG_VERBOSE);
- 
- 	// If we have a global header for the format, no need to duplicate the codec info in each keyframe
- 	if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER )
--		videoCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+		videoCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
- 	// Open the codec
- 	if ( ( err = avcodec_open2( videoCodecCtx, videoCodec, 0 )) < 0 )
-@@ -463,7 +463,7 @@ av_log_set_level(AV_LOG_VERBOSE);
- 			audioCodecCtx->time_base.den = m_profile->sampleRate;
- 
- 			if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER )
--				audioCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+				audioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
- 			// Since different audio codecs support different sample formats, look up which one is supported by this specific codec
- 			if ( isAudioSampleFormatSupported( audioCodec->sample_fmts, AV_SAMPLE_FMT_FLTP ) )

diff --git a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
deleted file mode 100644
index a0b4b5ff69a..00000000000
--- a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
-HOMEPAGE="https://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtwidgets:5
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-ffmpeg-4.patch" )
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_install() {
-	dodoc Changelog
-	dobin bin/${PN}
-	doicon packages/${PN}.png
-	make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
-}

diff --git a/media-sound/karlyriceditor/metadata.xml b/media-sound/karlyriceditor/metadata.xml
deleted file mode 100644
index 12706d20e54..00000000000
--- a/media-sound/karlyriceditor/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">karlyriceditor</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 274ce3c1b7c..e38fc24709f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -674,11 +674,6 @@ dev-python/pytest-capturelog
 # Removal in 30 days.  Bug #679030.
 app-arch/star
 
-# Michael Palimaka <kensington@gentoo.org> (07 Mar 2019)
-# Fails to build with ffmpeg-4 (bug #673352). Dead upstream.
-# Masked for removal in 30 days.
-media-sound/karlyriceditor
-
 # Eray Aslan <eras@gentoo.org> (01 Mar 2019)
 # Mask experimental software
 =mail-mta/postfix-3.5*