Install k3b-iso.desktop, k3b-cue.desktop with NoDisplay=true. Fixes bug 175263.

Package-Manager: portage-2.1.2.8

5 files changed, 226 insertions, 5 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index fffa57ec6b18..df3e864c68aa 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.190 2007/04/19 11:23:57 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.191 2007/05/26 14:29:32 philantrop Exp $
+
+*k3b-1.0.1-r1 (26 May 2007)
+
+  26 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/k3b-1.0.1-hidden.patch, +k3b-1.0.1-r1.ebuild:
+  Install k3b-iso.desktop, k3b-cue.desktop with NoDisplay=true. Fixes bug 175263.
 
 *k3b-1.0.1 (19 Apr 2007)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index a9047f74f945..8728350cbcde 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX k3b-0.12.17+flac-1.1.3.patch 5567 RMD160 a20b5ae7a752b9f91c479218e75ba173af48be44 SHA1 41eae878580d21341ef6b1549a7d43df39c470d6 SHA256 4df6f523d8a05485bf1ccd3cda367460d234dc1b47564e6e8a52bfa58413149c
 MD5 3c1b356f78064e41f208592f55a90c87 files/k3b-0.12.17+flac-1.1.3.patch 5567
 RMD160 a20b5ae7a752b9f91c479218e75ba173af48be44 files/k3b-0.12.17+flac-1.1.3.patch 5567
@@ -10,6 +13,10 @@ AUX k3b-1.0-alsa-fix.patch 669 RMD160 0e4ac67c18db77d655f482d2607cffef2ba9d0ab S
 MD5 4620cbaa9fa65400c40353a62cd3505d files/k3b-1.0-alsa-fix.patch 669
 RMD160 0e4ac67c18db77d655f482d2607cffef2ba9d0ab files/k3b-1.0-alsa-fix.patch 669
 SHA256 31ac29a43f931786a4c71d3824a15abbb36a4439977eace2c668bcd53912536f files/k3b-1.0-alsa-fix.patch 669
+AUX k3b-1.0.1-hidden.patch 1349 RMD160 15af630c21a2b7f60247917d59e6f63ed7ab2196 SHA1 dc20ef921ead5841ec9d498c5d350d96e808ab30 SHA256 47cc0385b47b82f3b66770c1c61afda80ab197e08fbe928c2f121e5010309306
+MD5 22706ed658ccbf7fdc1f7e3e5b0c4edf files/k3b-1.0.1-hidden.patch 1349
+RMD160 15af630c21a2b7f60247917d59e6f63ed7ab2196 files/k3b-1.0.1-hidden.patch 1349
+SHA256 47cc0385b47b82f3b66770c1c61afda80ab197e08fbe928c2f121e5010309306 files/k3b-1.0.1-hidden.patch 1349
 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
 DIST k3b-1.0.tar.bz2 5102225 RMD160 27c2cf0a96a037f0807a7b4f6ae393c1c68a2442 SHA1 b6879517825c336df36f65b212a871ef77762981 SHA256 b1ab85ad003b3362a964e7516ba21ecb238b199379e449980041a4292d8d2294
@@ -20,6 +27,10 @@ EBUILD k3b-0.12.17.ebuild 3419 RMD160 df2e1baa173c34423522df391fdc2888f2256308 S
 MD5 334097dbea1f4e30d4feea4f452cd2f3 k3b-0.12.17.ebuild 3419
 RMD160 df2e1baa173c34423522df391fdc2888f2256308 k3b-0.12.17.ebuild 3419
 SHA256 0fb65ffcd8fd3a6b9f7f48ea1696b0210f6d3d18a73384a593c27677804774e9 k3b-0.12.17.ebuild 3419
+EBUILD k3b-1.0.1-r1.ebuild 4279 RMD160 ab3900a64425995eb2349083f237b1ef5283e834 SHA1 007323e583b1fbfbc486bbaaf1cb21d4619cef0e SHA256 0b68512129e887b62d0f9cb9cf90caec1b107279fb158be088efee72f2a621a1
+MD5 53739c3eb12f47eee65f670d431e3988 k3b-1.0.1-r1.ebuild 4279
+RMD160 ab3900a64425995eb2349083f237b1ef5283e834 k3b-1.0.1-r1.ebuild 4279
+SHA256 0b68512129e887b62d0f9cb9cf90caec1b107279fb158be088efee72f2a621a1 k3b-1.0.1-r1.ebuild 4279
 EBUILD k3b-1.0.1.ebuild 4135 RMD160 8bcf65aa533577e949c633978535758a23de1173 SHA1 cc1593ee4f0454053c164e0e0b254e0f6de795e8 SHA256 f75c8fbf28c6fad03bab5ad5a19a35031da42ac9fd54c9ca3a9bb930c0193ecd
 MD5 b3531fff581f460f1e9d5b3644dcd7d1 k3b-1.0.1.ebuild 4135
 RMD160 8bcf65aa533577e949c633978535758a23de1173 k3b-1.0.1.ebuild 4135
