amd64 stable wrt #354367 and punt the version with hardcoded sys-apps/hal dep

Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64

5 files changed, 8 insertions, 156 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index a7eaf403e7de..c1b775e9a47b 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.260 2011/02/11 13:15:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.261 2011/02/11 13:18:52 ssuominen Exp $
+
+  11 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> k3b-2.0.2-r1.ebuild:
+  amd64 stable wrt #354367
 
   11 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> k3b-2.0.2-r1.ebuild:
   x86 stable wrt bug #354367
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 013ee6b5bc60..5a09a2d3f560 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,7 +1,4 @@
-AUX 2.0.1-fix-crash-with-qt-4.7.0.patch 1522 RMD160 233a6b498819e749026b5508a63bfaff04556ed6 SHA1 0bd7e4bffca51f6046956141fdd192acf4b65d6c SHA256 5316bdee44a0569b9fd62299268673c77ae7ab4330dde50103f19215b89a76e6
-DIST k3b-2.0.1.tar.bz2 12269204 RMD160 8f85510c65a0da305b3a7c06ac0dd88e0631e66f SHA1 44da8d11b36945aeb9495c9150d8227fa906d6c2 SHA256 8631460e617833a1f907145271ae4e3224c53e391339f273d2bd340c451ccdb7
 DIST k3b-2.0.2.tar.bz2 12833321 RMD160 a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 SHA1 8b30a4d07942e82559b01bc07dea6bcf2defd532 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd
-EBUILD k3b-2.0.1-r1.ebuild 3311 RMD160 fd37dc8e6ca26facdad3870a12d37a0d1365cc2d SHA1 7ace1de8d20670c211618edd2d3843eceb4179a0 SHA256 c469665212ad1e0bc43cc3ffbb03a6f99231557f10cda5faeb75a030a5c538bf
-EBUILD k3b-2.0.2-r1.ebuild 3311 RMD160 a0c271df88a501ee8c0f027a554ed2db2ec2d625 SHA1 79091db80892d03f10cc3a01c2085dd6996bb71a SHA256 191d95bbb6b30977e312a560c4e154fd5e3ef1b860ac2a45108399fd4fbaa424
-MISC ChangeLog 37749 RMD160 301b0422639d01565a96b051c55bcd7f4ee26b8b SHA1 39d22b3d18d55a7931faa1d36ef70040ffdf64be SHA256 1e8f66d4e77acb841564caa6b1c0e2b80c88605d66f3de70e4ad2fa5a2fa4486
+EBUILD k3b-2.0.2-r1.ebuild 3309 RMD160 5ad4aac94b94cdff6266bb06afd42d02dffb52e2 SHA1 45339e76edc85433d6121c705d1e78573d49447b SHA256 828810c743a801f5cdae82da6228d2dbbb6aec3b05e89f06d53d6ace5f483245
+MISC ChangeLog 37851 RMD160 4ba3eb8b4ea8775617ff315ae38ab01a018e918c SHA1 d183983b2b31711c647b656bce83568253e16114 SHA256 f0d66ffac79578ff8bd95f6dac7399f9e1be726ad003524c81831f44359f46c5
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
diff --git a/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch b/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch
deleted file mode 100644
index a99b5c639cae..000000000000
--- a/app-cdr/k3b/files/2.0.1-fix-crash-with-qt-4.7.0.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: src/option/k3bpluginoptiontab.cpp
-===================================================================
---- src/option/k3bpluginoptiontab.cpp	(revision 1168967)
-+++ src/option/k3bpluginoptiontab.cpp	(working copy)
-@@ -43,12 +43,28 @@
-     layout->addWidget( label );
-     layout->addWidget( pluginSelector );
- 
-+    // find all categories
-+    QHash<QString, QString> categoryNames;
-+
-     foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
--        kDebug() << "Adding plugin" << plugin->pluginInfo().name();
--        pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(),
-+        categoryNames[ plugin->category() ] = plugin->categoryName();
-+    }
-+
-+    // add all plugins in each category
-+    foreach( const QString &category, categoryNames.keys() ) {
-+        QList<KPluginInfo> plugins;
-+
-+        foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) {
-+            if ( plugin->category() == category ) {
-+                plugins << plugin->pluginInfo();
-+                kDebug() << "Adding plugin" << plugin->pluginInfo().name();
-+            }
-+        }
-+        pluginSelector->addPlugins( plugins,
-                                     KPluginSelector::ReadConfigFile,
--                                    plugin->categoryName(),
--                                    plugin->category() );
-+                                    categoryNames[ category ],
-+                                    category
-+                                  );
-     }
- }
- 
diff --git a/app-cdr/k3b/k3b-2.0.1-r1.ebuild b/app-cdr/k3b/k3b-2.0.1-r1.ebuild
deleted file mode 100644
index 1cee2701405e..000000000000
--- a/app-cdr/k3b/k3b-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.1-r1.ebuild,v 1.2 2011/01/19 12:56:29 scarabeus Exp $
-
-EAPI=3
-
-MULTIMEDIA_REQUIRED=always
-WEBKIT_REQUIRED=always
-KMNAME="extragear/multimedia"
-
-# Translations are only in the tarballs, not in the svn repo
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
-	gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
-	se sk sl sv th tr uk zh_CN zh_TW"
-
-	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
-
-	DOCS=( FAQ PERMISSIONS README RELEASE_HOWTO )
-
-	S=${WORKDIR}/${P/_*}
-else
-	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
-fi
-
-inherit kde4-base
-
-DESCRIPTION="The CD/DVD Kreator for KDE"
-HOMEPAGE="http://www.k3b.org/"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug dvd emovix encode ffmpeg flac mad lame musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
-
-DEPEND="
-	$(add_kdebase_dep libkcddb)
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread )
-	ffmpeg? ( >=media-video/ffmpeg-0.5 )
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	encode? ( lame? ( media-sound/lame ) )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	musicbrainz? ( media-libs/musicbrainz:1 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? ( media-libs/libvorbis )
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	media-sound/cdparanoia
-	sys-apps/hal
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	emovix? ( media-video/emovix )
-	encode? ( sox? ( media-sound/sox ) )
-	vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PV}-fix-crash-with-qt-4.7.0.patch" )
-
-src_configure() {
-	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)
-	)
-
-	if use encode; then
-		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-2.0.2-r1.ebuild b/app-cdr/k3b/k3b-2.0.2-r1.ebuild
index 41c53e743a58..2d6e2176b1ad 100644
--- a/app-cdr/k3b/k3b-2.0.2-r1.ebuild
+++ b/app-cdr/k3b/k3b-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r1.ebuild,v 1.2 2011/02/11 13:15:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r1.ebuild,v 1.3 2011/02/11 13:18:52 ssuominen Exp $
 
 EAPI=3
 
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug dvd emovix encode ffmpeg flac hal lame mad musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
 
 DEPEND="