Clean up.

Package-Manager: portage-2.1.3

19 files changed, 12 insertions, 618 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 0c7fa769f8cb..0cbdb36c17e9 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.100 2007/06/01 14:32:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.101 2007/07/28 13:32:01 carlo Exp $
+
+  28 Jul 2007; Carsten Lohrke <carlo@gentoo.org>
+  -files/kmplayer-0.9.3-use32bitbin.diff, -kmplayer-0.9.3.ebuild,
+  -kmplayer-0.9.3a.ebuild, -kmplayer-0.9.4.ebuild,
+  -kmplayer-0.9.4-r1.ebuild, -kmplayer-0.9.4a.ebuild:
+  Clean up.
 
   01 Jun 2007; nixnut <nixnut@gentoo.org> kmplayer-0.9.4a-r1.ebuild:
   Stable on ppc wrt bug 176893
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.3 b/media-video/kmplayer/files/digest-kmplayer-0.9.3
deleted file mode 100644
index 835492e7da15..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b5866658c62995185f3fb63f3804cfa2 kmplayer-0.9.3.tar.bz2 943240
-RMD160 5dd48f2e1564df8576c92bff22f7f9cfaf969d7e kmplayer-0.9.3.tar.bz2 943240
-SHA256 1b10a7162f305da974dc30bf4ffdea2cfd7a03dc69e2749c8366e0ce78732247 kmplayer-0.9.3.tar.bz2 943240
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.3a b/media-video/kmplayer/files/digest-kmplayer-0.9.3a
deleted file mode 100644
index 3607cc537fbb..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.3a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d18749a254af3d54dd10ce651975527c kmplayer-0.9.3a.tar.bz2 950430
-RMD160 1e98a30a7a200e1235c86129df708c799cfaa595 kmplayer-0.9.3a.tar.bz2 950430
-SHA256 13fafbc1a149dad9354192072f202a70c98868d10cd44299bc7d22915fd1c202 kmplayer-0.9.3a.tar.bz2 950430
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.4 b/media-video/kmplayer/files/digest-kmplayer-0.9.4
deleted file mode 100644
index ef98eb8a76b8..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d2a199290f7d4c470ea89df42d527ec kmplayer-0.9.4.tar.bz2 965254
-RMD160 cf93e34f98eaedd161b552f9f323835679dbc36d kmplayer-0.9.4.tar.bz2 965254
-SHA256 63b604ab5d92261af202f078e8397b9c08aefe03ffde353071958b38e317d260 kmplayer-0.9.4.tar.bz2 965254
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.4-r1 b/media-video/kmplayer/files/digest-kmplayer-0.9.4-r1
deleted file mode 100644
index ef98eb8a76b8..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d2a199290f7d4c470ea89df42d527ec kmplayer-0.9.4.tar.bz2 965254
-RMD160 cf93e34f98eaedd161b552f9f323835679dbc36d kmplayer-0.9.4.tar.bz2 965254
-SHA256 63b604ab5d92261af202f078e8397b9c08aefe03ffde353071958b38e317d260 kmplayer-0.9.4.tar.bz2 965254
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.4a b/media-video/kmplayer/files/digest-kmplayer-0.9.4a
deleted file mode 100644
index 6b3c60cbf07e..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.4a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 10eeb318a4800e4cfa74957c7a6714da kmplayer-0.9.4a.tar.bz2 970527
-RMD160 74d8fe2b2fd2c9e18518ff73b66b254b974291be kmplayer-0.9.4a.tar.bz2 970527
-SHA256 1c5d705818bca7cb00384991498fe020b70bc0f55622185e63905551793aaa9c kmplayer-0.9.4a.tar.bz2 970527
diff --git a/media-video/kmplayer/files/kmplayer-0.9.3-use32bitbin.diff b/media-video/kmplayer/files/kmplayer-0.9.3-use32bitbin.diff
deleted file mode 100644
index f1bf145b41d3..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.9.3-use32bitbin.diff
+++ /dev/null
@@ -1,205 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayerapp.cpp kmplayer-0.9.3/src/kmplayerapp.cpp
---- kmplayer-0.9.3-orig/src/kmplayerapp.cpp	2006-09-20 21:51:19.000000000 +0200
-+++ kmplayer-0.9.3/src/kmplayerapp.cpp	2006-09-20 21:57:12.000000000 +0200
-@@ -425,9 +425,9 @@
-     connect (m_broadcastconfig, SIGNAL (broadcastStopped()), this, SLOT (broadcastStopped()));
-     initStatusBar();
-     m_player->init (actionCollection ());
-     m_player->players () ["xvideo"] = new XVideo(m_player,m_player->settings());
--    m_player->setProcess ("mplayer");
-+    m_player->setProcess (MPLAYER_BIN);
-     m_player->setRecorder ("mencoder");
-     ListsSource * lstsrc = new ListsSource (m_player);
-     m_player->sources () ["listssource"] = lstsrc;
-     m_player->sources () ["dvdsource"] = new ::KMPlayerDVDSource(this, m_dvdmenu);
-@@ -1688,9 +1688,9 @@
-         return true;
-     if (m_identified)
-         return false;
-     //kdDebug () << "scanning " << cstr << endl;
--    QRegExp * patterns = static_cast <KMPlayer::MPlayer *> (m_player->players () ["mplayer"])->configPage ()->m_patterns;
-+    QRegExp * patterns = static_cast <KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
-     QRegExp & langRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdlang];
-     QRegExp & subtitleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdsub];
-     QRegExp & titleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdtitle];
-     QRegExp & chapterRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdchapter];
-@@ -1991,9 +1991,9 @@
-         return true;
-     if (m_identified)
-         return false;
-     //kdDebug () << "scanning " << cstr << endl;
--    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () ["mplayer"])->configPage ()->m_patterns;
-+    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
-     QRegExp & trackRegExp = patterns [KMPlayer::MPlayerPreferencesPage::pat_vcdtrack];
-     if (trackRegExp.search (str) > -1) {
-         m_document->state = KMPlayer::Element::state_deferred;
-         m_document->appendChild (new KMPlayer::GenericMrl (m_document, QString ("vcd://") + trackRegExp.cap (1), i18n ("Track ") + trackRegExp.cap (1)));
-@@ -2089,9 +2089,9 @@
-         return true;
-     if (m_identified)
-         return false;
-     //kdDebug () << "scanning " << str << endl;
--    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () ["mplayer"])->configPage ()->m_patterns;
-+    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
-     QRegExp & trackRegExp = patterns [KMPlayer::MPlayerPreferencesPage::pat_cdromtracks];
-     if (trackRegExp.search (str) > -1) {
-         //if (m_document->state != KMPlayer::Element::state_deferred)
-         //    m_document->defer ();
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayerconfig.cpp kmplayer-0.9.3/src/kmplayerconfig.cpp
---- kmplayer-0.9.3-orig/src/kmplayerconfig.cpp	2006-09-20 21:51:19.000000000 +0200
-+++ kmplayer-0.9.3/src/kmplayerconfig.cpp	2006-09-20 21:57:54.000000000 +0200
-@@ -127,9 +127,9 @@
-     // configdialog should be destroyed when the view is destroyed
-     //delete configdialog;
- }
- 
--KDE_EXPORT const char * strMPlayerGroup = "MPlayer";
-+KDE_EXPORT const char * strMPlayerGroup = MPLAYER_BIN;
- const char * strGeneralGroup = "General Options";
- static const char * strKeepSizeRatio = "Keep Size Ratio";
- static const char * strRememberSize = "Remember Size";
- static const char * strAutoResize = "Auto Resize";
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayer_def.h kmplayer-0.9.3/src/kmplayer_def.h
---- kmplayer-0.9.3-orig/src/kmplayer_def.h	2006-09-20 21:51:19.000000000 +0200
-+++ kmplayer-0.9.3/src/kmplayer_def.h	2006-09-20 21:58:47.000000000 +0200
-@@ -55,6 +55,6 @@
-   #define KMPLAYER_EXPORT
-   #define KMPLAYER_NO_EXPORT
- #endif
- 
--
-+#define MPLAYER_BIN "mplayer-bin"
- #endif //_KMPLAYER_DEF_H_
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayerpartbase.cpp kmplayer-0.9.3/src/kmplayerpartbase.cpp
---- kmplayer-0.9.3-orig/src/kmplayerpartbase.cpp	2006-09-20 21:51:19.000000000 +0200
-+++ kmplayer-0.9.3/src/kmplayerpartbase.cpp	2006-09-20 21:59:49.000000000 +0200
-@@ -121,9 +121,9 @@
-    m_auto_controls (true),
-    m_bPosSliderPressed (false),
-    m_in_update_tree (false)
- {
--    m_players ["mplayer"] = new MPlayer (this, m_settings);
-+    m_players [MPLAYER_BIN] = new MPlayer (this, m_settings);
-     Xine * xine = new Xine (this, m_settings);
-     m_players ["xine"] = xine;
-     m_players ["gstreamer"] = new GStreamer (this, m_settings);
-     m_recorders ["mencoder"] = new MEncoder (this, m_settings);
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayer_part.cpp kmplayer-0.9.3/src/kmplayer_part.cpp
---- kmplayer-0.9.3-orig/src/kmplayer_part.cpp	2006-09-20 21:51:19.000000000 +0200
-+++ kmplayer-0.9.3/src/kmplayer_part.cpp	2006-09-20 22:00:13.000000000 +0200
-@@ -317,9 +317,9 @@
-     }
-     bool group_member = !m_group.isEmpty () && m_group != QString::fromLatin1("_unique") && m_features != Feat_Unknown;
-     if (!group_member || m_features & Feat_Viewer) {
-         // not part of a group or we're the viewer
--        setProcess ("mplayer");
-+        setProcess (MPLAYER_BIN);
-         setRecorder ("mencoder");
-         connectPanel (m_view->controlPanel ());
-         if (m_features & Feat_StatusBar) {
-             last_time_left = 0;
-@@ -337,9 +337,9 @@
-                 i = std::find_if (++i, e, pred)) {
-             // found viewer and control part, exchange players now
-             KMPlayerPart * vp = (m_features & Feat_Viewer) ? this : *i;
-             KMPlayerPart * cp = (m_features & Feat_Viewer) ? *i : this;
--            setProcess ("mplayer");
-+            setProcess (MPLAYER_BIN);
-             cp->connectToPart (vp);
-         }
-     } else
-         m_group.truncate (0);
-@@ -1074,9 +1074,9 @@
-         QTimer::singleShot (0, this, SLOT (finished ()));
-         return;
-     }
-     init ();
--    m_player->setProcess ("mplayer");
-+    m_player->setProcess (MPLAYER_BIN);
-     if (m_player->process ()->grabPicture (m_url, 0))
-         connect (m_player->process (), SIGNAL (grabReady (const QString &)),
-                  this, SLOT (grabReady (const QString &)));
-     else {
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayerprocess.cpp kmplayer-0.9.3/src/kmplayerprocess.cpp
---- kmplayer-0.9.3-orig/src/kmplayerprocess.cpp	2006-09-20 21:51:19.000000000 +0200
-+++ kmplayer-0.9.3/src/kmplayerprocess.cpp	2006-09-20 22:02:59.000000000 +0200
-@@ -349,9 +349,9 @@
-     "dvdsource", "exitsource", "hrefsource", "introsource", "pipesource", "tvscanner", "tvsource", "urlsource", "vcdsource", "audiocdsource", 0L
- };
- 
- KDE_NO_CDTOR_EXPORT MPlayer::MPlayer (QObject * parent, Settings * settings)
-- : MPlayerBase (parent, settings, "mplayer"),
-+ : MPlayerBase (parent, settings, MPLAYER_BIN),
-    m_widget (0L),
-    m_configpage (new MPlayerPreferencesPage (this)),
-    aid (-1), sid (-1),
-    m_needs_restarted (false) {
-@@ -520,9 +520,9 @@
-         *m_process << pipe << " | ";
-     }
-     QString exe = m_configpage->mplayer_path;
-     if (exe.isEmpty ())
--        exe = "mplayer";
-+        exe = MPLAYER_BIN;
-     fprintf (stderr, "%s -wid %lu ", exe.ascii(), (unsigned long) widget ());
-     *m_process << exe << " -wid " << QString::number (widget ());
- 
-     if (m_use_slave) {
-@@ -622,9 +622,9 @@
-     QString outdir = locateLocal ("data", "kmplayer/");
-     m_grabfile = outdir + QString ("00000001.jpg");
-     unlink (m_grabfile.ascii ());
-     QString myurl (url.isLocalFile () ? getPath (url) : url.url ());
--    QString args ("mplayer ");
-+    QString args ("mplayer-bin ");
-     if (m_settings->mplayerpost090)
-         args += "-vo jpeg:outdir=";
-     else
-         args += "-vo jpeg -jpeg outdir=";
-@@ -921,9 +921,9 @@
-     for (int i = 0; i < int (pat_last); i++)
-         m_patterns[i].setPattern (config->readEntry
-                 (_mplayer_patterns[i].name, _mplayer_patterns[i].pattern));
-     config->setGroup (strMPlayerGroup);
--    mplayer_path = config->readEntry (strMPlayerPath, "mplayer");
-+    mplayer_path = config->readEntry (strMPlayerPath, MPLAYER_BIN);
-     additionalarguments = config->readEntry (strAddArgs);
-     cachesize = config->readNumEntry (strCacheSize, 384);
-     alwaysbuildindex = config->readBoolEntry (strAlwaysBuildIndex, false);
- }
-@@ -952,9 +952,9 @@
- 
- KDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (QString & item, QString & icon, QString & tab) {
-     item = i18n ("General Options");
-     icon = QString ("kmplayer");
--    tab = i18n ("MPlayer");
-+    tab = i18n (MPLAYER_BIN);
- }
- 
- KDE_NO_EXPORT QFrame * MPlayerPreferencesPage::prefPage (QWidget * parent) {
-     m_configframe = new MPlayerPreferencesFrame (parent);
-@@ -1052,9 +1052,9 @@
-     QString args;
-     m_use_slave = m_source->pipeCmd ().isEmpty ();
-     if (!m_use_slave)
-         args = m_source->pipeCmd () + QString (" | ");
--    args += QString ("mplayer ") + m_source->recordCmd ();
-+    args += QString ("mplayer-bin ") + m_source->recordCmd ();
-     // FIXME if (m_player->source () == source) // ugly
-     //    m_player->stop ();
-     QString myurl = url.isLocalFile () ? getPath (url) : url.url ();
-     bool post090 = m_settings->mplayerpost090;
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayertvsource.cpp kmplayer-0.9.3/src/kmplayertvsource.cpp
---- kmplayer-0.9.3-orig/src/kmplayertvsource.cpp	2006-09-20 21:51:19.000000000 +0200
-+++ kmplayer-0.9.3/src/kmplayertvsource.cpp	2006-09-20 22:08:59.000000000 +0200
-@@ -697,9 +697,9 @@
-     QString args;
-     args.sprintf ("tv:// -tv driver=%s:device=%s -identify -frames 0", m_driver.ascii (), m_tvdevice->src.ascii ());
-     m_tvsource->player ()->stop ();
-     m_tvsource->player ()->process ()->initProcess (m_player->settings ()->defaultView ()->viewer ());
--    KMPlayer::Process *proc = m_tvsource->player ()->players () ["mplayer"];
-+    KMPlayer::Process *proc = m_tvsource->player ()->players () [MPLAYER_BIN];
-     proc->setSource (this);
-     if (!static_cast <KMPlayer::MPlayer *> (proc)->run (args.ascii()))
-         deactivate ();
- }
diff --git a/media-video/kmplayer/kmplayer-0.9.3.ebuild b/media-video/kmplayer/kmplayer-0.9.3.ebuild
deleted file mode 100644
index 52386824f750..000000000000
--- a/media-video/kmplayer/kmplayer-0.9.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.3.ebuild,v 1.11 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit kde eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE."
-HOMEPAGE="http://kmplayer.kde.org/"
-SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="gstreamer mplayer xine"
-
-DEPEND="xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
-	x11-libs/libXv"
-
-RDEPEND="mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )"
-
-need-kde 3.5.4
-
-pkg_setup() {
-	if ! use mplayer && ! use xine && ! use gstreamer; then
-		echo
-		ewarn "Neither the mplayer, xine or gstreamer use flags have been set."
-		ewarn "One is needed, you can install mplayer later, though.\n"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
-		#epatch "${FILESDIR}/${P}-use32bitbin.diff"
-		elog 'NOTICE: From this version the patch so that mplayer-bin is used'
-		elog 'NOTICE: instead of mplayer is applied no longer. Now you can'
-		elog 'NOTICE: configure kmplayer to use mplayer-bin from within the'
-		elog 'NOTICE: application.'
-	fi
-}
-
-src_compile(){
-	local myconf="$(use_with gstreamer) $(use_with xine)"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
-}
diff --git a/media-video/kmplayer/kmplayer-0.9.3a.ebuild b/media-video/kmplayer/kmplayer-0.9.3a.ebuild
deleted file mode 100644
index 37ce610ece9f..000000000000
--- a/media-video/kmplayer/kmplayer-0.9.3a.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.3a.ebuild,v 1.7 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit kde eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE."
-HOMEPAGE="http://kmplayer.kde.org/"
-SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="gstreamer mplayer xine"
-
-DEPEND="xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
-	x11-libs/libXv"
-
-RDEPEND="mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )"
-
-need-kde 3.5.4
-
-pkg_setup() {
-	if ! use mplayer && ! use xine && ! use gstreamer; then
-		echo
-		ewarn "Neither the mplayer, xine or gstreamer use flags have been set."
-		ewarn "One is needed, you can install mplayer later, though.\n"
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
-		elog 'NOTICE: You have mplayer-bin installed; you will need to configure'
-		elog 'NOTICE: kmplayer to use it from within the application.'
-	fi
-}
-
-src_compile(){
-	local myconf="$(use_with gstreamer) $(use_with xine)"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
-}
diff --git a/media-video/kmplayer/kmplayer-0.9.4-r1.ebuild b/media-video/kmplayer/kmplayer-0.9.4-r1.ebuild
deleted file mode 100644
index 0db21829121f..000000000000
--- a/media-video/kmplayer/kmplayer-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.4-r1.ebuild,v 1.2 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit kde eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE."
-HOMEPAGE="http://kmplayer.kde.org/"
-SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gstreamer mplayer xine cairo"
-
-RDEPEND="mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
-	cairo? ( x11-libs/cairo )"
-
-DEPEND="xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
-	cairo? ( x11-libs/cairo )"
-
-LANGS="ar br bs ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
-lt mt nb nl pa pl pt_BR pt ro ru rw sk sr@Latn sr sv ta tr uk zh_CN"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-need-kde 3.5
-
-pkg_setup() {
-	if ! use mplayer && ! use xine && ! use gstreamer && ! use cairo; then
-		echo
-		ewarn "Neither the mplayer, xine, gstreamer or cairo use flags have"
-		ewarn "been set. One of them is required. From them, mplayer can be"
-		ewarn "installed afterwards; however, xine and gstreamer will require"
-		ewarn "you to recompile kmplayer."
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
-		elog 'NOTICE: You have mplayer-bin installed; you will need to configure'
-		elog 'NOTICE: kmplayer to use it from within the application.'
-	fi
-
-	cd "${WORKDIR}/${MY_P}/po"
-	for X in ${LANGS} ; do
-		use linguas_${X} || rm -f "${X}."*
-	done
-	rm -f "${S}/configure"
-}
-
-src_compile(){
-	local myconf="$(use_with gstreamer) $(use_with xine) $(use_with cairo)"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
-}
diff --git a/media-video/kmplayer/kmplayer-0.9.4.ebuild b/media-video/kmplayer/kmplayer-0.9.4.ebuild
deleted file mode 100644
index d1a1f2eb7756..000000000000
--- a/media-video/kmplayer/kmplayer-0.9.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.4.ebuild,v 1.2 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit kde eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE."
-HOMEPAGE="http://kmplayer.kde.org/"
-SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gstreamer mplayer xine cairo"
-
-RDEPEND="mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
-	cairo? ( x11-libs/cairo )"
-
-DEPEND="${RDEPEND}"
-
-need-kde 3.5
-
-pkg_setup() {
-	if ! use mplayer && ! use xine && ! use gstreamer && ! use cairo; then
-		echo
-		ewarn "Neither the mplayer, xine, gstreamer or cairo use flags have"
-		ewarn "been set. One of them is required. From them, mplayer can be"
-		ewarn "installed afterwards; however, xine and gstreamer will require"
-		ewarn "you to recompile kmplayer."
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
-		elog 'NOTICE: You have mplayer-bin installed; you will need to configure'
-		elog 'NOTICE: kmplayer to use it from within the application.'
-	fi
-}
-
-src_compile(){
-	local myconf="$(use_with gstreamer) $(use_with xine) $(use_with cairo)"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
-}
diff --git a/media-video/kmplayer/kmplayer-0.9.4a.ebuild b/media-video/kmplayer/kmplayer-0.9.4a.ebuild
deleted file mode 100644
index 446c65d003cb..000000000000
--- a/media-video/kmplayer/kmplayer-0.9.4a.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.4a.ebuild,v 1.2 2007/07/12 02:40:43 mr_bones_ Exp $
-
-inherit kde eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE."
-HOMEPAGE="http://kmplayer.kde.org/"
-SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="gstreamer mplayer xine cairo"
-
-RDEPEND="mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
-	cairo? ( x11-libs/cairo )"
-
-DEPEND="xine? ( >=media-libs/xine-lib-1.1.1 )
-	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
-	cairo? ( x11-libs/cairo )"
-
-LANGS="ar br bs ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
-lt mt nb nl pa pl pt_BR pt ro ru rw sk sr@Latn sr sv ta tr uk zh_CN"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-need-kde 3.5
-
-pkg_setup() {
-	if ! use mplayer && ! use xine && ! use gstreamer && ! use cairo; then
-		echo
-		ewarn "Neither the mplayer, xine, gstreamer or cairo use flags have"
-		ewarn "been set. One of them is required. From them, mplayer can be"
-		ewarn "installed afterwards; however, xine and gstreamer will require"
-		ewarn "you to recompile kmplayer."
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
-		elog 'NOTICE: You have mplayer-bin installed; you will need to configure'
-		elog 'NOTICE: kmplayer to use it from within the application.'
-	fi
-
-	cd "${WORKDIR}/${MY_P}/po"
-	for X in ${LANGS} ; do
-		use linguas_${X} || rm -f "${X}."*
-	done
-	rm -f "${S}/configure"
-}
-
-src_compile(){
-	local myconf="$(use_with gstreamer) $(use_with xine) $(use_with cairo)"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# Remove this, as kdelibs 3.5.4 provides it
-	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
-}
diff --git a/media-video/kplayer/ChangeLog b/media-video/kplayer/ChangeLog
index 326782de5e93..ff911ed4c4a0 100644
--- a/media-video/kplayer/ChangeLog
+++ b/media-video/kplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.29 2007/07/01 19:49:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/ChangeLog,v 1.30 2007/07/28 13:28:33 carlo Exp $
+
+  28 Jul 2007; Carsten Lohrke <carlo@gentoo.org> -kplayer-0.5.3.ebuild,
+  -kplayer-0.6.0.ebuild, -kplayer-0.6.1.ebuild:
+  Clean up.
 
   01 Jul 2007; Raúl Porcel <armin76@gentoo.org> kplayer-0.6.2.ebuild:
   x86 stable wrt #183290
