Ebuild cleanup.

Package-Manager: portage-2.1.2_rc3-r1

diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 0c2511aecad5318820f66a0b928ade84b5e44865..28287ff30ce0429a86bf63cae1e3beae8385fd4e 100644 (file)
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,30 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX kmplayer-0.9.2a-use32bitbin.diff 9311 RMD160 ff28f8574e6c52fdac47a123b708e5d9084f6b47 SHA1 90246b1e384d511aa35eeec112034b2129789426 SHA256 1e7450978f30d6296c73c10737035827f6547460799caa6898488e5d84553af3
-MD5 cc0ab460a6945037328e7ef52c04d64b files/kmplayer-0.9.2a-use32bitbin.diff 9311
-RMD160 ff28f8574e6c52fdac47a123b708e5d9084f6b47 files/kmplayer-0.9.2a-use32bitbin.diff 9311
-SHA256 1e7450978f30d6296c73c10737035827f6547460799caa6898488e5d84553af3 files/kmplayer-0.9.2a-use32bitbin.diff 9311
 AUX kmplayer-0.9.3-use32bitbin.diff 10308 RMD160 5983630e340723f7ca210ee87f3aaeda13bda68e SHA1 22a6f5d7990feeee71455d4dd64aa212e86e20fc SHA256 4fe748de0ca402bf01a8a6cbb44a1b88b1f36017bd467464cb303be5b5cc6d3e
 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
-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
 DIST kmplayer-0.9.3a.tar.bz2 950430 RMD160 1e98a30a7a200e1235c86129df708c799cfaa595 SHA1 646f6716f24d4d635545f5e3946671c2f01e3e8c SHA256 13fafbc1a149dad9354192072f202a70c98868d10cd44299bc7d22915fd1c202
-EBUILD kmplayer-0.9.1c.ebuild 1339 RMD160 0e8c10a664dc79121d736338bf876ee373f545f7 SHA1 1165b31f7424e7d1ada5ff3df32436b12fce424b SHA256 393db6252fedd1d2827fc3edbcb96596a2093e52e6fb86b180e15031d8e6dc54
-MD5 920dd2294d19b832cfcc092e65fccf6d kmplayer-0.9.1c.ebuild 1339
-RMD160 0e8c10a664dc79121d736338bf876ee373f545f7 kmplayer-0.9.1c.ebuild 1339
-SHA256 393db6252fedd1d2827fc3edbcb96596a2093e52e6fb86b180e15031d8e6dc54 kmplayer-0.9.1c.ebuild 1339
-EBUILD kmplayer-0.9.2a-r1.ebuild 1525 RMD160 1cd75c5eb99f1edc623f9ab8cc273f8266d2e7a0 SHA1 f358940f2c1eeba5e8351f18c50dd63500cc5cf2 SHA256 9d35c2e4e21e1db4934aa727496aa0103275ef9187cca1d7c3100c4076e404da
-MD5 26244345f0b341a355a7da9ae9cdc22c kmplayer-0.9.2a-r1.ebuild 1525
-RMD160 1cd75c5eb99f1edc623f9ab8cc273f8266d2e7a0 kmplayer-0.9.2a-r1.ebuild 1525
-SHA256 9d35c2e4e21e1db4934aa727496aa0103275ef9187cca1d7c3100c4076e404da kmplayer-0.9.2a-r1.ebuild 1525
-EBUILD kmplayer-0.9.2a.ebuild 1373 RMD160 9f29e08485d1c9c55c47dfe178203d45b91c6f11 SHA1 db7f91930609910e29cbd00b7a8ef7e72f61ca08 SHA256 76923049c8ba26f9d6dd0ff77a2275a79bec42d9eca34678ad8120eae0c95d17
-MD5 ab8949c1b5200df6c268cee8f2b795dd kmplayer-0.9.2a.ebuild 1373
-RMD160 9f29e08485d1c9c55c47dfe178203d45b91c6f11 kmplayer-0.9.2a.ebuild 1373
-SHA256 76923049c8ba26f9d6dd0ff77a2275a79bec42d9eca34678ad8120eae0c95d17 kmplayer-0.9.2a.ebuild 1373
 EBUILD kmplayer-0.9.3.ebuild 1821 RMD160 e08ed2c9a985beb3c905e22d998cdf21d9bc7af1 SHA1 6afe2ab97a85711dec2ef8569c0fcc59d672027b SHA256 3a414c7933dc36e6df6ea9a129d28d94c2ff8e6d9c7719a0305d75d510d50da4
 MD5 f4c91dd80192a4901f28fc279b770806 kmplayer-0.9.3.ebuild 1821
 RMD160 e08ed2c9a985beb3c905e22d998cdf21d9bc7af1 kmplayer-0.9.3.ebuild 1821
