Removed orphan patch for version 0.9.3_pre2.

Package-Manager: portage-2.1.1

diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 89556267a9bd726a53579062193f1bb578920df2..75d5a8dbc0b3c3d01fcaedf3110b05ba14867a04 100644 (file)
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -9,10 +9,6 @@ AUX kmplayer-0.9.3-use32bitbin.diff 10308 RMD160 5983630e340723f7ca210ee87f3aaed
 MD5 e5e09564ed22fdaa4e10c067c2ba11a7 files/kmplayer-0.9.3-use32bitbin.diff 10308
 RMD160 5983630e340723f7ca210ee87f3aaeda13bda68e files/kmplayer-0.9.3-use32bitbin.diff 10308
 SHA256 4fe748de0ca402bf01a8a6cbb44a1b88b1f36017bd467464cb303be5b5cc6d3e files/kmplayer-0.9.3-use32bitbin.diff 10308
-AUX kmplayer-0.9.3_pre2-use32bitbin.diff 10284 RMD160 d43468e04218dda33ce55e00ca662668fb02dd64 SHA1 33907c5847f8dfbc73e284ab7a8c540a51b1d538 SHA256 d9d5d53d63b21b032219824329f5e8144cd57d4eaf023e0c31d368d5087a0a30
-MD5 5d18761b3a8a70b67db1356cac037f59 files/kmplayer-0.9.3_pre2-use32bitbin.diff 10284
-RMD160 d43468e04218dda33ce55e00ca662668fb02dd64 files/kmplayer-0.9.3_pre2-use32bitbin.diff 10284
-SHA256 d9d5d53d63b21b032219824329f5e8144cd57d4eaf023e0c31d368d5087a0a30 files/kmplayer-0.9.3_pre2-use32bitbin.diff 10284
 DIST kmplayer-0.9.1c.tar.bz2 874267 RMD160 5a682c72068437ae846c533ef459813cce3c1612 SHA1 b1d6a30ac17296214c21608deb56164f2b7d997b SHA256 3a0d7744f43f8baf74a017cc06fdacd6185e520b6f4ceaf4baa952ab20fd7183
 DIST kmplayer-0.9.2a.tar.bz2 902210 RMD160 56eec6b64da0c0da6738896dcc215d1d565bf3ca SHA1 729a6f9a5d8033aa9beba239b66c03b07456dd5c SHA256 ddd5f2afffc1a5458456f5a88e81691a106deee4f8a4ba5ac8edb3b3600dd51f
 DIST kmplayer-0.9.3.tar.bz2 943240 RMD160 5dd48f2e1564df8576c92bff22f7f9cfaf969d7e SHA1 1e6ff7e37b758c188f79de83ec2559e5605adbb4 SHA256 1b10a7162f305da974dc30bf4ffdea2cfd7a03dc69e2749c8366e0ce78732247
@@ -32,10 +28,10 @@ EBUILD kmplayer-0.9.3.ebuild 1773 RMD160 31d87594e0bc3fd11671ff663da34d06109ed5c
 MD5 f07e1fc00febe9ab41805a0ee071962c kmplayer-0.9.3.ebuild 1773
 RMD160 31d87594e0bc3fd11671ff663da34d06109ed5cc kmplayer-0.9.3.ebuild 1773
 SHA256 6bee2fa5a0b972a96d1724bfbb67c3179f83f17d88f9783832a77b027be7512a kmplayer-0.9.3.ebuild 1773
-MISC ChangeLog 10544 RMD160 334b23a87ddf6a53417b732c892b6aaad29f11f2 SHA1 c326a0e82d977df312bd5cc09a471487cb5c6961 SHA256 c7c8903c7736946a234d913ccac8d466eb6a5c0ba0baefb8256091fe055e7a99
-MD5 66372528a1d4ea42348835c3a34c5362 ChangeLog 10544
-RMD160 334b23a87ddf6a53417b732c892b6aaad29f11f2 ChangeLog 10544
-SHA256 c7c8903c7736946a234d913ccac8d466eb6a5c0ba0baefb8256091fe055e7a99 ChangeLog 10544
+MISC ChangeLog 10697 RMD160 21985879d4ebdef9ed5be37eb711f9b2ef67032c SHA1 f413f959b3023c301130d644d8e4ad3930cf9df5 SHA256 e02da61e651e005408e0e23ee13a38a629c8b09df595ff11c8efc329ed909b28
+MD5 7f6e796ef4b3085b2f66789be4a47065 ChangeLog 10697
+RMD160 21985879d4ebdef9ed5be37eb711f9b2ef67032c ChangeLog 10697
+SHA256 e02da61e651e005408e0e23ee13a38a629c8b09df595ff11c8efc329ed909b28 ChangeLog 10697
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -55,7 +51,7 @@ SHA256 6e55fd56cd1492538805f5f13ced19d93fee8220b94badd1afc296c808bf965f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFKouVQVeVlgLp4x8RAj55AJ90fEq0PEuxU/L6c30UIVlegmzY1gCeLOCN
-7YcyP5F0KOO4sxktj83Dp7A=
-=4dPh
+iD8DBQFFK4lBQVeVlgLp4x8RAkeGAJ9mVNDEGQfgTEwBlIU8z4doz6rmTQCdEu8d
+pcTMnHno/sqGgN5yyXWxLSU=
+=tXKh
 -----END PGP SIGNATURE-----

