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

Package-Manager: portage-2.1.4.4

4 files changed, 211 insertions, 12 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/Manifest b/app-cdr/k3b/Manifest
index 86893d75fed1..a0560e97c440 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX k3b-0.12.17+flac-1.1.3.patch 5567 RMD160 a20b5ae7a752b9f91c479218e75ba173af48be44 SHA1 41eae878580d21341ef6b1549a7d43df39c470d6 SHA256 4df6f523d8a05485bf1ccd3cda367460d234dc1b47564e6e8a52bfa58413149c
 AUX k3b-0.12.17-flac-beta.patch 1282 RMD160 c91a54ca3f54e34cd6805b39e5bbbdc058eaa394 SHA1 53a79cb65025ea4a2f31096a891f750b0b7711c9 SHA256 6f74700e5920ac2ec751ee16a8933cb3de5a6b3d6ea90d3a4e1d3d3815b7b8bc
 AUX k3b-1.0-alsa-fix.patch 669 RMD160 0e4ac67c18db77d655f482d2607cffef2ba9d0ab SHA1 b036e9932eb31ecc037ddfa0a58320248319f97f SHA256 31ac29a43f931786a4c71d3824a15abbb36a4439977eace2c668bcd53912536f
 AUX k3b-1.0.1-hidden.patch 1349 RMD160 15af630c21a2b7f60247917d59e6f63ed7ab2196 SHA1 dc20ef921ead5841ec9d498c5d350d96e808ab30 SHA256 47cc0385b47b82f3b66770c1c61afda80ab197e08fbe928c2f121e5010309306
 AUX k3b-1.0.4-eject_186173.patch 3382 RMD160 2635fd05f35fd68a2eb9fac0f481accf711b81c3 SHA1 d7c52ee27631fd2abf0492d12a635d2ab9f33cdb SHA256 dccc64f4163b734122df739b7887e4fd2fe9cdd4d5522f9b02a43548fc77d2f2
+AUX k3b-1.0.5-desktop-entry.diff 1756 RMD160 540b5336fde1206eba74ac25a4fd0276978ad9c6 SHA1 d817a1da34cc6207a1d5fcac0d5ba67a3964afc0 SHA256 3d89ee4194abe8312e7373161bac8b9134850906be9c6e738571f9de7adfb34b
 AUX k3b-1.0.5-eject_186173.patch 3382 RMD160 2635fd05f35fd68a2eb9fac0f481accf711b81c3 SHA1 d7c52ee27631fd2abf0492d12a635d2ab9f33cdb SHA256 dccc64f4163b734122df739b7887e4fd2fe9cdd4d5522f9b02a43548fc77d2f2
 DIST k3b-0.12.17.tar.bz2 4008650 RMD160 bb791d7d003285f6623229eae213cf224fd3a128 SHA1 ae23be594b6e2c116fd4c2af8cefb438423d1285 SHA256 067ef9d621bed9a1c385c201b13810f11305edf03a7da0793cb059bb578700b7
 DIST k3b-1.0.1.tar.bz2 5097997 RMD160 e4eeab9bec1a2ac222ed91fd6688a3c272ec7670 SHA1 5473aeaf974ba058d2f9124b0314b64838d0e2bd SHA256 609c56d4a9e0b41d545e377d61904e99a46e878280d6a6651a65f72f94acb65e
@@ -28,14 +26,8 @@ EBUILD k3b-1.0.2.ebuild 4195 RMD160 83f94466ec832edc73aa2037edddb87e5534dbd7 SHA
 EBUILD k3b-1.0.3.ebuild 4263 RMD160 8a7e417077b6ac1f639486332b12692ecd67b2b0 SHA1 494e1867a0ccfc95f43aea0e9114904322738585 SHA256 4b7bdd868ee318a533b505a75626ff3a1cad8b5b56089f1b8552f1491828ffa9
 EBUILD k3b-1.0.4-r1.ebuild 4499 RMD160 c2222ec434c0426cd0b0d19fa3e0f25a69f83af4 SHA1 d928febc883a1a04f317117fff7bbe0308ab1fde SHA256 c31c7825bd22994db43a83a98ec01a6d3032bdf2c8cb8242062c353010b8341f
 EBUILD k3b-1.0.4.ebuild 4236 RMD160 3649bb5a419a6409b2dde525b7972d3ec652e1aa SHA1 cc95beaf328df2c5c1baf082bbe54dbe9599dd40 SHA256 ad29eb01f6da2230cfb679bf1a449525a33aaa065a83750f650f249b8f5739a6
+EBUILD k3b-1.0.5-r1.ebuild 4298 RMD160 4f46a1929c07d4923b671c04d8e482ad1f165327 SHA1 d8091bab883e33158927a1bd8ceefe60b7814f97 SHA256 7541d593bd1719d38381300b8c40282348ba8e1e3556d0735eefd1264684e2f6
 EBUILD k3b-1.0.5.ebuild 4497 RMD160 0d56b842cfff6b922aaf079e0612f4a3e305c872 SHA1 324c95657ddfd3c7f0c6ffd3f9f080dbf699aa66 SHA256 82b6f7baabc29861671db8114230e372f5cacf8a0198460623d859589fa5009c
 EBUILD k3b-1.0.ebuild 4412 RMD160 0439c8da03de179399cf6e7a298dddb63f3b8614 SHA1 8f998c522a5f900d9264c0f372d3e0017cc4552b SHA256 2d56f597b3638cf0ae25b75198f8a1fee50e7c39f00fdc9fdbdcb34b75f079b7
-MISC ChangeLog 30102 RMD160 9341f0b6e00ecd9c8493e93f61670a899eff05a2 SHA1 e086aafd3f9dc46cf909d4428448be9e1dc9687a SHA256 29bc1fc143df49b1925eb82d7edbcd732bac835288e9f9d9ecb94eb6d13f6f5f
+MISC ChangeLog 30354 RMD160 a3fbd0de54591b854e3df5044845832a9703ff9f SHA1 358b73c86e278e501814db5d256a6196f87d0d9f SHA256 545c7d162490bfe4c6898a8a80bd363cb09973a0f447da13809e63603e608078
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhBvzoACgkQwMU+7UfzcKAeKgCdGJ5hdy23V4TWa1f9bSHziGT3
-vnwAni3jWkscwGVC5zlRnINkN/+ML9SM
-=0A9K
------END PGP SIGNATURE-----
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
+}