@@ -33,23 +15,14 @@ EBUILD kmplayer-0.9.3a.ebuild 1679 RMD160 97b9bd2f9e57772d91025412688b304cd4c19c
 MD5 abb8133d44d5cc6c99e5ce9697703130 kmplayer-0.9.3a.ebuild 1679
 RMD160 97b9bd2f9e57772d91025412688b304cd4c19c40 kmplayer-0.9.3a.ebuild 1679
 SHA256 f257b3aa6fa3f3a3fdc58576384b028869156532742dc7fe649097e40c6e7c44 kmplayer-0.9.3a.ebuild 1679
-MISC ChangeLog 11737 RMD160 3a1dbe5cb10337629e2873c55dfb3f4ed6147947 SHA1 59cfad3775a34861182eee3f506df1e441284bea SHA256 8bd29054b2ee396d8b606dc06d9fe49b8e4e223fc08ad40b5551298f67f31641
-MD5 3cd81c85954a9d098d360b04ecf1acf4 ChangeLog 11737
-RMD160 3a1dbe5cb10337629e2873c55dfb3f4ed6147947 ChangeLog 11737
-SHA256 8bd29054b2ee396d8b606dc06d9fe49b8e4e223fc08ad40b5551298f67f31641 ChangeLog 11737
+MISC ChangeLog 11937 RMD160 1e09e86052655df6622d12c5e87d998fba3f3f00 SHA1 275b625a555b4f8a61f2498c85a8f323fdf62f7e SHA256 358a2b2193fcfcd278e78a178151848d6b4f9c4982ebe82b522edca1383f3c20
+MD5 cbdc13c444c3b31664e3335fa836e7c8 ChangeLog 11937
+RMD160 1e09e86052655df6622d12c5e87d998fba3f3f00 ChangeLog 11937
+SHA256 358a2b2193fcfcd278e78a178151848d6b4f9c4982ebe82b522edca1383f3c20 ChangeLog 11937
 MISC metadata.xml 175 RMD160 7dfa84d03490484a8b7eaeaeb49f738ca38bbf2b SHA1 d456fb89192d2d40fc6110271d60f135e52890fd SHA256 caaf809e8b1d1c07cb46b8efd0f932f28b3fe79a1c47489a04331e7308fcbbcc
 MD5 01ba4a24c895931d11a8e08565712090 metadata.xml 175
 RMD160 7dfa84d03490484a8b7eaeaeb49f738ca38bbf2b metadata.xml 175
 SHA256 caaf809e8b1d1c07cb46b8efd0f932f28b3fe79a1c47489a04331e7308fcbbcc metadata.xml 175
-MD5 18832adc4a74fd2ee16da03f5e2254db files/digest-kmplayer-0.9.1c 250
-RMD160 5778aa3ed5bffe34de0085336e43267bb3b6ad79 files/digest-kmplayer-0.9.1c 250
-SHA256 880f2aff7abd920c6c581253ae334148fb53ff5206517c5fd2e05e1db708eee5 files/digest-kmplayer-0.9.1c 250
-MD5 1e34c57da81407f31c22d60a03ebc5c5 files/digest-kmplayer-0.9.2a 250
-RMD160 fdc646d1026055e3bdf2a9b7eca70fdfeedb8738 files/digest-kmplayer-0.9.2a 250
-SHA256 f4eb04028770248f26cd1167ba8202a95323c7c5dc3ac5d73fae29d56d0a4e07 files/digest-kmplayer-0.9.2a 250
-MD5 1e34c57da81407f31c22d60a03ebc5c5 files/digest-kmplayer-0.9.2a-r1 250
-RMD160 fdc646d1026055e3bdf2a9b7eca70fdfeedb8738 files/digest-kmplayer-0.9.2a-r1 250
-SHA256 f4eb04028770248f26cd1167ba8202a95323c7c5dc3ac5d73fae29d56d0a4e07 files/digest-kmplayer-0.9.2a-r1 250
 MD5 a8ca55a7f5245bd844a93badf6352557 files/digest-kmplayer-0.9.3 247
 RMD160 25bd6ea69f1022d73ff950c7272fd97c44f0d853 files/digest-kmplayer-0.9.3 247
 SHA256 6e55fd56cd1492538805f5f13ced19d93fee8220b94badd1afc296c808bf965f files/digest-kmplayer-0.9.3 247
