version bump

Package-Manager: portage-2.0.51-r15

11 files changed, 16 insertions, 149 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index e6c65b64c9ab..427eb312e0dd 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.33 2005/01/31 14:22:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.34 2005/02/20 16:15:35 carlo Exp $
+
+*kmplayer-0.8.4a (20 Feb 2005)
+
+  20 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/kmplayer-0.6.3-gentoo.diff, -files/xine.diff, -kmplayer-0.8.4.ebuild,
+  -kmplayer-0.8.4_rc2.ebuild, -kmplayer-0.8.4_rc5.ebuild,
+  +kmplayer-0.8.4a.ebuild:
+  version bump and clean up
 
 *kmplayer-0.8.4 (31 Jan 2005)
 
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 290149eafa17..3777c09fb038 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -1,16 +1,10 @@
 MD5 45ffcfaaf2a9e8c3587cedc1f621ebfa kmplayer-0.8.1.ebuild 509
 MD5 928a61c2fa33107d2479f66e87075c6f kmplayer-0.8.3a.ebuild 587
-MD5 1a18b6faeeb6f9939f352349b8efd1e9 kmplayer-0.8.4_rc5.ebuild 911
 MD5 babb47212bb5c9c7d023d4c461d8b128 kmplayer-0.8.2.ebuild 781
-MD5 085216334bd83f06b8bc71103a7b93de kmplayer-0.8.4_rc2.ebuild 592
-MD5 0e48b7074b67e169444712abc6eb3eca kmplayer-0.8.4.ebuild 825
-MD5 63399ec726ec68ab5c93353ac9c0cd6e ChangeLog 4201
+MD5 268102bc84883aa05d1bc00c6c945a63 kmplayer-0.8.4a.ebuild 824
+MD5 5b3a036469f73eefff6b329f3056fa16 ChangeLog 4475
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 fd1beafd4f708360fcb75cf1397e8844 files/digest-kmplayer-0.8.3a 68
-MD5 53e63d9cb0db59bedb5386345b274598 files/kmplayer-0.6.3-gentoo.diff 1352
-MD5 ff1b83e0f9f644291ed8f46af98a3110 files/xine.diff 1654
+MD5 3162d93c958b83d1c8a22620a07e9593 files/digest-kmplayer-0.8.4a 68
 MD5 b740f93ee62ddd21f2cd4b2278246133 files/digest-kmplayer-0.8.1 67
 MD5 53a47e655bf48f6682b93565e9fb4ebf files/digest-kmplayer-0.8.2 67