@@ -28,10 +39,10 @@ EBUILD k3b-1.0.ebuild 4208 RMD160 b9f8cac23a45d23cb99fdd71718da1e132b620b2 SHA1
 MD5 f4f38fde870fb423fc173fbafec17d88 k3b-1.0.ebuild 4208
 RMD160 b9f8cac23a45d23cb99fdd71718da1e132b620b2 k3b-1.0.ebuild 4208
 SHA256 35d1438f6ce68c9701dd8e51b12c7153691574cef1d0bbbde83506099e7fd708 k3b-1.0.ebuild 4208
-MISC ChangeLog 27536 RMD160 5f72f753c6dfb62cd7dfe3647bbd615bdc4324d8 SHA1 6883431084216b51fa2434f679997f3205824a02 SHA256 39301c53a239a38d9e4da94e05a182faa4cbf734d7837f47667bd8d8ab54b2fc
-MD5 286d4a0161d7085f0ab2cbfc107cbf2a ChangeLog 27536
-RMD160 5f72f753c6dfb62cd7dfe3647bbd615bdc4324d8 ChangeLog 27536
-SHA256 39301c53a239a38d9e4da94e05a182faa4cbf734d7837f47667bd8d8ab54b2fc ChangeLog 27536
+MISC ChangeLog 27763 RMD160 2a57813421561c3f226acf127bcbb756160a4ecc SHA1 6ecc27c41356455f13111da0dceade72ca7ccd9c SHA256 553136e5936e792bff6bd040f4c25d3387360000f1e679fd88b1a22b88be5c6a
+MD5 f48fc6a63ab17ccc678a31ab9050177f ChangeLog 27763
+RMD160 2a57813421561c3f226acf127bcbb756160a4ecc ChangeLog 27763
+SHA256 553136e5936e792bff6bd040f4c25d3387360000f1e679fd88b1a22b88be5c6a ChangeLog 27763
 MISC metadata.xml 183 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f SHA1 44581aca775d8ca4854c53861174b6147da706b4 SHA256 d004a7535807ea599189a046ac582ca032a91f868bbcf4b72195773dfaf15462
 MD5 6cac9f56ab7373612097cef824badcf7 metadata.xml 183
 RMD160 dfdbe8a9663c05a4c6ab7aaf0e1d5b35ac030e2f metadata.xml 183
@@ -45,3 +56,13 @@ SHA256 6998e0135b2dd9772f531b4c651327fde64631cbdd42d4200cf6b08b72799fea files/di
 MD5 2302e8394e451d19e6a0a5a4b8a30995 files/digest-k3b-1.0.1 485
 RMD160 fbfce606add8ca8ca31c8fa90254a931581981c5 files/digest-k3b-1.0.1 485
 SHA256 8b97e122c4882f2f252884fab4408e26a81c6a067ff071294451c44b5200a977 files/digest-k3b-1.0.1 485