@@ -59,7 +32,7 @@ SHA256 0f0083b67712fc3d45e280734c2c60950afc24f95436b9cef4d704a894be0b52 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFj5dUQVeVlgLp4x8RAqSSAJ4yhW59aA2fe89YpDbFUYz77RVqmwCdEkAE
-6Dog2VsaQWCAYB5h8bSMTnU=
-=c8Xl
+iD8DBQFFj5hSQVeVlgLp4x8RAqnfAKCFmYpQ7myAtoD3tnYRnKwqhR28bwCfZFs+
+JvK9cYax5ayI0+k6didiSGI=
+=VoS1
 -----END PGP SIGNATURE-----

diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.1c b/media-video/kmplayer/files/digest-kmplayer-0.9.1c
deleted file mode 100644 (file)
index dbe91de..0000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.1c
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 96a3e31e8b0c52682054d37793c6e65e kmplayer-0.9.1c.tar.bz2 874267
-RMD160 5a682c72068437ae846c533ef459813cce3c1612 kmplayer-0.9.1c.tar.bz2 874267
-SHA256 3a0d7744f43f8baf74a017cc06fdacd6185e520b6f4ceaf4baa952ab20fd7183 kmplayer-0.9.1c.tar.bz2 874267

diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.2a b/media-video/kmplayer/files/digest-kmplayer-0.9.2a
deleted file mode 100644 (file)
index fbd9689..0000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.2a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e8ab1a03f80249c3ea9332a48817c32 kmplayer-0.9.2a.tar.bz2 902210
-RMD160 56eec6b64da0c0da6738896dcc215d1d565bf3ca kmplayer-0.9.2a.tar.bz2 902210
-SHA256 ddd5f2afffc1a5458456f5a88e81691a106deee4f8a4ba5ac8edb3b3600dd51f kmplayer-0.9.2a.tar.bz2 902210

diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.2a-r1 b/media-video/kmplayer/files/digest-kmplayer-0.9.2a-r1
deleted file mode 100644 (file)
index fbd9689..0000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.9.2a-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e8ab1a03f80249c3ea9332a48817c32 kmplayer-0.9.2a.tar.bz2 902210
-RMD160 56eec6b64da0c0da6738896dcc215d1d565bf3ca kmplayer-0.9.2a.tar.bz2 902210
-SHA256 ddd5f2afffc1a5458456f5a88e81691a106deee4f8a4ba5ac8edb3b3600dd51f kmplayer-0.9.2a.tar.bz2 902210

