commit: d3f06d1312feae858ad63293e326ab3de74f14a3
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 18:31:22 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 18:31:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f06d13
media-video/kaffeine: Remove slot 4
Package-Manager: portage-2.3.0
media-video/kaffeine/Manifest | 2 --
.../kaffeine/files/kaffeine-1.2.2-gcc4.7.patch | 32 -----------------
.../kaffeine/files/kaffeine-1.3.1-cmake34.patch | 26 --------------
media-video/kaffeine/kaffeine-1.2.2-r1.ebuild | 42 ----------------------
media-video/kaffeine/kaffeine-1.3.1.ebuild | 40 ---------------------
5 files changed, 142 deletions(-)
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 4331821..90fd699 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,4 +1,2 @@
-DIST kaffeine-1.2.2.tar.gz 489727 SHA256
b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb SHA512
31db518943c223e635822369548949a0c2162cdbbe59edbadb77f4820acf697293d67681553d5552b9435471240fee551786c8c652f1ae5ab9cfe9b8a9cf4459
WHIRLPOOL
232f4875398c4ce889cbf1f3d0aeadefce09d5c6ed64aaf82df9fb57472b7fc814f20fb0fec54db715b45965ff79ae2ae064bb008c4c5fcf96d5b4dd3c860157
-DIST kaffeine-1.3.1.tar.gz 1011607 SHA256
af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6 SHA512
c0674153147dea231f8b1cd1d6de245d4af13893904937856371d9e1f2bd1b8df4d4389b324a02b34630cebb134ae47e9c405bcfa909b7fa680e2ff034db4471
WHIRLPOOL
49e5f528223b651e9f46fc44f0a94f69d15e743af31e53192473b95bb338b03bfcc93861343496ca29a55d8356ddf58789c75ed493beee42b22b47a69c083fea
DIST kaffeine-2.0.3.tar.xz 1770836 SHA256
dd993e14a109676e56ad30bd7254e0b59cb39db3a75189e4169bc9bde0ac278f SHA512
dc0b4538e672afbc82ad8aa67561a909d7c88d5049e1c9ab7796a5c1365275010c3b7a24929021c9fd959bc3c1d2a4dfa86082afcd506626e841e28d574ff21c
WHIRLPOOL
c509cca114e3afcbc45964e11020882fad19642fbe3635d3c507dab5308d94e5ae138586d44bece7e086be17929564ff686e159f1a8461bf85378cbb32a47bf1
DIST kaffeine-2.0.4.tar.xz 1993776 SHA256
b9b22a1e8503a49bcf70feaa5443a30c3c99a9da6e3d5b7fe82c1d98602c0166 SHA512
bb27f967d8106425d8b9f60f157a6bc8372b1fb0d0b28319d447f4ff8b81ed821569f9554940aaf2d35457ae195a7b783b25012ac5839b4213209dcc82ff93e0
WHIRLPOOL
5f7f4e52254054674269a71205153a66faefaae6e8bebce17c12d357d79c7731d7a271827f3fb608134f11b0d0f2695d0d13b999c7d2c086b1f9a386c67d6647
diff --git a/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch
b/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch
deleted file mode 100644
index e74563e..0000000
--- a/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 2da9df1e67004c3cfa879578c351300a99f23da1
-Author: Christoph Pfister <christophpfis...@gmail.com>
-Date: Wed Apr 4 21:22:09 2012 +0200
-
- fix build for gcc 4.7
-
-diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
-index 7fc8f68..e70d8b8 100644
---- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data,
int size)
- // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
- QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59,
45), Qt::UTC);
-
-- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0)
&& entry.isValid();
-- --entryCount, entry.advance()) {
-+ for (AtscEitSectionEntry eitEntry = eitSection.entries();
-+ (entryCount > 0) && eitEntry.isValid(); --entryCount,
eitEntry.advance()) {
- DvbEpgEntry epgEntry;
- epgEntry.channel = channel;
-- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
-- epgEntry.duration = QTime().addSecs(entry.duration());
-- epgEntry.title = entry.title();
-+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
-+ epgEntry.duration = QTime().addSecs(eitEntry.duration());
-+ epgEntry.title = eitEntry.title();
-
-- quint32 id = ((quint32(fakeChannel.networkId) << 16) |
quint32(entry.eventId()));
-+ quint32 id = ((quint32(fakeChannel.networkId) << 16) |
quint32(eitEntry.eventId()));
- DvbSharedEpgEntry entry = epgEntries.value(id);
-
- if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
b/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
deleted file mode 100644
index a8c31f1..0000000
--- a/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rak...@freebsd.org>
-Date: Thu, 26 Nov 2015 15:36:26 +0100
-Subject: [PATCH] Explicitly include CheckIncludeFiles.
-
-This fixes the build with CMake 3.4.0. We were calling check_include_files()
-and implicitly relying on CheckIncludeFiles being included.
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9be8db..b74b44d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,7 @@ if(STRICT_BUILD)
- -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS)
- endif(STRICT_BUILD)
-
-+include(CheckIncludeFiles)
- check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
-
- if(NOT HAVE_DVB)
---
-2.4.10
-
diff --git a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
b/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
deleted file mode 100644
index 6037545..0000000
--- a/media-video/kaffeine/kaffeine-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl
-hr hu it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk
-sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
- x11-libs/libXScrnSaver
- dev-qt/qtsql:4[sqlite]
- >=media-libs/xine-lib-1.1.18.1
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changelog NOTES )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.2.2-gcc4.7.patch"
- "${FILESDIR}/${PN}-1.3.1-cmake34.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build debug DEBUG_MODULE)
- )
-
- kde4-base_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-1.3.1.ebuild
b/media-video/kaffeine/kaffeine-1.3.1.ebuild
deleted file mode 100644
index 969e9ab..0000000
--- a/media-video/kaffeine/kaffeine-1.3.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_LINGUAS="ar ast be bg ca ca@valencia cs da de el en_GB eo es et fi fr ga gl
-hr hu it ja km ko ku lt mai nb nds nl nn pa pl pt pt_BR ro ru se sk
-sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
-KDE_SCM="git"
-inherit kde4-base
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
- x11-libs/libXScrnSaver
- dev-qt/qtsql:4[sqlite]
- >=media-video/vlc-1.2[X]
- x11-libs/libXScrnSaver
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changelog NOTES )
-
-PATCHES=( "${FILESDIR}/${P}-cmake34.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DEBUG_MODULE=$(usex debug)
- )
-
- kde4-base_src_configure
-}
