Assorted fixes, triggered by bug #223765.

(Portage version: 2.1.4.4)

6 files changed, 41 insertions, 76 deletions

diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog
index 908b459147fb..beb3675c7ba6 100644
--- a/app-cdr/k9copy/ChangeLog
+++ b/app-cdr/k9copy/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-cdr/k9copy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.35 2008/03/28 20:43:18 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.36 2008/06/30 02:50:46 carlo Exp $
+
+*k9copy-1.2.3-r1 (30 Jun 2008)
+
+  30 Jun 2008; Carsten Lohrke <carlo@gentoo.org>
+  -files/k9copy-1.1.2_p2-desktop-entry.diff,
+  -files/k9copy-1.2.2-desktop-entry.diff,
+  -files/k9copy-1.2.3-desktop-entry.diff,
+  +files/k9copy-1.2.3-desktop-entry-2.diff, -k9copy-1.2.3.ebuild,
+  +k9copy-1.2.3-r1.ebuild:
+  Assorted fixes, triggered by bug #223765.
 
   28 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
   +files/k9copy-1.2.3-gcc43.patch, k9copy-1.2.3.ebuild:
diff --git a/app-cdr/k9copy/files/k9copy-1.1.2_p2-desktop-entry.diff b/app-cdr/k9copy/files/k9copy-1.1.2_p2-desktop-entry.diff
deleted file mode 100644
index 6070e4514090..000000000000
--- a/app-cdr/k9copy/files/k9copy-1.1.2_p2-desktop-entry.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/k9copy.desktop.orig	2007-03-31 20:40:20.000000000 +0200
-+++ src/k9copy.desktop	2007-03-31 20:54:31.000000000 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Encoding=UTF-U
-+Encoding=UTF-8
- Type=Application
- Name=k9copy
- Exec=k9copy -caption "%c" %i %m  %u
-@@ -11,5 +11,5 @@
- Terminal=false
- Icon=k9copy.png
- DocPath=k9copy/index.html
--Categories=KDE;Application;AudioVideo;DiscBurning;
--X-KDE-StartupNotify=true
-\ No newline at end of file
-+Categories=Qt;KDE;AudioVideo;DiscBurning;
-+X-KDE-StartupNotify=true
diff --git a/app-cdr/k9copy/files/k9copy-1.2.2-desktop-entry.diff b/app-cdr/k9copy/files/k9copy-1.2.2-desktop-entry.diff
deleted file mode 100644
index 161df1e5e555..000000000000
--- a/app-cdr/k9copy/files/k9copy-1.2.2-desktop-entry.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/Makefile.am.orig	2007-12-31 20:06:28.000000000 +0100
-+++ src/Makefile.am	2007-12-31 20:07:17.000000000 +0100
-@@ -50,7 +50,7 @@
- AM_CXXFLAGS = -O3 -g3
- 
- applnkMultimedia_DATA = k9copy.desktop
--applnkMultimediadir = $(kde_appsdir)/Multimedia
-+applnkMultimediadir = $(xdg_appsdir)
- SUBDIRS = icons
- 
- konquerorServicesMenusdir = $(kde_datadir)/konqueror/servicemenus
---- src/k9copy.desktop.orig	2007-12-31 20:08:14.000000000 +0100
-+++ src/k9copy.desktop	2007-12-31 20:14:04.000000000 +0100
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Type=Application
- Name=k9copy
- Exec=k9copy -caption "%c" %i %m  %u
-@@ -9,9 +8,8 @@
- GenericName=Video DVD Backup
- GenericName[fr]=Backup de DVD Video
- GenericName[tr]=DVD Vidyo Yedekleme Aracı
--MimeTypes=
- Terminal=false
--Icon=k9copy.png
--DocPath=k9copy/index.html
-+Icon=k9copy
-+X-DocPath=k9copy/index.html
- Categories=Qt;KDE;AudioVideo;DiscBurning;
--X-KDE-StartupNotify=true
-\ No newline at end of file
-+X-KDE-StartupNotify=true
diff --git a/app-cdr/k9copy/files/k9copy-1.2.3-desktop-entry-2.diff b/app-cdr/k9copy/files/k9copy-1.2.3-desktop-entry-2.diff
new file mode 100644
index 000000000000..02842f8321d4
--- /dev/null
+++ b/app-cdr/k9copy/files/k9copy-1.2.3-desktop-entry-2.diff
@@ -0,0 +1,23 @@
+--- src/k9copy.desktop.orig	2008-06-30 04:36:56.000000000 +0200
++++ src/k9copy.desktop	2008-06-30 04:37:20.000000000 +0200
+@@ -1,17 +1,15 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Name=k9copy
+-Exec=k9copy -caption "%c" %i %m  %u
++Exec=k9copy -caption "%c" %i %u
+ Comment=DVD9 to DVD5 backup tool
+ Comment[fr]=Backup de DVD9 en DVD5
+ Comment[tr]=DVD9 DVD5 yedekleme aracı
+ GenericName=Video DVD Backup
+ GenericName[fr]=Backup de DVD Video
+ GenericName[tr]=DVD Vidyo Yedekleme Aracı
+-MimeTypes=
+ Terminal=false
+ Icon=k9copy
+ X-DocPath=k9copy/index.html
+ Categories=Qt;KDE;AudioVideo;DiscBurning;
+-X-KDE-StartupNotify=true
+\ No newline at end of file
++X-KDE-StartupNotify=true
diff --git a/app-cdr/k9copy/files/k9copy-1.2.3-desktop-entry.diff b/app-cdr/k9copy/files/k9copy-1.2.3-desktop-entry.diff
deleted file mode 100644
index bc610ef9d59d..000000000000
--- a/app-cdr/k9copy/files/k9copy-1.2.3-desktop-entry.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/k9copy.desktop.orig	2008-01-20 15:49:47.000000000 +0100
-+++ src/k9copy.desktop	2008-01-20 15:50:02.000000000 +0100
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Type=Application
- Name=k9copy
- Exec=k9copy -caption "%c" %i %m  %u
-@@ -9,7 +8,6 @@
- GenericName=Video DVD Backup
- GenericName[fr]=Backup de DVD Video
- GenericName[tr]=DVD Vidyo Yedekleme Aracı
--MimeTypes=
- Terminal=false
- Icon=k9copy
- X-DocPath=k9copy/index.html
diff --git a/app-cdr/k9copy/k9copy-1.2.3.ebuild b/app-cdr/k9copy/k9copy-1.2.3-r1.ebuild
index 8db23fc5ade8..51ddbe38b60a 100644
--- a/app-cdr/k9copy/k9copy-1.2.3.ebuild
+++ b/app-cdr/k9copy/k9copy-1.2.3-r1.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.3.ebuild,v 1.4 2008/06/15 12:17:30 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.3-r1.ebuild,v 1.1 2008/06/30 02:50:46 carlo Exp $
 
 EAPI="1"
 
+ARTS_REQUIRED="never"
+
 inherit kde
 
 MY_P="${P/_p/-}"
@@ -16,20 +18,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-DEPEND="media-video/dvdauthor
-	media-libs/libdvdread
-	media-libs/libdvdnav
-	app-cdr/dvd+rw-tools
-	>=media-video/vamps-0.98
+DEPEND="media-libs/libdvdread
 	>=app-cdr/k3b-0.12.10
 	dev-libs/dbus-qt3-old
 	sys-apps/hal
 	>=media-video/ffmpeg-0.4.9_p20070616
 	media-video/mplayer"
-
+RDEPEND="${DEPEND}
+	media-video/dvdauthor"
 need-kde 3.5
 
-PATCHES=( "${FILESDIR}"/${P}-desktop-entry.diff
+PATCHES=( "${FILESDIR}"/${P}-desktop-entry-2.diff
 		"${FILESDIR}"/${P}-gcc43.patch )
 
 pkg_setup() {