Stable on x86 and amd64 (compile tested on chroots, tested runtime on ~). Remove older.

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

4 files changed, 14 insertions, 103 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 811628755c23..05be08f0fe21 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
 # 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.247 2010/05/24 19:45:14 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.248 2010/06/18 09:42:38 scarabeus Exp $
+
+  18 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -k3b-1.91.0_rc2.ebuild, k3b-1.92.0_rc3.ebuild:
+  Stable on x86 and amd64 (compile tested on chroots, tested runtime on ~).
+  Remove older.
 
 *k3b-1.92.0_rc3 (24 May 2010)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 7075d0136711..2146ba37431f 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST k3b-1.91.0rc2.tar.bz2 13754384 RMD160 ff9efedfe7dd1df5bbb1c54503fc06fb0f6e9564 SHA1 cefb48654ebcaffb856161a1f87e3f800835779f SHA256 463bcc0a6773f80d889f2191c3502935672e9ea2eede4fb1e8ef81d2824b3958
 DIST k3b-1.92.0rc3.tar.bz2 14093927 RMD160 8b876c4d65e94fe43e5cea1e5b478cf4431f73f2 SHA1 6b538b649804aec311b2dffa3374244f0d27ba61 SHA256 9a2adc3daf91111b2f27823e1b6136d1b31f75c50f9f369c4ed76aa52f80d5a9
-EBUILD k3b-1.91.0_rc2.ebuild 3088 RMD160 fdd98ce504e9baaee96fee00dfd73861fdbd3a99 SHA1 00b4254eb755ab667d63d01b7b4b015dcfd12894 SHA256 2dd665e9f728bc2ad8e327c16285f00151e84ebd6a3834c3d635a5309685e5ac
-EBUILD k3b-1.92.0_rc3.ebuild 3085 RMD160 7dbb8fdf4ad481999b10213472b7830d6cf668d6 SHA1 9bb594c87bda31a09dfd3490bdfbf33ffddb17b8 SHA256 162d1f11e4f3cef35b315633bd7a5297cfe3c55bdc8113ac53876788a02b0130
-MISC ChangeLog 35935 RMD160 2eca115c3f76e4db1b18637b502f21ef71667d86 SHA1 97cc05f33b3b948274e12cb6e922c81bc1abf364 SHA256 36308fd4a4b4fb30f33a70af92888c50e224b65cb3d2084825454dedc311fa22
+EBUILD k3b-1.92.0_rc3.ebuild 3087 RMD160 fbcb0dcc6d7abbc441c2bbce5780fe7546e0574a SHA1 7e95e0163f47c88392af9f6ef04fae121edd1165 SHA256 61e52de60cae5837c2b79a402260ba1903b157f4a62c79a0fad497b51e6286bd
+MISC ChangeLog 36136 RMD160 4ca5c2e1a3de9dceb223d1886f516840d7367371 SHA1 576ebbc1894b97795ce02d6bb9d473109b9de5f3 SHA256 ef774cc2a60877c297267820f58ee1d6a59781299d508d4014f7ec772dd8ceed
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEcBAEBCgAGBQJL+tdTAAoJEAWF714uGAc6FeEH/jCC6+QC2sarb9oJnyUxUmcM
-a87O6SbwXtk8204vzNiQCzjrwAeUVCnJ+DXOsNd+e4aq/cRJ4PGZ82AyOg4JsGvp
-Lpoc4MvMgqF54FrdFKkGidLvfiQLeUonRVvzxfGD6XZdMVSTGJYG+ZtoxGKCRAeT
-QPgFR7g75SZjVwet7fz71ukaS8Yfqmx59Y1eET+93SCOlB1TrFPfYE8VVWR6+oY2
-qTN2cgN+yihJDEfuMjLfsd8ryJbFhKbGaWEgkt67D19Sk4a3hlSRVD1g3xm/4/be
-w8gM5zJSyhw6drJoxgotHKgAqOryZ30EgcZQVvxJjLQfZZnnhWHWlOVv0TUiF+M=
-=uvZd
+iEYEARECAAYFAkwbP4sACgkQHB6c3gNBRYeH0wCgiiAr66HkCDV2J906kOwBz0eM
+PyQAn3xTLYaho3zmtMYtqseOsmf/GBIa
+=F3k3
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/k3b-1.91.0_rc2.ebuild b/app-cdr/k3b/k3b-1.91.0_rc2.ebuild
deleted file mode 100644
index 444fd0268e72..000000000000
--- a/app-cdr/k3b/k3b-1.91.0_rc2.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.91.0_rc2.ebuild,v 1.3 2010/05/22 11:31:37 phajdan.jr 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.92.0_rc3.ebuild b/app-cdr/k3b/k3b-1.92.0_rc3.ebuild
index c6b431f9f873..7230684bb457 100644
--- a/app-cdr/k3b/k3b-1.92.0_rc3.ebuild
+++ b/app-cdr/k3b/k3b-1.92.0_rc3.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.92.0_rc3.ebuild,v 1.1 2010/05/24 19:45:14 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.92.0_rc3.ebuild,v 1.2 2010/06/18 09:42:38 scarabeus 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}