diff --git a/media-video/kmplayer/files/kmplayer-0.9.3_pre2-use32bitbin.diff b/media-video/kmplayer/files/kmplayer-0.9.3_pre2-use32bitbin.diff
deleted file mode 100644 (file)
index 8ce075c..0000000
--- a/media-video/kmplayer/files/kmplayer-0.9.3_pre2-use32bitbin.diff
+++ /dev/null
@@ -1,203 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayerapp.cpp kmplayer-0.9.3-pre2/src/kmplayerapp.cpp
---- kmplayer-0.9.3-pre2-orig/src/kmplayerapp.cpp       2006-08-29 13:19:55.000000000 +0200
-+++ kmplayer-0.9.3-pre2/src/kmplayerapp.cpp    2006-08-29 13:24:58.000000000 +0200
-@@ -410,9 +410,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);
-@@ -1630,9 +1630,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];
-@@ -1933,9 +1933,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) {
-         if (m_document->state != KMPlayer::Element::state_deferred)
-             m_document->defer ();
-@@ -2032,9 +2032,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 ();
-Only in kmplayer-0.9.3-pre2/src: kmplayerapp.cpp~
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayerconfig.cpp kmplayer-0.9.3-pre2/src/kmplayerconfig.cpp
---- kmplayer-0.9.3-pre2-orig/src/kmplayerconfig.cpp    2006-08-29 13:19:55.000000000 +0200
-+++ kmplayer-0.9.3-pre2/src/kmplayerconfig.cpp 2006-08-29 13:28:13.000000000 +0200
-@@ -119,9 +119,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";
-Only in kmplayer-0.9.3-pre2/src: kmplayerconfig.cpp~
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayer_def.h kmplayer-0.9.3-pre2/src/kmplayer_def.h
---- kmplayer-0.9.3-pre2-orig/src/kmplayer_def.h        2006-08-29 13:19:55.000000000 +0200
-+++ kmplayer-0.9.3-pre2/src/kmplayer_def.h     2006-08-29 13:34:47.000000000 +0200
-@@ -55,6 +55,6 @@
-   #define KMPLAYER_EXPORT
-   #define KMPLAYER_NO_EXPORT
- #endif
- 
--
-+#define MPLAYER_BIN "mplayer-bin"
- #endif //_KMPLAYER_DEF_H_
-Only in kmplayer-0.9.3-pre2/src: kmplayer_def.h~
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayerpartbase.cpp kmplayer-0.9.3-pre2/src/kmplayerpartbase.cpp
---- kmplayer-0.9.3-pre2-orig/src/kmplayerpartbase.cpp  2006-08-29 13:19:55.000000000 +0200
-+++ kmplayer-0.9.3-pre2/src/kmplayerpartbase.cpp       2006-08-29 13:28:33.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);
-Only in kmplayer-0.9.3-pre2/src: kmplayerpartbase.cpp~
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayer_part.cpp kmplayer-0.9.3-pre2/src/kmplayer_part.cpp
---- kmplayer-0.9.3-pre2-orig/src/kmplayer_part.cpp     2006-08-29 13:19:55.000000000 +0200
-+++ kmplayer-0.9.3-pre2/src/kmplayer_part.cpp  2006-08-29 13:29:43.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 {
-Only in kmplayer-0.9.3-pre2/src: kmplayer_part.cpp~
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayerprocess.cpp kmplayer-0.9.3-pre2/src/kmplayerprocess.cpp
---- kmplayer-0.9.3-pre2-orig/src/kmplayerprocess.cpp   2006-08-29 13:19:55.000000000 +0200
-+++ kmplayer-0.9.3-pre2/src/kmplayerprocess.cpp        2006-08-29 13:36:27.000000000 +0200
-@@ -346,9 +346,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) {
-@@ -515,10 +515,10 @@
-     if (!m_use_slave) {
-         fprintf (stderr, "%s | ", pipe);
-         *m_process << pipe << " | ";
-     }
--    fprintf (stderr, "mplayer -wid %lu ", (unsigned long) widget ());
--    *m_process << "mplayer -wid " << QString::number (widget ());
-+    fprintf (stderr, "mplayer-bin -wid %lu ", (unsigned long) widget ());
-+    *m_process << "mplayer-bin -wid " << QString::number (widget ());
- 
-     if (m_use_slave) {
-         fprintf (stderr, "-slave ");
-         *m_process << "-slave ";
-@@ -603,9 +603,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=";
-@@ -927,9 +927,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);
-@@ -1027,9 +1027,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;
-Only in kmplayer-0.9.3-pre2/src: kmplayerprocess.cpp~
-diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayertvsource.cpp kmplayer-0.9.3-pre2/src/kmplayertvsource.cpp
---- kmplayer-0.9.3-pre2-orig/src/kmplayertvsource.cpp  2006-08-29 13:19:55.000000000 +0200
-+++ kmplayer-0.9.3-pre2/src/kmplayertvsource.cpp       2006-08-29 13:30:39.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 ();
- }
-Only in kmplayer-0.9.3-pre2/src: kmplayertvsource.cpp~