diff --git a/media-video/kmplayer/files/kmplayer-0.9.2a-use32bitbin.diff b/media-video/kmplayer/files/kmplayer-0.9.2a-use32bitbin.diff
deleted file mode 100644 (file)
index a7c28c1..0000000
--- a/media-video/kmplayer/files/kmplayer-0.9.2a-use32bitbin.diff
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r -- kmplayer-0.9.2-orig/src/kmplayerapp.cpp kmplayer-0.9.2/src/kmplayerapp.cpp
---- kmplayer-0.9.2-orig/src/kmplayerapp.cpp    2006-04-21 21:08:29.000000000 +0200
-+++ kmplayer-0.9.2/src/kmplayerapp.cpp 2006-05-20 19:45:59.605492750 +0200
-@@ -97,9 +97,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");
-     m_player->sources () ["dvdsource"] = new ::KMPlayerDVDSource(this, m_dvdmenu);
-     m_player->sources () ["dvdnavsource"] = new KMPlayerDVDNavSource (this, m_dvdnavmenu);
-     m_player->sources () ["vcdsource"] = new KMPlayerVCDSource(this, m_vcdmenu);
-@@ -1032,9 +1032,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];
-@@ -1335,9 +1335,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 ();
-diff -U 4 -H -b -w -B -E -d -i -r -- kmplayer-0.9.2-orig/src/kmplayerconfig.cpp kmplayer-0.9.2/src/kmplayerconfig.cpp
---- kmplayer-0.9.2-orig/src/kmplayerconfig.cpp 2006-04-21 21:08:29.000000000 +0200
-+++ kmplayer-0.9.2/src/kmplayerconfig.cpp      2006-05-20 19:45:59.621493750 +0200
-@@ -117,9 +117,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.2-orig/src/kmplayer_def.h kmplayer-0.9.2/src/kmplayer_def.h
---- kmplayer-0.9.2-orig/src/kmplayer_def.h     2006-04-21 21:08:29.000000000 +0200
-+++ kmplayer-0.9.2/src/kmplayer_def.h  2006-05-20 19:47:10.541926000 +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.2/src: kmplayer_def.h~
-diff -U 4 -H -b -w -B -E -d -i -r -- kmplayer-0.9.2-orig/src/kmplayerpartbase.cpp kmplayer-0.9.2/src/kmplayerpartbase.cpp
---- kmplayer-0.9.2-orig/src/kmplayerpartbase.cpp       2006-04-21 21:08:29.000000000 +0200
-+++ kmplayer-0.9.2/src/kmplayerpartbase.cpp    2006-05-20 19:45:59.653495750 +0200
-@@ -119,9 +119,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.2-orig/src/kmplayer_part.cpp kmplayer-0.9.2/src/kmplayer_part.cpp
---- kmplayer-0.9.2-orig/src/kmplayer_part.cpp  2006-04-21 21:08:29.000000000 +0200
-+++ kmplayer-0.9.2/src/kmplayer_part.cpp       2006-05-20 19:45:59.577491000 +0200
-@@ -312,9 +312,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;
-@@ -332,9 +332,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.2-orig/src/kmplayerprocess.cpp kmplayer-0.9.2/src/kmplayerprocess.cpp
---- kmplayer-0.9.2-orig/src/kmplayerprocess.cpp        2006-04-21 21:08:29.000000000 +0200
-+++ kmplayer-0.9.2/src/kmplayerprocess.cpp     2006-05-20 20:54:06.764924250 +0200
-@@ -345,9 +345,9 @@
-     "dvdsource", "exitsource", "hrefsource", "introsource", "pipesource", "tvscanner", "tvsource", "urlsource", "vcdsource", 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) {
-@@ -511,10 +511,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 ";
-@@ -599,9 +599,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=";
-@@ -920,9 +920,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);
-@@ -1020,9 +1020,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.2/src: kmplayerprocess.cpp~
-diff -U 4 -H -b -w -B -E -d -i -r -- kmplayer-0.9.2-orig/src/kmplayertvsource.cpp kmplayer-0.9.2/src/kmplayertvsource.cpp
---- kmplayer-0.9.2-orig/src/kmplayertvsource.cpp       2006-04-21 21:08:29.000000000 +0200
-+++ kmplayer-0.9.2/src/kmplayertvsource.cpp    2006-05-20 19:45:59.737501000 +0200
-@@ -702,9 +702,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.1c.ebuild b/media-video/kmplayer/kmplayer-0.9.1c.ebuild
deleted file mode 100644 (file)
index d173371..0000000
--- a/media-video/kmplayer/kmplayer-0.9.1c.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.1c.ebuild,v 1.4 2006/06/14 15:26:56 wolf31o2 Exp $
-
-inherit kde
-
-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 x86"
-IUSE="gstreamer mplayer xine"
-
-# Removed koffice plugin, since the compilation fails and it's not supported upstream.
-DEPEND="xine? ( >=media-libs/xine-lib-1_beta12 )
-       gstreamer? ( =media-libs/gst-plugins-0.8* )"
-RDEPEND="mplayer? ( >=media-video/mplayer-0.90 )
-       xine? ( >=media-libs/xine-lib-1_beta12 )
-       gstreamer? ( =media-libs/gst-plugins-0.8* )"
-need-kde 3.1
-
-pkg_setup() {
-       if ! use mplayer && ! use xine ; then
-               echo
-               ewarn "Neither mplayer nor xine use flag is set. Either one is needed."
-               ewarn "You can install mplayer later, though.\n"
-       fi
-}
-
-src_install() {
-       kde_src_install
-       mv ${D}/usr/share/mimelnk/application/x-mplayer2.desktop ${D}/usr/share/mimelnk/application/x-mplayer3.desktop
-}
-
-src_compile(){
-       local myconf="$(use_with gstreamer) $(use_with xine)"
-       kde_src_compile
-}

diff --git a/media-video/kmplayer/kmplayer-0.9.2a-r1.ebuild b/media-video/kmplayer/kmplayer-0.9.2a-r1.ebuild
deleted file mode 100644 (file)
index a327a01..0000000
--- a/media-video/kmplayer/kmplayer-0.9.2a-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.2a-r1.ebuild,v 1.1 2006/08/02 10:18:05 flameeyes 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 ~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* ) )"
-
-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 ; then
-               echo
-               ewarn "Neither mplayer nor xine use flag is set. Either one is needed."
-               ewarn "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"
-       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.2a.ebuild b/media-video/kmplayer/kmplayer-0.9.2a.ebuild
deleted file mode 100644 (file)
index 608dd60..0000000
--- a/media-video/kmplayer/kmplayer-0.9.2a.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.2a.ebuild,v 1.4 2006/08/02 10:18:05 flameeyes 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 ~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* ) )"
-
-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
-
-pkg_setup() {
-       if ! use mplayer && ! use xine ; then
-               echo
-               ewarn "Neither mplayer nor xine use flag is set. Either one is needed."
-               ewarn "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"
-       fi
-}
-
-src_compile(){
-       local myconf="$(use_with gstreamer) $(use_with xine)"
-       kde_src_compile
-}