+MD5 2302e8394e451d19e6a0a5a4b8a30995 files/digest-k3b-1.0.1-r1 485
+RMD160 fbfce606add8ca8ca31c8fa90254a931581981c5 files/digest-k3b-1.0.1-r1 485
+SHA256 8b97e122c4882f2f252884fab4408e26a81c6a067ff071294451c44b5200a977 files/digest-k3b-1.0.1-r1 485
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGWERUCkvF58q80IkRAiHtAJ9RBuDdaJKKzGRIa7idROwVQV5r6ACeO3AM
+hcUZUpKlMfPYIPwUCZ0ws18=
+=ZI0n
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/digest-k3b-1.0.1-r1 b/app-cdr/k3b/files/digest-k3b-1.0.1-r1
new file mode 100644
index 000000000000..63b5aa46b748
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-1.0.1-r1
@@ -0,0 +1,6 @@
+MD5 8abd11f56e6e40d6f2d0b076a5f8b8ed k3b-1.0.1.tar.bz2 5097997
+RMD160 e4eeab9bec1a2ac222ed91fd6688a3c272ec7670 k3b-1.0.1.tar.bz2 5097997
+SHA256 609c56d4a9e0b41d545e377d61904e99a46e878280d6a6651a65f72f94acb65e k3b-1.0.1.tar.bz2 5097997
+MD5 f87a27408a4153d860103816ba83db09 k3b-i18n-1.0.1.tar.bz2 6839893
+RMD160 9f87c03e25ede1a93088aa589a3e66942974224c k3b-i18n-1.0.1.tar.bz2 6839893
+SHA256 e3359f08873833726dd6f7adc830c05d2d33636e5d4b56e43f8dee6b531347ce k3b-i18n-1.0.1.tar.bz2 6839893
diff --git a/app-cdr/k3b/files/k3b-1.0.1-hidden.patch b/app-cdr/k3b/files/k3b-1.0.1-hidden.patch
new file mode 100644
index 000000000000..707ae3577c55
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0.1-hidden.patch
@@ -0,0 +1,39 @@
+diff -Naur k3b-1.0.1.orig/src/k3b-cue.desktop k3b-1.0.1/src/k3b-cue.desktop
+--- k3b-1.0.1.orig/src/k3b-cue.desktop	2007-04-18 17:43:19.000000000 +0200
++++ k3b-1.0.1/src/k3b-cue.desktop	2007-05-26 14:51:07.000000000 +0200
+@@ -1,6 +1,7 @@
+ # KDE Config File
+ [Desktop Entry]
+ Type=Application
++NoDisplay=true
+ Exec=k3b --cdimage %U
+ Icon=k3b
+ Terminal=false
+diff -Naur k3b-1.0.1.orig/src/k3b-iso.desktop k3b-1.0.1/src/k3b-iso.desktop
+--- k3b-1.0.1.orig/src/k3b-iso.desktop	2007-04-18 17:43:19.000000000 +0200
++++ k3b-1.0.1/src/k3b-iso.desktop	2007-05-26 14:50:51.000000000 +0200
+@@ -1,6 +1,7 @@
+ # KDE Config File
+ [Desktop Entry]
+ Type=Application
++NoDisplay=true
+ Exec=k3b --image %U
+ Icon=k3b
+ Terminal=false
+diff -Naur k3b-1.0.1.orig/src/Makefile.am k3b-1.0.1/src/Makefile.am
+--- k3b-1.0.1.orig/src/Makefile.am	2007-04-18 17:43:19.000000000 +0200
++++ k3b-1.0.1/src/Makefile.am	2007-05-26 14:45:28.000000000 +0200
+@@ -32,10 +32,10 @@
+ 
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+ 
+-xdg_apps_DATA = k3b.desktop
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
+ 
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++#silent_DATA = k3b-iso.desktop k3b-cue.desktop
++#silentdir = $(kde_appsdir)/.hidden/
+ 
+ ###################
+ # this 10 paths are KDE specific. Use them:
diff --git a/app-cdr/k3b/k3b-1.0.1-r1.ebuild b/app-cdr/k3b/k3b-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..696d9ce9d7b4
--- /dev/null
+++ b/app-cdr/k3b/k3b-1.0.1-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.1-r1.ebuild,v 1.1 2007/05/26 14:29:32 philantrop 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 ~x86"
+IUSE="alsa css dvdr dvdread encode ffmpeg flac hal kde mp3 musepack musicbrainz
+	sndfile vcd vorbis emovix"
+
+DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
+	hal? ( || ( dev-libs/dbus-qt3-old
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.30 ) )
+		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 )
+	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
+
+# The following commented lines will have to be uncommented once the final
+# release is done. This pre-release version does not support i18n.
+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
+
+	use kde || elog "You haven't set the kde use flag. k3bsetup won't be installed."
+
+	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
+
+	cd "${S}"
+	# Install k3b-iso.desktop, k3b-cue.desktop with NoDisplay=true.
+	# Fixes bug 175263.
+	epatch "${FILESDIR}/${P}-hidden.patch"
+	rm -f "${S}/configure"
+}
+
+src_compile() {
+	local myconf="--enable-libsuffix= 		\
+			--with-external-libsamplerate	\
+			--without-resmgr				\
+			--without-cdrecord-suid-root	\
+			$(use_with kde 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_preinst() {
+	kde_pkg_preinst
+	use kde || rm ${D}/usr/share/applications/kde/k3bsetup2.desktop
+}
+
+pkg_postinst() {
+	echo
+	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the cdrom group."
+	echo
+}