Get rid of invalid aRts dependency. Improved desktop file fix.

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

3 files changed, 91 insertions, 2 deletions

diff --git a/app-cdr/kcdlabel/ChangeLog b/app-cdr/kcdlabel/ChangeLog
index dc9b208e04ba..8a475b34d12b 100644
--- a/app-cdr/kcdlabel/ChangeLog
+++ b/app-cdr/kcdlabel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/kcdlabel
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdlabel/ChangeLog,v 1.25 2008/02/15 16:12:02 armin76 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdlabel/ChangeLog,v 1.26 2009/02/22 21:43:57 carlo Exp $
+
+*kcdlabel-2.13-r1 (22 Feb 2009)
+
+  22 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  +files/kcdlabel-2.13-desktop-file.diff, +kcdlabel-2.13-r1.ebuild:
+  Get rid of invalid aRts dependency. Improved desktop file fix.
 
   15 Feb 2008; Raúl Porcel <armin76@gentoo.org> kcdlabel-2.13.ebuild:
   sparc stable wrt #209880
diff --git a/app-cdr/kcdlabel/files/kcdlabel-2.13-desktop-file.diff b/app-cdr/kcdlabel/files/kcdlabel-2.13-desktop-file.diff
new file mode 100644
index 000000000000..688c3bed61bd
--- /dev/null
+++ b/app-cdr/kcdlabel/files/kcdlabel-2.13-desktop-file.diff
@@ -0,0 +1,41 @@
+--- ./kcdlabel/kcdlabel.desktop.orig	2009-02-18 02:02:43.000000000 +0100
++++ ./kcdlabel/kcdlabel.desktop	2009-02-18 02:02:43.000000000 +0100
+@@ -1,12 +1,11 @@
+ # KDE Config File  
+-[KDE Desktop Entry]
++[Desktop Entry]
+ Type=Application
+-Exec=kcdlabel -caption "%c" %i %m  
+-Icon=kcdlabel.xpm
+-MiniIcon=kcdlabel.xpm
+-DocPath=kcdlabel/index.html
++Exec=kcdlabel -caption "%c" %i  
++Icon=kcdlabel
++X-DocPath=kcdlabel/index.html
+ Comment=
+ Comment[de]=
+-Terminal=0
++Terminal=false
+ Name=KCDLabel
+ Name[de]=KCDLabel
+--- ./kcdlabel/Makefile.am.orig	2009-02-18 02:02:43.000000000 +0100
++++ ./kcdlabel/Makefile.am	2009-02-18 02:02:43.000000000 +0100
+@@ -11,15 +11,15 @@
+ EXTRA_DIST = kcdlabel.desktop kcdlabel.xpm mini-kcdlabel.xpm about.cpp about.h StringCurvedEdit.kdevdlg about.kdevdlg aboutdata.cpp bodylayout.cpp bodylayout.h bodylayout.kdevdlg bodylayoutdata.cpp id.h kcdlabel.cpp kcdlabel.h kcoverback.cpp kcoverback.h kcoverbody.cpp kcoverbody.h kcovercurvedstring.cpp kcovercurvedstring.h kcoverfont.cpp kcoverfont.h kcoverimage.cpp kcoverimage.h kcovermultistring.cpp kcovermultistring.h kcoverobject.h kcoverpage.cpp kcoverpage.h kcoverstring.cpp kcoverstring.h kdirtree.cpp kdirtree.h koverobject.cpp main.cpp pagenumber.kdevdlg pagenumberdlg.cpp pagenumberdlg.h pagenumberdlgdata.cpp pixmaps.cpp pixmaps.h qscrollframe.cpp qscrollframe.h scaleimagedlg.cpp scaleimagedlg.h scaleimagedlg.kdevdlg scaleimagedlgdata.cpp sideedit.h sideedit.kdevdlg sideeditdlg.cpp sideeditdlg.h sideeditdlgdata.cpp sourceselect.kdevdlg sourceselectdlg.cpp sourceselectdlg.h sourceselectdlgdata.cpp stringcurvededit.cpp stringcurvededit.h stringcurvededitdata.cpp stringedit.kdevdlg stringeditdlg.cpp stringeditdlg.h stringeditdlgdata.cpp stringmultilinedlg.cpp stringmultilinedlg.h stringmultilinedlg.kdevdlg stringmultilinedlgdata.cpp thanksdlg.cpp thanksdlg.h thanksdlg.kdevdlg thanksdlgdata.cpp version.h kcoverroundpage.cpp kcoverroundpage.h kprintround.cpp kprintround.kdevdlg kprintrounddlg.h kprintrounddlg.cpp kprintrounddlgdata.cpp README-round-labels centrejust.xpm delete.xpm filenew.xpm fileopen.xpm fileprint.xpm filesaveas.xpm image.xpm rainbowtext.xpm text.xpm kcoverbackground.cpp kcoverbackground.h background.kdevdlg backgrounddialog.h backgrounddialog.cpp backgrounddialogdata.cpp kroundcoverbackground.cpp kroundcoverbackground.h align.h aligndlg.kdevdlg aligndlg.h aligndlg.cpp aligndlgdata.cpp kcoverobjectcontainer.cpp kcoverobjectcontainer.h psocket.cpp psocket.h cddb.cpp cddb.h audiocd.cpp audiocd.h cddbaccess.kdevdlg cddbaccessdialog.h cddbaccessdialog.cpp cddbaccessdialogdata.cpp cddbmatchcddialog.kdevdlg cddbmatchcddlg.h cddbmatchcddlg.cpp cddbmatchcddlgdata.cpp cddbinexactmatchdlg.kdevdlg cddbinexactmatchdlg.h cddbinexactmatchdlg.cpp cddbinexactmatchdlgdata.cpp 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(kde_appsdir)/Multimedia/
+-	$(INSTALL_DATA) $(srcdir)/kcdlabel.desktop $(kde_appsdir)/Multimedia/kcdlabel.desktop
++	$(mkinstalldirs) $(xdg_appsdir)/
++	$(INSTALL_DATA) $(srcdir)/kcdlabel.desktop $(xdg_appsdir)/kcdlabel.desktop
+ 	$(mkinstalldirs) $(kde_icondir)/medium/locolor/apps/
+ 	$(INSTALL_DATA) $(srcdir)/kcdlabel.xpm $(kde_icondir)/medium/locolor/apps/kcdlabel.xpm
+ 	$(mkinstalldirs) $(kde_icondir)/small/locolor/apps/
+ 	$(INSTALL_DATA) $(srcdir)/mini-kcdlabel.xpm $(kde_icondir)/small/locolor/apps/mini-kcdlabel.xpm
+ 
+ uninstall-local:
+-	-rm -f $(kde_appsdir)/Multimedia/kcdlabel.desktop
++	-rm -f $(xdg_appsdir)/kcdlabel.desktop
+ 	-rm -f $(kde_icondir)/medium/locolor/apps/kcdlabel.xpm
+ 	-rm -f $(kde_icondir)/small/locolor/apps/kcdlabel.xpm
+ 
diff --git a/app-cdr/kcdlabel/kcdlabel-2.13-r1.ebuild b/app-cdr/kcdlabel/kcdlabel-2.13-r1.ebuild
new file mode 100644
index 000000000000..b3e853386eb1
--- /dev/null
+++ b/app-cdr/kcdlabel/kcdlabel-2.13-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kcdlabel/kcdlabel-2.13-r1.ebuild,v 1.1 2009/02/22 21:43:57 carlo Exp $
+
+ARTS_REQUIRED="never"
+
+inherit flag-o-matic kde eutils
+
+DESCRIPTION="KCDLabel is a KDE program used to create covers, labels and booklets for your CD cases."
+HOMEPAGE="http://kcdlabel.sourceforge.net/"
+SRC_URI="http://kcdlabel.sourceforge.net/download/${P}-KDE3.tar.gz
+	mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+need-kde 3.5
+
+S="${WORKDIR}/${P}-KDE3"
+
+PATCHES=(
+	"${FILESDIR}/kcdlabel-2.13-desktop-file.diff"
+	)
+
+src_unpack() {
+	kde_src_unpack
+
+	rm -f "${S}"/configure
+}
+
+src_compile(){
+	append-flags -fpermissive
+	kde_src_compile all
+}
+
+src_install(){
+	kde_src_install
+	insinto /usr/share/pixmaps
+	doins "${S}"/kcdlabel/icons/kcdlabel.xpm
+}