Stabilise 2.0.1. Drop older. Drop useless CMAKE_MIN_VERSION definition.

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

5 files changed, 12 insertions, 113 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 97a48bcae246..1aa0f3d4cd78 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
 # 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.257 2011/01/16 20:33:26 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.258 2011/01/19 12:56:29 scarabeus Exp $
+
+  19 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> -k3b-2.0.0.ebuild,
+  k3b-2.0.1-r1.ebuild, k3b-2.0.2.ebuild:
+  Stabilise 2.0.1. Drop older. Drop useless CMAKE_MIN_VERSION definition.
 
 *k3b-2.0.2 (16 Jan 2011)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 764e78c643aa..9c1dfbde8900 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,23 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 2.0.1-fix-crash-with-qt-4.7.0.patch 1522 RMD160 233a6b498819e749026b5508a63bfaff04556ed6 SHA1 0bd7e4bffca51f6046956141fdd192acf4b65d6c SHA256 5316bdee44a0569b9fd62299268673c77ae7ab4330dde50103f19215b89a76e6
-DIST k3b-2.0.0.tar.bz2 12441752 RMD160 203f73fe2c57181e7cac6578ff57e4039459eb9c SHA1 afe1b10a520849941c1489ccb1ed7c3b8f828e78 SHA256 df71fcb97ac29344c43a819d39ae9fb96e874c6dc40e905a1788d632d327344b
 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.0.ebuild 3016 RMD160 acaf05de74078979671068e912721a2c31cefafe SHA1 9cd95ee8887db74c0a3b46f07235ae8cfed05c2f SHA256 b7013baa7c046c1b7a89090a567088a5e3c7fa99e95d685268a17d3d0a042e31
-EBUILD k3b-2.0.1-r1.ebuild 3337 RMD160 8c958889d06ad798045b912e93feb7b5b908ce1a SHA1 832495c52e898971c93a59c039517f000af0cfde SHA256 28472763aa0fa5f45367bb978e3cc664ac02b1748e91aa984d6f3c3277ba452c
-EBUILD k3b-2.0.2.ebuild 3253 RMD160 5bbaea2a8b75940c7978c5b6c5fcbcef8c794270 SHA1 6bcc84339b60e78b03b20b7970749468509be23c SHA256 5e6823923eed1d715e23f9c1e57cf6f45675ca46ad9988e8ba91032d36646199
-MISC ChangeLog 37298 RMD160 3c3e3be6ffc7bac5c71a30daf9bdb52fc007b5b5 SHA1 833ee05c8dcf8228b4f0a9a50481dc2bc920ada1 SHA256 d821221eff8b9841f79e483b94b6bdc0dd799c2acc922c5613ff390940fc6e53
+EBUILD k3b-2.0.1-r1.ebuild 3311 RMD160 fd37dc8e6ca26facdad3870a12d37a0d1365cc2d SHA1 7ace1de8d20670c211618edd2d3843eceb4179a0 SHA256 c469665212ad1e0bc43cc3ffbb03a6f99231557f10cda5faeb75a030a5c538bf
+EBUILD k3b-2.0.2.ebuild 3233 RMD160 87db728250668f6533dc073ec058aca70f9d96bb SHA1 6ae67f98a95b8aec79e32333b2b0f70cb0e58290 SHA256 e9edda5468bea4d4354e0c55fdcea1e5381af849e2a6effcac74f1e5ea6ea9de
+MISC ChangeLog 37492 RMD160 fce1dcdeb4a96dcdf0da6eb382411c20e4089381 SHA1 3ce9e60fce4daa6c841e9b9065c1afc0396d5475 SHA256 f6d47b548c1c0ae115612fb51f2105c0901d1f544e3225120e52ec880590e2e2
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJNM1YeAAoJEAWF714uGAc6ybUH/2t1ap6uQyLtASjzccPjiQdV
-4jGBuFUHJdMRrSjjlGxOH2LcU085LoZRsmShKfsXQ2HrK1j/p9kb4szUzmFHvRCt
-Fk6gbLl5bIyCUhU4nydIZ/rkoz8EArA1voNq8nD058oLU5vQG9ju9j0UfKwZRivz
-tOYeo0qmQRMPHM8f51Gl3gRXIq1IK2pGP53NXELbjgxsMYmGh32lFWHe0Wd8uYaw
-Tc3OwHRyeinr9PHyO8ISJYgCOskr574Shj9WETp+dmCzbGXyEpqphgcFzObuto6Y
-3+ix7qLLCrzZUSSfWTiKp3yuLQw+e33TYMjYEW2pgcK9ecYeztbhSfHFjBP0DvU=
-=9Yjz
------END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/k3b-2.0.0.ebuild b/app-cdr/k3b/k3b-2.0.0.ebuild
deleted file mode 100644
index d46ce7b793ee..000000000000
--- a/app-cdr/k3b/k3b-2.0.0.ebuild
+++ /dev/null
@@ -1,87 +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-2.0.0.ebuild,v 1.3 2010/07/29 19:13:20 hwoarang 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"
-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 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"
-
-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-2.0.1-r1.ebuild b/app-cdr/k3b/k3b-2.0.1-r1.ebuild
index cbe301197fa8..1cee2701405e 100644
--- a/app-cdr/k3b/k3b-2.0.1-r1.ebuild
+++ b/app-cdr/k3b/k3b-2.0.1-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.1 2010/12/13 14:04:16 scarabeus Exp $
+# $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
 
-CMAKE_MIN_VERSION=2.8.0
 MULTIMEDIA_REQUIRED=always
 WEBKIT_REQUIRED=always
 KMNAME="extragear/multimedia"
@@ -31,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 mad lame musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
 
 DEPEND="
diff --git a/app-cdr/k3b/k3b-2.0.2.ebuild b/app-cdr/k3b/k3b-2.0.2.ebuild
index 71b0131a060f..b79e391235c8 100644
--- a/app-cdr/k3b/k3b-2.0.2.ebuild
+++ b/app-cdr/k3b/k3b-2.0.2.ebuild
@@ -1,10 +1,9 @@
 # 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.ebuild,v 1.1 2011/01/16 20:33:26 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2.ebuild,v 1.2 2011/01/19 12:56:29 scarabeus Exp $
 
 EAPI=3
 
-CMAKE_MIN_VERSION=2.8.0
 MULTIMEDIA_REQUIRED=always
 WEBKIT_REQUIRED=always
 KMNAME="extragear/multimedia"