From faeecea80e239046280e4ae96a005e344346674a Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Tue, 21 Apr 2009 15:47:41 +0300
Subject: [PATCH] kaffeine: Updated (0.8.4 -> 0.99-r920764)

---
 kde/kaffeine/kaffeine.cache | 50 ++++++++++++-------------------------
 kde/kaffeine/kaffeine.conf  | 22 ----------------
 kde/kaffeine/kaffeine.desc  |  8 +++---
 kde/kaffeine/mimedata.patch | 29 ---------------------
 4 files changed, 19 insertions(+), 90 deletions(-)
 delete mode 100644 kde/kaffeine/kaffeine.conf
 delete mode 100644 kde/kaffeine/mimedata.patch

diff --git a/kde/kaffeine/kaffeine.cache b/kde/kaffeine/kaffeine.cache
index 8e34e8b36..76324d0b4 100644
--- a/kde/kaffeine/kaffeine.cache
+++ b/kde/kaffeine/kaffeine.cache
@@ -1,71 +1,53 @@
 
-[TIMESTAMP] 1133789162 Mon Dec  5 14:26:02 2005
-[BUILDTIME] 100 (5)
-[SIZE] 4.08 MB, 123 files
+[TIMESTAMP] 1240312364 Tue Apr 21 14:12:44 2009
+[BUILDTIME] 10 (5)
+[SIZE] 0.44 MB, 10 files
 
-[DEP] 00-dirtree
-[DEP] arts
+[DEP] acl
+[DEP] attr
+[DEP] automoc4
 [DEP] bash
 [DEP] binutils
 [DEP] bzip2
-[DEP] xorg-cf-files
+[DEP] cmake
 [DEP] coreutils
 [DEP] diffutils
+[DEP] e2fsprogs
 [DEP] expat
-[DEP] gamin
+[DEP] fhs
 [DEP] findutils
 [DEP] fontconfig
 [DEP] freetype
+[DEP] gamin
 [DEP] gawk
 [DEP] gcc
-[DEP] gettext
 [DEP] glib
 [DEP] glibc
 [DEP] grep
-[DEP] gst-plugins
-[DEP] gstreamer
-[DEP] imake
-[DEP] inputproto
-[DEP] kdebindings
 [DEP] kdelibs
-[DEP] libart_lgpl23
-[DEP] libdnet
-[DEP] libdrm
 [DEP] libice
-[DEP] libidn
-[DEP] libjpeg
 [DEP] libpng
 [DEP] libsm
 [DEP] libx11
 [DEP] libxau
+[DEP] libxcb
 [DEP] libxcursor
 [DEP] libxdmcp
 [DEP] libxext
 [DEP] libxfixes
 [DEP] libxft
-[DEP] libxinerama
 [DEP] libxml
-[DEP] libxmu
-[DEP] libxrandr
+[DEP] libxpm
 [DEP] libxrender
 [DEP] libxt
 [DEP] libxtst
-[DEP] libxxf86vm
 [DEP] linux-header
 [DEP] make
-[DEP] mesa
-[DEP] mktemp
-[DEP] net-tools
-[DEP] perl
-[DEP] pkgconfig
-[DEP] popt
-[DEP] qt3
+[DEP] nas
+[DEP] phonon
+[DEP] qt4
 [DEP] sed
+[DEP] strigi
 [DEP] sysfiles
 [DEP] tar
 [DEP] util-linux
-[DEP] xextproto
-[DEP] xine-lib
-[DEP] xineramaproto
-[DEP] xproto
-[DEP] zlib
diff --git a/kde/kaffeine/kaffeine.conf b/kde/kaffeine/kaffeine.conf
deleted file mode 100644
index 298e057da..000000000
--- a/kde/kaffeine/kaffeine.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../kaffeine/kaffeine.conf
-# Copyright (C) 2007 The OpenSDE Project
-# Copyright (C) 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-
-# kaffeine tries to rebuild auto*, which does not work that easily in KDE
-kaffeine_no_auto_dance() {
-	echo -e "#!/bin/true" > admin/missing
-	rm -vf doc/CMakeLists.txt
-}
-hook_add preconf 5 kaffeine_no_auto_dance
diff --git a/kde/kaffeine/kaffeine.desc b/kde/kaffeine/kaffeine.desc
index ef003e7ef..9bcfdf9f5 100644
--- a/kde/kaffeine/kaffeine.desc
+++ b/kde/kaffeine/kaffeine.desc
@@ -28,10 +28,8 @@
 
 [L] GPL
 [S] Beta
-[V] 0.8.4
+[V] 0.99-r920764
 [P] X -----5---9 600.000
 
-[O] var_remove confopt " " "--enable-final"
-
-[D] 816223201 kaffeine-0.8.4.tar.bz2 http://dl.sourceforge.net/sourceforge/kaffeine/
-
+[D] X kaffeine-0.99-r920764.tar.bz2 svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/kaffeine -r 920764
+#[D] 816223201 kaffeine-0.8.4.tar.bz2 http://dl.sourceforge.net/sourceforge/kaffeine/
diff --git a/kde/kaffeine/mimedata.patch b/kde/kaffeine/mimedata.patch
deleted file mode 100644
index d95bcd5ad..000000000
--- a/kde/kaffeine/mimedata.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../kaffeine/mimedata.patch
-# Copyright (C) 2006 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-Problem: kaffeine installs x-mplayer2.desktop that colides with the one coming from kdelibs
-
---- ./kaffeine/mimetypes/application/Makefile.in.orig	2006-11-04 01:01:02.000000000 +0100
-+++ ./kaffeine/mimetypes/application/Makefile.in	2006-11-04 01:02:30.000000000 +0100
-@@ -337,7 +337,7 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--mime_DATA = x-kaffeine.desktop x-mplayer2.desktop
-+mime_DATA = x-kaffeine.desktop
- mimedir = $(kde_mimedir)/application
- EXTRA_DIST = $(mime_DATA)
- #>- all: all-am