Adjust dependencies. Get rid of invalid aRts dependency. Fix desktop file.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

6 files changed, 107 insertions, 4 deletions

diff --git a/app-cdr/kcdlabel/Manifest b/app-cdr/kcdlabel/Manifest
index 3a0284d76e34..a946377769b5 100644
--- a/app-cdr/kcdlabel/Manifest
+++ b/app-cdr/kcdlabel/Manifest
@@ -1,6 +1,8 @@
+AUX kcdlabel-2.13-desktop-file.diff 3574 RMD160 49b765a64a7ee9266ea2d0405d191e327afe0bb3 SHA1 461c1e1e218673d6cf70225499f378135aa9c48b SHA256 37b82087f5b09f13141250bb562c89a625f51496984e54cc9d3de993d5b408fb
 AUX kcdlabel-2.13-desktop_file.patch 579 RMD160 85d043def2cc88da8f57fb515f05023f8a786bd9 SHA1 0c85cf99e4e824f0937c3d35bd99321196920b67 SHA256 fecd79ba80c2fb5e720bb62b7d497ce501aae2646b35032df5c757b8aca28a1d
 DIST kcdlabel-2.13-KDE3.tar.gz 662429 RMD160 295af15c0cda6fd60b51e033a7e8a0e007af9646 SHA1 051d1d875b39be2394bf451f9ab82fe665b40267 SHA256 2ca953bb87ecb7fe7d4617063b3faf91dc8bac906c2fb0056d5bb9f459bfd7ff
 DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
+EBUILD kcdlabel-2.13-r1.ebuild 936 RMD160 1dabda0b306b63f33c9a4d5d7683d7c771cd6b87 SHA1 af92ced2679981801a5aa6e8e5b2450a99670959 SHA256 5d441d0f086ad50bbd2d833cefb134386290fa72ad7c1663e7e120eb71aba20d
 EBUILD kcdlabel-2.13.ebuild 731 RMD160 5bc557d9afc6dc2f1142db2c1f6d16199153ffca SHA1 127041dc27c6496c637caac660a03632311dc7dc SHA256 936a6cba896ff3b9b0c82323b0b6058e1750b46db3182e45102c0fa8bab92e5c
-MISC ChangeLog 2976 RMD160 25d63eb5c42b72880096855ecba4916b1d617171 SHA1 34a6aa37082cf2c8a7f37c94c20543a9bb693e6f SHA256 bb1344e056ee867037c6d904859e9fbb2c22b40b1c81f9b2d0a05dd162232742
+MISC ChangeLog 3190 RMD160 774ad5f21917d9fb72b2930f61ae3ee0d071fb2d SHA1 2b9079358483f0eae10959495350747916c6b441 SHA256 08cef394fec0a02e7952e6761b6f0e9dfbebf13e15d61186aa523cefc6d724a2
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-cdr/koverartist/ChangeLog b/app-cdr/koverartist/ChangeLog
index caaa94509b16..49a973972b5d 100644
--- a/app-cdr/koverartist/ChangeLog
+++ b/app-cdr/koverartist/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/koverartist
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/koverartist/ChangeLog,v 1.27 2008/06/07 12:11:20 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/koverartist/ChangeLog,v 1.28 2009/02/22 21:41:24 carlo Exp $
+
+*koverartist-0.5-r1 (22 Feb 2009)
+
+  22 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/koverartist-0.5-desktop-file.diff,
+  +files/koverartist-0.5-gcc43b.patch, +koverartist-0.5-r1.ebuild:
+  Adjust dependencies. Get rid of invalid aRts dependency. Fix desktop file.
 
   07 Jun 2008; Samuli Suominen <drac@gentoo.org>
   +files/koverartist-0.5-gcc43.patch, koverartist-0.5.ebuild:
diff --git a/app-cdr/koverartist/Manifest b/app-cdr/koverartist/Manifest
index 9105364c76b7..0aa33c9dbd39 100644
--- a/app-cdr/koverartist/Manifest
+++ b/app-cdr/koverartist/Manifest
@@ -1,5 +1,8 @@
+AUX koverartist-0.5-desktop-file.diff 1136 RMD160 6d78a2830005a7d39989cdbc68c8088776c4a0a4 SHA1 47288020b32a1d15ad76888e0e33f7f7ada95828 SHA256 0b7c5ed0f56cfbdc9566860d0e6baf4b7fdc6cf34f5b071aa3a104f00919ab79
 AUX koverartist-0.5-gcc43.patch 869 RMD160 00532900102bd59cc218d03f788e78886fae7c32 SHA1 41c1121a0152fd37bf6b308d4308863263af54d9 SHA256 d03d79ac9e544d6505d3875b3a6e8bc6722584020b39fa04f37b39b7f414c435
+AUX koverartist-0.5-gcc43b.patch 349 RMD160 35ec4babe4c63cb79b6de539123936bb4f326967 SHA1 27eddeec6ea3af6b06491bff83077de37350debf SHA256 7ea84f86eea5b78900b087253cb2e0925e070e1a8469f793065350e62e32bda8
 DIST koverartist-0.5.tar.bz2 748401 RMD160 63ee6623b04dabdf8661e2f7eea162b1f15e9802 SHA1 2fff3824c7b72a769dd2960bdc38d4dd5ff9e263 SHA256 537f0c5b18b0b74698304456d5babfeb8bb8bad5e2f8749929b4175db9de8d48
