commit: 1626c7afe7f4cd7e46bbc9b87f31d3962a134620
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 19:51:26 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 19:51:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1626c7af
media-video/kmplayer: Remove slot 4
Package-Manager: portage-2.3.2
media-video/kmplayer/Manifest | 2 -
.../kmplayer/files/kmplayer-0.11.3d-cmake34.patch | 14 -----
.../files/kmplayer-0.11.3d-kdelibs-4.14.11.patch | 66 --------------------
media-video/kmplayer/files/kmplayer-flash.patch | 12 ----
media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild | 70 ----------------------
media-video/kmplayer/kmplayer-0.11.5.ebuild | 67 ---------------------
6 files changed, 231 deletions(-)
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 5d6e7b3..972dd98 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,3 +1 @@
-DIST kmplayer-0.11.3d.tar.bz2 573173 SHA256
7ebecbc906edcc13e1ae94f4791da80ed4ef73164ef6b81d76c71708c39a6bfb SHA512
c2f0fa1864eecd9a0bf3039639aad41bc36bc6ff8742a8e9714c6df72dd4ee63f80c36036a0582ee8464b48ce22eb96814600ddb199c61fda0b87cfd4c457797
WHIRLPOOL
1a651d1dee10b0ee3609055d645835b4b19e5acf47df39a7773d297749407ea49c893e154f77013469ee4c23724c55ae8c2032b5ca00ddf8f560eb5feb8d1f12
-DIST kmplayer-0.11.5.tar.bz2 684467 SHA256
074afea4187b1e5d2899940da558f584e0145fa6a3e9a5eca5c028d4ba516c09 SHA512
15b53eb3c9d1ac867bf762c8f7aa02bc3ecc813116db7b2aa87b2f9f3f0fc50c3fae5514dd92b18baf6fe16fe2f79ca7e9b64ea4fae13e341e5817be6e0ea729
WHIRLPOOL
6efc74f908c93d784c6e29c4052065c2f0bfb3be9353e8887a3f3008298ad10aa3f92751ed024be9e44161023ccbadbc69579c8d0bd50139c733b8fea7ec67db
DIST kmplayer-0.12.0a.tar.bz2 596374 SHA256
b1cc05f1942882e34d013ab363e553e4ec87af6c9c7ef9755db2b8fa4b8930d8 SHA512
4ae24621ab54706ba323e9b345f4bc6876d3b7b84eef8edc9d07351e336dc940a3d314c394470ce3a85ebfcc77cb7fe6eedb96ca382b2a81f6d95ecff1f3f875
WHIRLPOOL
eb45b40177e82ec45234a11b62f1ae3c3dd8989ab6d7bf0b8968e601ed32b976a1061223aee37de0d4544f5431bd9614dac3e8fb2f4d19685b1050b7b768ca9d
diff --git a/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
b/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
deleted file mode 100644
index a22136c..00000000
--- a/media-video/kmplayer/files/kmplayer-0.11.3d-cmake34.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build with >=cmake-3.4
-
-Gentoo-bug: 568430
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,6 +59,7 @@
- endif(NOT WIN32)
-
-
-+include(CheckIncludeFiles)
- check_include_files(stdint.h HAVE_STDINT_H)
-
- configure_file (config-kmplayer.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-kmplayer.h )
diff --git a/media-video/kmplayer/files/kmplayer-0.11.3d-kdelibs-4.14.11.patch
b/media-video/kmplayer/files/kmplayer-0.11.3d-kdelibs-4.14.11.patch
deleted file mode 100644
index f6206c2..00000000
--- a/media-video/kmplayer/files/kmplayer-0.11.3d-kdelibs-4.14.11.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 4be412db53ce6342103836163c7b809f36d88a03 Mon Sep 17 00:00:00 2001
-From: David Faure <[email protected]>
-Date: Sun, 26 Jul 2015 17:29:49 +0200
-Subject: [PATCH] set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix
- build accordingly
-
-(working around the lack of ${KDE4_KMEDIAPLAYER_LIBS})
-
-CCMAIL: [email protected]
----
- CMakeLists.txt | 1 +
- src/CMakeLists.txt | 8 +++++---
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43d78ab..ff94308 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,4 @@
-+cmake_minimum_required(VERSION 2.8.9)
- project(kmplayer)
-
- cmake_policy(VERSION 2.6)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 01180df..ac230ef 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -13,7 +13,7 @@ IF (KMPLAYER_WITH_CAIRO)
- MESSAGE("have cairo cflags:${optionalCFlags}
ldflags:${optionalLinkFlags}")
- endif (KMPLAYER_WITH_CAIRO)
-
--add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT
-DKMPLAYER_VERSION_STRING=\\"${KMPLAYER_VERSION_STRING}\\")
-+add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT
-DKMPLAYER_VERSION_STRING="\\\"${KMPLAYER_VERSION_STRING}\\\"")
-
- ADD_DEFINITIONS(${CAIROCFlags})
-
-@@ -73,6 +73,7 @@ SET_TARGET_PROPERTIES(kmplayercommon PROPERTIES COMPILE_FLAGS
- "${CAIROCflags} ${GLibDBusCflags}")
-
- target_link_libraries(kmplayercommon
-+ LINK_PRIVATE
- ${CAIROLinkFlags}
- ${GLibDBusLinkFlags}
- ${KDE4_KPARTS_LIBS}
-@@ -81,7 +82,7 @@ target_link_libraries(kmplayercommon
- ${X11_X11_LIB}
- ${EXPAT_LIBRARIES}
- ${KDE4_SOLID_LIBS}
-- kmediaplayer
-+ ${KDE4_TARGET_PREFIX}kmediaplayer
- )
-
- install(TARGETS kmplayercommon ${INSTALL_TARGETS_DEFAULT_ARGS} )
-@@ -93,7 +94,8 @@ set(kmplayerpart_SRCS kmplayer_part.cpp)
- kde4_add_plugin(kmplayerpart WITH_PREFIX ${kmplayerpart_SRCS})
-
- target_link_libraries(kmplayerpart
-- kmplayercommon kmediaplayer
-+ kmplayercommon
-+ ${KDE4_TARGET_PREFIX}kmediaplayer
- ${KDE4_KPARTS_LIBS}
- ${KDE4_KDEUI_LIBS}
- ${QT_QT3SUPPORT_LIBRARY}
---
-2.4.6
-
diff --git a/media-video/kmplayer/files/kmplayer-flash.patch
b/media-video/kmplayer/files/kmplayer-flash.patch
deleted file mode 100644
index 0a6a72b..00000000
--- a/media-video/kmplayer/files/kmplayer-flash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN kmplayer-0.11.3d.old/src/kmplayer_part.desktop
kmplayer-0.11.3d/src/kmplayer_part.desktop
---- kmplayer-0.11.3d.old/src/kmplayer_part.desktop 2012-06-10
14:35:46.000000000 +0200
-+++ kmplayer-0.11.3d/src/kmplayer_part.desktop 2012-09-11 14:42:04.160426844
+0200
-@@ -93,7 +93,7 @@
- Comment[zh_TW]=影像播放器外掛程式（與 QuickTime，XMovie，Windows Media 與 RealPlayer 相容）
- X-KDE-Library=libkmplayerpart
- # Keep in sync with the audio types in kmplayer.desktop
--MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu;
-+MimeType=application/x-shockwave-flash;application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu;
- Type=Service
- Icon=kmplayer
- X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player
diff --git a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
b/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
deleted file mode 100644
index 77f7593..00000000
--- a/media-video/kmplayer/kmplayer-0.11.3d-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hr hu it
-ja km ku lt lv mai nb nds nl nn pl pt pt_BR ro ru sk sr sr@latin sv th tr ug uk
-zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org";
-SRC_URI="https://kmplayer.kde.org/pkgs/${P}.tar.bz2";
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="cairo debug expat npp"
-
-DEPEND="
- media-libs/phonon[qt4]
- x11-libs/libX11
- expat? ( >=dev-libs/expat-2.0.1 )
- cairo? (
- x11-libs/cairo
- x11-libs/pango
- )
- npp? (
- dev-libs/dbus-glib
- $(add_kdeapps_dep kreadconfig)
- >=x11-libs/gtk+-2.10.14:2
- www-plugins/adobe-flash
- )
-"
-RDEPEND="${DEPEND}
- media-video/mplayer
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake34.patch"
- "${FILESDIR}/${P}-kdelibs-4.14.11.patch"
-)
-
-src_prepare() {
- use npp && epatch "${FILESDIR}/${PN}-flash.patch"
- sed -e '/add_subdirectory(icons)/d' \
- -i CMakeLists.txt || die
-
- kde4-base_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use cairo KMPLAYER_BUILT_WITH_CAIRO)
- $(cmake-utils_use expat KMPLAYER_BUILT_WITH_EXPAT)
- $(cmake-utils_use npp KMPLAYER_BUILT_WITH_NPP)
- )
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- if use npp; then
- kwriteconfig --file "${ED}/usr/share/config/kmplayerrc" --group
"application/x-shockwave-flash" --key player npp
- kwriteconfig --file "${ED}/usr/share/config/kmplayerrc" --group
"application/x-shockwave-flash" --key plugin
/usr/lib/nsbrowser/plugins/libflashplayer.so
- fi
-}
diff --git a/media-video/kmplayer/kmplayer-0.11.5.ebuild
b/media-video/kmplayer/kmplayer-0.11.5.ebuild
deleted file mode 100644
index bd805c6..00000000
--- a/media-video/kmplayer/kmplayer-0.11.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde4-base
-
-DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org";
-COMMIT_ID="a28ff105e76a227b799c2bbf6e732791de5fb84e"
-SRC_URI="https://quickgit.kde.org/?p=kmplayer.git&a=snapshot&h=${COMMIT_ID}&fmt=tbz2
-> ${P}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo debug expat npp"
-
-DEPEND="
- media-libs/phonon[qt4]
- x11-libs/libX11
- cairo? (
- x11-libs/cairo
- x11-libs/pango
- )
- expat? ( >=dev-libs/expat-2.0.1 )
- npp? (
- $(add_kdeapps_dep kreadconfig)
- dev-libs/dbus-glib
- www-plugins/adobe-flash:*
- >=x11-libs/gtk+-2.10.14:2
- )
-"
-RDEPEND="${DEPEND}
- media-video/mplayer
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.11.3d-cmake34.patch" )
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- use npp && epatch "${FILESDIR}/${PN}-flash.patch"
- sed -e '/add_subdirectory(icons)/d' \
- -i CMakeLists.txt || die
-
- kde4-base_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
- -DKMPLAYER_BUILT_WITH_EXPAT=$(usex expat)
- -DKMPLAYER_BUILT_WITH_NPP=$(usex npp)
- )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- if use npp; then
- kwriteconfig --file "${ED}/usr/share/config/kmplayerrc" --group
"application/x-shockwave-flash" --key player npp
- kwriteconfig --file "${ED}/usr/share/config/kmplayerrc" --group
"application/x-shockwave-flash" --key plugin
/usr/lib/nsbrowser/plugins/libflashplayer.so
- fi
-}