diff --git a/media-video/kplayer/files/digest-kplayer-0.5.3 b/media-video/kplayer/files/digest-kplayer-0.5.3
deleted file mode 100644
index b64116cda06f..000000000000
--- a/media-video/kplayer/files/digest-kplayer-0.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea7398f96efa2f01ac875c548ab01878 kplayer-0.5.3.tar.bz2 3156593
-RMD160 32890efb867498b8b977fa23485d00099797e339 kplayer-0.5.3.tar.bz2 3156593
-SHA256 d08ab0046734294eea59818395a023426fa722fbe8baccad26081bfcb9e8c9cf kplayer-0.5.3.tar.bz2 3156593
diff --git a/media-video/kplayer/files/digest-kplayer-0.6.0 b/media-video/kplayer/files/digest-kplayer-0.6.0
deleted file mode 100644
index a132235de745..000000000000
--- a/media-video/kplayer/files/digest-kplayer-0.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c04b7a2a8c5d169d6c7c9c445da7c837 kplayer-0.6.0.tar.bz2 4219484
-RMD160 c756bdd3a262149dfca72a7a13a0bcfebac649c2 kplayer-0.6.0.tar.bz2 4219484
-SHA256 554bcc585062b00f5723bdc0483d98921bdec6fd7cb3079192a7f31d95086c82 kplayer-0.6.0.tar.bz2 4219484
diff --git a/media-video/kplayer/files/digest-kplayer-0.6.1 b/media-video/kplayer/files/digest-kplayer-0.6.1
deleted file mode 100644
index b8d3bc47f5ec..000000000000
--- a/media-video/kplayer/files/digest-kplayer-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7c23d18288616a26bf90fe3ec23c3691 kplayer-0.6.1.tar.bz2 4212718
-RMD160 3506202fa153d1a2e5ac4ff98b98963a78fabce1 kplayer-0.6.1.tar.bz2 4212718
-SHA256 1d5b3722510198b48fbf398f72d0a9f4e4c19acf5be610669faff69d648417b6 kplayer-0.6.1.tar.bz2 4212718
diff --git a/media-video/kplayer/kplayer-0.5.3.ebuild b/media-video/kplayer/kplayer-0.5.3.ebuild
deleted file mode 100644
index 15b61ac658b5..000000000000
--- a/media-video/kplayer/kplayer-0.5.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.5.3.ebuild,v 1.5 2007/02/09 16:06:51 masterdriverz Exp $
-
-inherit kde
-
-DESCRIPTION="KPlayer is a KDE media player based on mplayer."
-HOMEPAGE="http://kplayer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kplayer/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="media-video/mplayer"
-need-kde 3.1
diff --git a/media-video/kplayer/kplayer-0.6.0.ebuild b/media-video/kplayer/kplayer-0.6.0.ebuild
deleted file mode 100644
index d7e636c3ad7f..000000000000
--- a/media-video/kplayer/kplayer-0.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.6.0.ebuild,v 1.6 2007/07/12 02:40:42 mr_bones_ Exp $
-
-inherit kde
-
-DESCRIPTION="KPlayer is a KDE media player based on mplayer."
-HOMEPAGE="http://kplayer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kplayer/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=media-video/mplayer-1.0_rc1"
-
-need-kde 3.1
diff --git a/media-video/kplayer/kplayer-0.6.1.ebuild b/media-video/kplayer/kplayer-0.6.1.ebuild
deleted file mode 100644
index fe81f99a83d0..000000000000
--- a/media-video/kplayer/kplayer-0.6.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kplayer/kplayer-0.6.1.ebuild,v 1.5 2007/07/12 02:40:42 mr_bones_ Exp $
-
-inherit kde
-
-DESCRIPTION="KPlayer is a KDE media player based on mplayer."
-HOMEPAGE="http://kplayer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kplayer/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=media-video/mplayer-1.0_rc1"
-
-DEPEND="${RDEPEND}"
-
-LANGS="br ca cs cy da de el en_GB es et fi fr ga gl he hu it ja nb nl pa pl
-pt_BR pt ru sr@Latn sr sv tr zh_CN"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-need-kde 3.1
-
-src_unpack () {
-	kde_src_unpack
-	cd "${WORKDIR}/${P}/po"
-	for X in ${LANGS} ; do
-		use linguas_${X} || rm -f "${X}."*
-	done
-	rm -f "${S}/configure"
-}