Fix .desktop entry stuff properly, get rid of the seemingly improper patch for bug #186173, see also bug #221177.

(Portage version: 2.1.4.4)

3 files changed, 208 insertions, 1 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 897fac734a50..5f550b31b4f4 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.206 2008/05/31 21:12:14 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.207 2008/06/13 22:17:16 carlo Exp $
+
+*k3b-1.0.5-r1 (13 Jun 2008)
+
+  13 Jun 2008; Carsten Lohrke <carlo@gentoo.org>
+  +files/k3b-1.0.5-desktop-entry.diff, +k3b-1.0.5-r1.ebuild:
+  Fix .desktop entry stuff properly, get rid of the seemingly improper patch
+  for bug #186173, see also bug #221177.
 
 *k3b-1.0.5 (31 May 2008)
 
diff --git a/app-cdr/k3b/files/k3b-1.0.5-desktop-entry.diff b/app-cdr/k3b/files/k3b-1.0.5-desktop-entry.diff
new file mode 100644
index 000000000000..5f2e42c6c724
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0.5-desktop-entry.diff
@@ -0,0 +1,53 @@
+--- src/k3b-cue.desktop.orig	2008-06-07 03:10:55.000000000 +0200
++++ src/k3b-cue.desktop	2008-06-07 03:11:06.000000000 +0200
+@@ -10,5 +10,3 @@
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+ MimeType=application/x-cue;
+-
+-Encoding=UTF-8
+--- src/k3b-iso.desktop.orig	2008-06-07 03:09:54.000000000 +0200
++++ src/k3b-iso.desktop	2008-06-07 03:10:46.000000000 +0200
+@@ -10,4 +10,3 @@
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+ MimeType=application/x-iso;
+-Encoding=UTF-8
+--- src/k3b.desktop.orig	2008-06-07 03:11:28.000000000 +0200
++++ src/k3b.desktop	2008-06-07 03:12:05.000000000 +0200
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=k3b %U
+ Icon=k3b
+-DocPath=k3b/index.html
++X-DocPath=k3b/index.html
+ GenericName=CD & DVD Burning
+ GenericName[af]=CD & DVD Skrywer
+ GenericName[ar]= اعداد كتابة القرص المدمج(CD)  و القرص المرئي الرقمي (DVD)
+@@ -117,8 +116,8 @@
+ Name[ar]= K3b
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+-MimeType=application/x-k3b
++MimeType=application/x-k3b;
+ X-KDE-StartupNotify=true
+ X-KDE-NativeMimeType=application/x-k3b;application/x-iso
+-Categories=KDE;Application;AudioVideo;DiscBurning;
++Categories=KDE;AudioVideo;DiscBurning;
+ X-DCOP-ServiceType=Unique
+--- src/Makefile.am.orig	2008-06-07 03:18:31.000000000 +0200
++++ src/Makefile.am	2008-06-07 03:19:31.000000000 +0200
+@@ -32,10 +32,7 @@
+ 
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+ 
+-xdg_apps_DATA = k3b.desktop
+-
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
+ 
+ ###################
+ # this 10 paths are KDE specific. Use them:
diff --git a/app-cdr/k3b/k3b-1.0.5-r1.ebuild b/app-cdr/k3b/k3b-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..4870d38bd908
--- /dev/null
+++ b/app-cdr/k3b/k3b-1.0.5-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r1.ebuild,v 1.1 2008/06/13 22:17:16 carlo Exp $
+
+inherit kde eutils
+
+MY_P=${P/_/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa css dvdr dvdread encode ffmpeg flac hal mp3 musepack musicbrainz
+	sndfile vcd vorbis emovix"
+
+DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
+	media-libs/libsamplerate
+	media-libs/taglib
+	>=media-sound/cdparanoia-3.9.8
+	sndfile? ( media-libs/libsndfile )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libmad )
+	musepack? ( media-libs/libmpcdec )
+	vorbis? ( media-libs/libvorbis )
+	musicbrainz? ( =media-libs/musicbrainz-2* )
+	encode? ( media-sound/lame )
+	alsa? ( media-libs/alsa-lib )
+	dvdread? ( media-libs/libdvdread )"
+
+RDEPEND="${DEPEND}
+	virtual/cdrtools
+	>=app-cdr/cdrdao-1.1.7-r3
+	media-sound/normalize
+	dvdr? ( >=app-cdr/dvd+rw-tools-7.0 )
+	css? ( media-libs/libdvdcss )
+	encode? ( media-sound/sox
+				media-video/transcode )
+	vcd? ( media-video/vcdimager )
+	emovix? ( media-video/emovix )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+need-kde 3.5
+
+PATCHES=( "${FILESDIR}/k3b-1.0.5-desktop-entry.diff" )
+
+I18N="${PN}-i18n-${PV}"
+
+# Supported languages and translated documentation
+LANGS="af ar bg br bs ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hu is it ja ka lt mk ms nb nds nl nn pa pl pt pt_BR ru rw se sk sr sr@Latn sv ta tr uk uz zh_CN zh_TW"
+for X in ${LANGS}; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
+	IUSE="${IUSE} linguas_${X}"
+done
+
+pkg_setup() {
+	if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
+		eerror "but sys-apps/dbus is not built with Qt3 support."
+		die "Please, rebuild sys-apps/dbus with the \"qt3\" USE flag."
+	fi
+	if use encode && ! built_with_use media-video/transcode dvdread; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"encode\""
+		eerror "USE flag enabled, however media-video/transcode was not built"
+		eerror "with libdvdread support. Also keep in mind that enabling"
+		eerror "the dvdread USE flag will cause k3b to use libdvdread as well."
+		die "Please, rebuild media-video/transcode with the \"dvdread\" USE flag."
+	fi
+
+	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
+		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
+		eerror "Please enable the cxx USE flag for media-libs/flac"
+		die "Missing FLAC C++ bindings."
+	fi
+
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		cd "${WORKDIR}/${I18N}"
+		for X in ${LANGS}; do
+			use linguas_${X} || rm -rf "${X}"
+		done
+		rm -f configure
+	fi
+	rm -f "${S}/configure"
+}
+
+src_compile() {
+	local myconf="--enable-libsuffix=		\
+			--with-external-libsamplerate	\
+			--without-resmgr				\
+			--without-cdrecord-suid-root	\
+			--without-k3bsetup				\
+			$(use_with hal)					\
+			$(use_with encode lame)			\
+			$(use_with ffmpeg)				\
+			$(use_with flac)				\
+			$(use_with vorbis oggvorbis)	\
+			$(use_with sndfile)				\
+			$(use_with mp3 libmad)			\
+			$(use_with musepack)			\
+			$(use_with musicbrainz)			\
+			$(use_with alsa)"
+
+	# Build process of K3b
+	kde_src_compile
+
+	# Build process of K3b-i18n
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		KDE_S="${WORKDIR}/${I18N}" \
+		kde_src_compile
+	fi
+}
+
+src_install() {
+	kde_src_install
+	dodoc FAQ KNOWNBUGS PERMISSIONS
+
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		KDE_S="${WORKDIR}/${I18N}" \
+		kde_src_install
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}