-MD5 5403fc47a8736b18d2b69b1a139cf56d files/digest-kmplayer-0.8.4 67
-MD5 bdff7373aa6548fdfda4ae8cfbca9729 files/digest-kmplayer-0.8.4_rc2 71
-MD5 c4b26c290af28c8095f359728eb639b0 files/digest-kmplayer-0.8.4_rc5 71
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.8.4 b/media-video/kmplayer/files/digest-kmplayer-0.8.4
deleted file mode 100644
index 0e89e6cf115a..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2d9c1448b1de814be8b486364bc45b7 kmplayer-0.8.4.tar.bz2 744071
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc2 b/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc2
deleted file mode 100644
index 48388c6ad14a..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9df8b3dcd6a2e8525658716e480067d6 kmplayer-0.8.4-rc2.tar.bz2 577049
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc5 b/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc5
deleted file mode 100644
index 019866713682..000000000000
--- a/media-video/kmplayer/files/digest-kmplayer-0.8.4_rc5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c15d792dc40c81a015262bad6323b053 kmplayer-0.8.4-rc5.tar.bz2 577487
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.8.4a b/media-video/kmplayer/files/digest-kmplayer-0.8.4a
new file mode 100644
index 000000000000..e2b34f4554e7
--- /dev/null
+++ b/media-video/kmplayer/files/digest-kmplayer-0.8.4a
@@ -0,0 +1 @@
+MD5 c197f4d782fadd5fa003aa367a6ee096 kmplayer-0.8.4a.tar.bz2 745183
diff --git a/media-video/kmplayer/files/kmplayer-0.6.3-gentoo.diff b/media-video/kmplayer/files/kmplayer-0.6.3-gentoo.diff
deleted file mode 100644
index 82561ede6b41..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.6.3-gentoo.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- kmplayer/kmplayer_part.cpp	2003-01-17 17:01:24.000000000 +0100
-+++ kmplayer/kmplayer_part.cpp	2003-01-17 19:40:38.000000000 +0100
-@@ -160,7 +160,7 @@
- 
- void KMPlayer::setURL (const KURL &url) {
-     m_url = url;
--    kdDebug () << "KMPlayer::setURL url:" << m_url << endl;
-+    kdDebug () << "KMPlayer::setURL url:" << &m_url << endl;
-     m_view->viewer ()->setAspect (0.0);
-     movie_height = movie_width = 0;
- }
-@@ -168,11 +168,11 @@
- bool KMPlayer::openURL (const KURL & _url) {
-     stop ();
-     if (!m_view) return false;
--    kdDebug () << "KMPlayer::openURL url:" << _url << "href:" << m_href << endl;
-+    kdDebug () << "KMPlayer::openURL url:" << &_url << "href:" << m_href << endl;
-     KURL url = _url;
-     if (!m_href.isEmpty ())
-         url = m_href;
--    kdDebug () << "KMPlayer::openURL url:" << url << endl;
-+    kdDebug () << "KMPlayer::openURL url:" << &url << endl;
-     if (url.isValid ()) {
-         setURL (url);
-         play ();
-@@ -346,7 +346,7 @@
-         if (!m_view->playButton ()->isOn ()) m_view->playButton ()->toggle ();
-         return;
-     }
--    kdDebug () << "KMPlayer::play url:" << m_url << endl;
-+    kdDebug () << "KMPlayer::play url:" << &m_url << endl;
-     if (!m_url.isValid () || m_url.isEmpty ()) {
-         if (m_view->playButton ()->isOn ()) m_view->playButton ()->toggle ();
-         return;
diff --git a/media-video/kmplayer/files/xine.diff b/media-video/kmplayer/files/xine.diff
deleted file mode 100644
index 2979b11099c4..000000000000
--- a/media-video/kmplayer/files/xine.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.in.in.orig	2004-12-17 22:29:28.000000000 +0100
-+++ configure.in.in	2004-12-17 22:32:58.000000000 +0100
-@@ -81,19 +81,29 @@
- AC_MSG_CHECKING([if kxineplayer can be compiled])
- AC_MSG_RESULT($have_xine)
- 
--if test "$have_xine" = "yes"; then
--  vers=`xine-config --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
--  if test -n "$vers" && test "$vers" -ge 1000000
--  then
--        AC_DEFINE(HAVE_XINE, 1, [If we have libxine installed])
--        LIB_XINE="`xine-config --libs`"
--        AC_SUBST(LIB_XINE)
--        CFLAGS_XINE="`xine-config --cflags`"
--        AC_SUBST(CFLAGS_XINE)
--  else
--       have_xine="no"
--       AC_MSG_WARN([Your xine installation is too old (1.0.0 or later required)])
--  fi
-+AC_ARG_WITH(xine,
-+    AC_HELP_STRING([--without-xine],[build KMPlayer without Xine [default=with]]),
-+    [build_xine=$withval],
-+    [build_xine=yes]
-+)
-+
-+if test "$build_xine" != "no"; then
-+    if test "$have_xine" = "yes"; then
-+      vers=`xine-config --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+      if test -n "$vers" && test "$vers" -ge 1000000
-+      then
-+            AC_DEFINE(HAVE_XINE, 1, [If we have libxine installed])
-+            LIB_XINE="`xine-config --libs`"
-+            AC_SUBST(LIB_XINE)
-+            CFLAGS_XINE="`xine-config --cflags`"
-+            AC_SUBST(CFLAGS_XINE)
-+      else
-+           have_xine="no"
-+           AC_MSG_WARN([Your xine installation is too old (1.0.0 or later required)])
-+      fi
-+    fi
-+else
-+    have_xine="no"
- fi
- 
- AM_CONDITIONAL(include_kxineplayer, test "$have_xine" = "yes")
diff --git a/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild b/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild
deleted file mode 100644
index be4dc8fda207..000000000000
--- a/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.4_rc2.ebuild,v 1.3 2005/01/07 22:02:17 carlo Exp $
-
-inherit kde
-
-MY_P="${P/_rc/-rc}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="MPlayer frontend for KDE"
-HOMEPAGE="http://www.xs4all.nl/~jjvrieze/kmplayer.html"
-SRC_URI="http://www.xs4all.nl/~jjvrieze/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="xine"
-
-DEPEND=">=media-video/mplayer-0.90
-	xine? ( >=media-libs/xine-lib-1_beta12 )"
-need-kde 3.1
\ No newline at end of file
diff --git a/media-video/kmplayer/kmplayer-0.8.4_rc5.ebuild b/media-video/kmplayer/kmplayer-0.8.4_rc5.ebuild
deleted file mode 100644
index b63f29378073..000000000000
--- a/media-video/kmplayer/kmplayer-0.8.4_rc5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.4_rc5.ebuild,v 1.2 2005/01/08 00:57:14 carlo Exp $
-
-inherit kde eutils
-
-MY_P="${P/_rc/-rc}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="MPlayer frontend for KDE"
-HOMEPAGE="http://www.xs4all.nl/~jjvrieze/kmplayer.html"
-SRC_URI="http://www.xs4all.nl/~jjvrieze/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="gstreamer xine"
-
-# Removed koffice plugin, since compilation fails and its not supported upstream.
-DEPEND=">=media-video/mplayer-0.90
-	xine? ( >=media-libs/xine-lib-1_beta12 )
-	gstreamer? ( >=media-libs/gst-plugins-0.8.7 )"
-need-kde 3.1
-
-src_unpack(){
-	kde_src_unpack
-	epatch ${FILESDIR}/xine.diff
-	rm -f $S/configure
-}
-src_compile(){
-	local myconf="$(use_with gstreamer) $(use_with xine)"
-	kde_src_compile
-}
diff --git a/media-video/kmplayer/kmplayer-0.8.4.ebuild b/media-video/kmplayer/kmplayer-0.8.4a.ebuild
index 600adc4ff726..e8a438172443 100644
--- a/media-video/kmplayer/kmplayer-0.8.4.ebuild
+++ b/media-video/kmplayer/kmplayer-0.8.4a.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.4.ebuild,v 1.1 2005/01/31 14:22:55 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.8.4a.ebuild,v 1.1 2005/02/20 16:15:35 carlo Exp $
 
-inherit kde eutils
+inherit kde
 
 MY_P="${P/_rc/-rc}"
 S=${WORKDIR}/${MY_P}
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="gstreamer xine"
 
-# Removed koffice plugin, since compilation fails and its not supported upstream.
+# Removed koffice plugin, since the compilation fails and it's not supported upstream.
 DEPEND=">=media-video/mplayer-0.90
 	xine? ( >=media-libs/xine-lib-1_beta12 )
 	gstreamer? ( >=media-libs/gst-plugins-0.8.7 )"