amd64 stable wrt #317371

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 8 insertions, 105 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index c1cb33d3836d..3becafb7b0e9 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.244 2010/03/27 13:19:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.245 2010/05/03 18:05:39 ssuominen Exp $
+
+  03 May 2010; Samuli Suominen <ssuominen@gentoo.org> k3b-1.91.0_rc2.ebuild:
+  amd64 stable wrt #317371
 
 *k3b-1.91.0_rc2 (27 Mar 2010)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index e912fe73d6e7..c0bdf2969f80 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST k3b-1.70.0beta1.tar.bz2 8613028 RMD160 0b2b3c20ab34ffa9cecb4ad44dc3a01c323c6867 SHA1 9d867f62ea0f165bb0010f68793fa1ea9083876f SHA256 6af2a862b527455bc6ad21149ea621c969147e0d491a25f53b404e85d7a5c333
-DIST k3b-1.90.0rc1.tar.bz2 12615535 RMD160 eaf2d91832ee20d196d1dea8ed2fb73c21e2e340 SHA1 1a6c98c071694055f30245b09a1d1be9e1598e5e SHA256 a8a4091ebab35e3de617c1ea9ce2a451fd195e8c27e52444565d493a3e74e4fd
 DIST k3b-1.91.0rc2.tar.bz2 13754384 RMD160 ff9efedfe7dd1df5bbb1c54503fc06fb0f6e9564 SHA1 cefb48654ebcaffb856161a1f87e3f800835779f SHA256 463bcc0a6773f80d889f2191c3502935672e9ea2eede4fb1e8ef81d2824b3958
 EBUILD k3b-1.70.0_beta1.ebuild 2887 RMD160 1038540b07bcc1b691717df1798f1b09502d5e03 SHA1 9e0a1f19fe58a8e3c54c470a5708717787bca104 SHA256 c0e9ca1fa6742be5d328781896a1dd7f0f23ca8a11d543fd63387819d0a13cfa
-EBUILD k3b-1.90.0_rc1.ebuild 3089 RMD160 aa7c0525742d088518f9edc8ca9e89e50b5119ce SHA1 1cdf6bdb249edd9f7c4bd90123ea20b524ef8e4a SHA256 8fd134411e78ec87288b18a752b3e0af387c8f20210b37c0c8fecd20d922cb4b
-EBUILD k3b-1.91.0_rc2.ebuild 3089 RMD160 a9122a326f7298f0abab4cb49f0486e8d5bb27ca SHA1 9d313137f23c5d46b92755363b3e42362807de8c SHA256 4cba3e218c1ada11390b2ff7ca8bf6e1f4bfed42ceda231a412ce9a9f6a0ba9b
-MISC ChangeLog 35567 RMD160 55d5ee26ff833a3491b342c46033b355fa6478bc SHA1 520eb1609e824d43b60b053d544e4ed9a0ffc6b3 SHA256 6a434f2910b445aa194deb89cfb56deaeeb2c978b93f7cd48c1b5f094db67b29
+EBUILD k3b-1.91.0_rc2.ebuild 3088 RMD160 77ec75586b995365f85c4faa90e042cfedb6aeed SHA1 d5cf75523ee1e45594aa25073b2f6c7a10ba61fd SHA256 a879c60b78279f397a78e97dc6ea9d5b6493aa75ff3f312173c11c3fa8e8cd81
+MISC ChangeLog 35672 RMD160 e61e22ad4ed91d7417de6e2e17d88c15dfbf671d SHA1 9fabbae188d5bf97dbc0b05d42e904350d8ad124 SHA256 37788047fa041a8c2c4dd7d2fc452990b71e323f9a099e71f6f6d342c08fed29
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuuBcwACgkQHB6c3gNBRYcBIgCeI3ShLOI/yPMlS7FowHDzGEyY
-n6MAoJ+1iG/4It5wqoWMi0or0yWKh8KR
-=H+nV
------END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/k3b-1.90.0_rc1.ebuild b/app-cdr/k3b/k3b-1.90.0_rc1.ebuild
deleted file mode 100644
index 362c1fa10791..000000000000
--- a/app-cdr/k3b/k3b-1.90.0_rc1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.90.0_rc1.ebuild,v 1.3 2010/03/06 08:52:59 ssuominen Exp $
-
-EAPI=2
-WEBKIT_REQUIRED=always
-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"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-inherit kde4-base
-
-DESCRIPTION="The CD/DVD Kreator for KDE"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug dvd emovix encode ffmpeg flac +handbook mad lame musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
-
-DEPEND=">=kde-base/libkcddb-${KDE_MINIMAL}
-	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}
-	sys-apps/hal
-	app-cdr/cdrdao
-	media-sound/cdparanoia
-	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 FAQ PERMISSIONS README RELEASE_HOWTO TODO"
-
-S=${WORKDIR}/${P/_*}
-
-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-1.91.0_rc2.ebuild b/app-cdr/k3b/k3b-1.91.0_rc2.ebuild
index a4a7644cbd92..9977fde9679e 100644
--- a/app-cdr/k3b/k3b-1.91.0_rc2.ebuild
+++ b/app-cdr/k3b/k3b-1.91.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.91.0_rc2.ebuild,v 1.1 2010/03/27 13:19:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.91.0_rc2.ebuild,v 1.2 2010/05/03 18:05:39 ssuominen Exp $
 
 EAPI=2
 WEBKIT_REQUIRED=always
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
 
 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 +handbook mad lame musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
 
 DEPEND=">=kde-base/libkcddb-${KDE_MINIMAL}