+EBUILD koverartist-0.5-r1.ebuild 1014 RMD160 14d94ebd96101fa9dda0cde588e1fadfea1b121e SHA1 ce9ec3247485a6a33598000c0dd23bc42dc303a9 SHA256 d967e60e6f185ff98c2dfde824073d99c670632f6d90765d6205a5643f5ac67a
 EBUILD koverartist-0.5.ebuild 896 RMD160 ee777f1b5827e94475e43343e2883729dd436f97 SHA1 4ff247cb974907e4b7d62adc8bf4b664e4b544b9 SHA256 e29130c858bc1d5e100aae2a23dadf724edd1b84851617f100245d370fa896b5
-MISC ChangeLog 3323 RMD160 4f0ee5095bbb539ccef14e921a38b6d2765b74fa SHA1 417114e0956c6421640f1bbfc20de2286a58dccc SHA256 f534c874aaf2e78c6b2cf557cb94833b827497f21a66bf5f753ef9836a13d983
+MISC ChangeLog 3597 RMD160 b47cc92ba97d2ec1f7fba71f752b12a05f9336b8 SHA1 198dacf359ee5d386de64142463bca23595932c3 SHA256 57f77813c20d79aad9740ab1e386a1048ea2af205ef6e722996b0fefeced0568
 MISC metadata.xml 347 RMD160 8b6e426042b32a7950e6e51f92a8859e417c8ee3 SHA1 1370a5aab69d14cc8d738071364bfb740afbb7ea SHA256 07717af6db46dce0d0b6497b8967574f8509b76cead61ef3cbeaa408ccde8ada
diff --git a/app-cdr/koverartist/files/koverartist-0.5-desktop-file.diff b/app-cdr/koverartist/files/koverartist-0.5-desktop-file.diff
new file mode 100644
index 000000000000..02801abad6bd
--- /dev/null
+++ b/app-cdr/koverartist/files/koverartist-0.5-desktop-file.diff
@@ -0,0 +1,38 @@
+--- src/koverartist.desktop.o	2009-02-17 02:35:51.000000000 +0100
++++ src/koverartist.desktop	2009-02-17 02:42:18.000000000 +0100
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KoverArtist
+ Name[xx]=xxKoverArtistxx
+-Exec=koverartist %i %m -caption "%c"
++Exec=koverartist %i -caption "%c"
+ Icon=koverartist
+ Type=Application
+-DocPath=koverartist/koverartist.html
++X-DocPath=koverartist/koverartist.html
+ Comment=A KDE KPart Application
+ Comment[br]=Ur meziant Kpart evit KDE
+ Comment[ca]=Una aplicació KPart per a KDE
+@@ -41,3 +40,4 @@
+ Comment[xx]=xxA KDE KPart Applicationxx
+ Comment[zh_CN]=一个 KDE KPart 应用程序
+ Terminal=false
++Categories=Qt;KDE;Graphics;DiscBurning;
+--- src/Makefile.am.o	2009-02-17 02:32:07.000000000 +0100
++++ src/Makefile.am	2009-02-17 03:10:29.000000000 +0100
+@@ -34,13 +34,10 @@
+ 
+ EXTRA_DIST = $(cases_DATA)
+ 
+-kdelnkdir   = $(kde_appsdir)/Multimedia
+-kdelnk_DATA = koverartist.desktop
+-
+ rcdir = $(kde_datadir)/koverartist
+ rc_DATA = koverartistui.rc
+ 
+-appsdir = $(kde_appsdir)/Multimedia
++appsdir = $(xdg_appsdir)
+ apps_DATA = koverartist.desktop
+ 
+ mimedir = $(kde_mimedir)/application
diff --git a/app-cdr/koverartist/files/koverartist-0.5-gcc43b.patch b/app-cdr/koverartist/files/koverartist-0.5-gcc43b.patch
new file mode 100644
index 000000000000..d6918a55a96e
--- /dev/null
+++ b/app-cdr/koverartist/files/koverartist-0.5-gcc43b.patch
@@ -0,0 +1,12 @@
+diff -ur koverartist.orig/src/cddbquery.cpp koverartist/src/cddbquery.cpp
+--- koverartist.orig/src/cddbquery.cpp	2006-11-01 12:42:59.000000000 +0200
++++ koverartist/src/cddbquery.cpp	2008-06-07 14:56:35.000000000 +0300
+@@ -34,7 +34,7 @@
+ #include <iostream>
+ #include <errno.h>
+ #include <string.h>
+-
++#include <stdlib.h>
+ 
+ 
+ #ifdef ENABLE_AUDIOCD
diff --git a/app-cdr/koverartist/koverartist-0.5-r1.ebuild b/app-cdr/koverartist/koverartist-0.5-r1.ebuild
new file mode 100644
index 000000000000..a4e494984dfb
--- /dev/null
+++ b/app-cdr/koverartist/koverartist-0.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/koverartist/koverartist-0.5-r1.ebuild,v 1.1 2009/02/22 21:41:24 carlo Exp $
+
+EAPI="1"
+
+ARTS_REQUIRED="never"
+
+inherit kde
+
+DESCRIPTION="Koverartist is a KDE program for fast creation of covers for cd/dvd cases and boxes."
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=38195"
+SRC_URI="http://members.inode.at/499177/software/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cddb"
+
+DEPEND="!app-cdr/kover"
+RDEPEND="${DEPEND}
+	cddb?  ( || ( ( kde-base/libkcddb:3.5 kde-base/kdemultimedia-kioslaves:3.5 )
+			kde-base/kdemultimedia:3.5 ) )"
+need-kde 3.5
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/koverartist-0.5-gcc43b.patch"
+	"${FILESDIR}/koverartist-0.5-desktop-file.diff"
+	)
+
+src_unpack() {
+	kde_src_unpack
+	rm -f "${S}"/configure
+}
+
+src_compile() {
+	local myconf="$(use_with cddb audiocd)"
+	kde_src_compile
+}