Missing sys-apps/hal runtime depend wrt #292281, thanks to Alex Efros for reporting.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

4 files changed, 8 insertions, 119 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index a05f30c0324c..ce17a4d16bba 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.234 2009/11/04 13:58:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.235 2009/11/07 16:33:29 ssuominen Exp $
+
+  07 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  k3b-1.68.0_alpha3.ebuild:
+  Missing sys-apps/hal runtime depend wrt #292281, thanks to Alex Efros for
+  reporting.
 
   04 Nov 2009; Markus Meier <maekke@gentoo.org> k3b-1.68.0_alpha3.ebuild:
   amd64/x86 stable, bug #291606
diff --git a/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch b/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch
deleted file mode 100644
index ba10ae272501..000000000000
--- a/app-cdr/k3b/files/k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- k3b-1.66.0.orig/cmake/modules/FindMuse.cmake
-+++ k3b-1.66.0/cmake/modules/FindMuse.cmake
-@@ -20,8 +20,8 @@ FIND_PATH(MUSE_INCLUDE_DIR NAMES mpcdec/
- )
- 
- if(MUSE_INCLUDE_DIR)
--  FIND_LIBRARY(MUSE_LIBRARIES NAMES mpcdec)
--  set(MPC_HEADER_FILE "<mpcdec/mpcdec.h>")
-+  FIND_LIBRARY(MUSE_LIBRARIES NAMES mpcdecsv7 )
-+  set(MPC_HEADER_FILE "<mpcdecsv7/mpcdec.h>")
- else(MUSE_INCLUDE_DIR)
-   FIND_PATH(MUSE_INCLUDE_DIR NAMES musepack/musepack.h)
-   set(MPC_HEADER_FILE "<musepack/musepack.h>")
diff --git a/app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild b/app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild
deleted file mode 100644
index 1bccedc0cd66..000000000000
--- a/app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.66.0_alpha2-r1.ebuild,v 1.2 2009/08/26 07:14:57 wired Exp $
-
-EAPI="2"
-
-WEBKIT_REQUIRED="always"
-inherit kde4-base
-
-MY_P="${P/_/}"
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dvd emovix encode ffmpeg flac mad lame musicbrainz musepack sndfile sox taglib vcd vorbis +wav"
-
-DEPEND="
-	>=kde-base/libkcddb-${KDE_MINIMAL}
-	media-libs/libsamplerate
-	>=x11-libs/qt-gui-4.5.0
-	dvd? ( media-libs/libdvdread )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080206 )
-	flac? ( >=media-libs/flac-1.2.1-r2[cxx] )
-	encode? (
-		lame? ( media-sound/lame )
-	)
-	mad? ( media-libs/libmad )
-	musepack? ( media-libs/libmpcdecsv7 )
-	musicbrainz? ( media-libs/musicbrainz:1 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? ( media-libs/libvorbis )
-"
-RDEPEND="${DEPEND}
-	>=app-cdr/cdrdao-1.1.7-r3
-	>=media-sound/cdparanoia-3.9.8
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7.0
-		encode? ( media-video/transcode[dvd] )
-	)
-	emovix? ( media-video/emovix )
-	encode? (
-		sox? ( media-sound/sox )
-	)
-	vcd? ( media-video/vcdimager )
-	!app-cdr/k3b:0
-	!app-cdr/k3b:2
-"
-
-DOCS="FAQ KNOWNBUGS PERMISSIONS"
-
-S="${WORKDIR}"/"${P/_*/}"
-
-# Fix musepack support, libmpcsv7 needed
-PATCHES=( "${FILESDIR}/${P}-fix-musepack-lib-detection.patch" )
-
-src_configure() {
-	# Common settings
-	mycmakeargs="${mycmakeargs}
-		-DK3B_BUILD_K3BSETUP=OFF
-		$(cmake-utils_use debug K3B_DEBUG)
-		$(cmake-utils_use musicbrainz K3B_ENABLE_MUSICBRAINZ)
-		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
-		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
-		-DK3B_BUILD_API_DOCS=OFF
-		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
-		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
-		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
-		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
-		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
-		$(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)"
-
-	# Encoder settings
-	if use encode; then
-		mycmakeargs="${mycmakeargs}
-			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
-			$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
-			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)"
-	fi
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_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
-}
diff --git a/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild b/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild
index 7571211226cd..9eae06df6e70 100644
--- a/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild
+++ b/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild,v 1.4 2009/11/04 13:58:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.68.0_alpha3.ebuild,v 1.5 2009/11/07 16:33:30 ssuominen Exp $
 
 EAPI=2
 WEBKIT_REQUIRED=always
@@ -29,6 +29,7 @@ DEPEND=">=kde-base/libkcddb-${KDE_MINIMAL}
 	taglib? ( >=media-libs/taglib-1.5 )
 	vorbis? ( media-libs/libvorbis )"
 RDEPEND="${DEPEND}
+	sys-apps/hal
 	app-cdr/cdrdao
 	media-sound/cdparanoia
 	virtual/cdrtools