amd64 stable wrt #272551

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 23 insertions, 50 deletions

diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index a6c7fdabcd97..ddeb9e97be4b 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX isomaster-1.3.5-ldflags.diff 543 RMD160 5aa66133975b3cf20f7de71f126ca4aea300fae9 SHA1 a7450a8afb96b9bcef7aa1422b49bf126d769cab SHA256 783c31804f54faa234c33d0dc86fc71946151db075ccc452866fe15482dd6161
-DIST isomaster-1.3.3.tar.bz2 199931 RMD160 bdcf4407b43cd889ebfbaa20f72011e839eada23 SHA1 4a207990d1a8772bde1d415b7aebf7aa6a4a7c1a SHA256 df8980a55b3737b8b2ca17af3da305116a3a86af9f6272d1301c5bfbd22ef6ea
 DIST isomaster-1.3.5.tar.bz2 196042 RMD160 813c729b5308e725cbcfea688de343260bae63c5 SHA1 76adcae894a169365e43eaac30f4a7c3926fa78c SHA256 27b9b53d5e361b56a6e302131af2dc97f7135f74786637e6244e075606226597
-EBUILD isomaster-1.3.3.ebuild 785 RMD160 e60587d6d701b16ab118de2196707d98df794ff3 SHA1 52560af34d9a54754df049a774d6abe4a59795ef SHA256 a21dc753e506bccd272f022fec94d86173013522c76be8d2ce58f4a70ce723f4
-EBUILD isomaster-1.3.5.ebuild 904 RMD160 c24bfa27de6faa4c9583a970a34471e5c588affa SHA1 b1ec6f2d1c0d8f1ef71109e4e53ad69c7e4e9bbe SHA256 ba3b2e935c871f9be703a1805e87470abe7260c4a53e81d7350402a595bbbd36
+EBUILD isomaster-1.3.5.ebuild 857 RMD160 109c686d87e0273060f6c6c4fc456ad88b9e0cfd SHA1 30731f56f250b80b69a9a1e1ab63792d7b63ff1f SHA256 1559ce378caa002869ecd89ed7144b48826712249d86aa2f8e62c1f6d1e19563
 MISC ChangeLog 2212 RMD160 ae355824a1ca44d60628cf3d9b267adebb15070a SHA1 268759ac279998f6e05df40ded4846eeb84874b8 SHA256 0f2318d2634e7e13464ba827c8858f0e3ece9892609e8fc2ad9d586cc6d23378
 MISC metadata.xml 166 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 SHA1 b9fccc7c24aa717c30efef068fd544a692f264f6 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkojBxkACgkQkKaRLQcq0GJALQCdEa6e2zHOslLyXKnDDDcOz8Yp
-6PIAn04jTsJlVc0ZjYlL/NLUDat9t/LH
-=0PNJ
------END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 51e3712acb5c..a3be87f885f0 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,9 @@
 # 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.221 2009/06/04 19:30:25 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.222 2009/06/05 09:50:01 ssuominen Exp $
+
+  05 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> k3b-1.0.5-r5.ebuild:
+  amd64 stable wrt #272551
 
   04 Jun 2009; Christian Faulhammer <fauli@gentoo.org> k3b-1.0.5-r5.ebuild:
   stable x86, bug 272551
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 8368e1c25406..22869e1843c0 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX k3b-1.0.5-desktop-entry.diff 1756 RMD160 540b5336fde1206eba74ac25a4fd0276978ad9c6 SHA1 d817a1da34cc6207a1d5fcac0d5ba67a3964afc0 SHA256 3d89ee4194abe8312e7373161bac8b9134850906be9c6e738571f9de7adfb34b
 AUX k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch 2991 RMD160 8d0204a12cfe1eabe03e66b6201e2164f01cd80d SHA1 6bab88b9e4619a7f61b82c6e59af9a7ef784f71b SHA256 e2db198914acbda0c33c20537449cf7b729345f9d8af0052701259de0b27ff21
 AUX k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch 1049 RMD160 022fecbc707775adc782b828bfdd571eccb95936 SHA1 270f19b05ce7ca35aee0dd7009556fec9b66f90c SHA256 e99f6b309e6c20d085860c495c2aa9d34d6d69a864e0be11aac01e0b3a6ac67d
@@ -8,13 +5,6 @@ AUX k3b-1.0.5-transcode-1.1.patch 1097 RMD160 08fcc3769803a400bc5d00be223b9f37fd
 DIST k3b-1.0.5.tar.bz2 5113060 RMD160 b562746015cc2e4226652402725b4e69eb846822 SHA1 c45d6f2a36b1bc7ea14101d444149c40fd4b700e SHA256 d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df
 DIST k3b-i18n-1.0.5.tar.bz2 7732137 RMD160 6f08c6851da5d25ed4b2ead4ad0c4073ba94e246 SHA1 8697c0f0a9fa458895519a5d94c50120333a71c8 SHA256 068b170cd63c97263d21165b7b5106a8176f2499a1ebcec9baa68b7628395767
 EBUILD k3b-1.0.5-r3.ebuild 4446 RMD160 71171a92ba5660e654850a84722f448eff3794b6 SHA1 67cb627e4a61aa7a1cca1403e52bb77c4a47dfe2 SHA256 5b4fa6d7c21bb4b28cfd1027bad74d9f6e1c7cfe810334afbc1d697e60cddcbb
-EBUILD k3b-1.0.5-r5.ebuild 3897 RMD160 383c4a4fdae67a695cbd474d2ef82f7f4689c622 SHA1 026ab0157f8e43d93a18192e9bb1c0c05909aa63 SHA256 477bfd9106f0b5bc42cd8582d5c7b73fc00598ab420865aabacbed10e9a9ba38
-MISC ChangeLog 32416 RMD160 7144eca5199ac0efd6aed8170acf1249018e6d48 SHA1 297bb4c7f2e22595d3ce9b95bee3d23e2c5aa601 SHA256 532b89f09861c5563ce0517318e64ea8a9ea75f1acd0abec881001ae7a50bdaa
+EBUILD k3b-1.0.5-r5.ebuild 3837 RMD160 5bf5be017217bfbd35ae6eac8cdc40f27a3818ac SHA1 7d20978afab83c3ac12b3bc408d3f42e8d94441c SHA256 8db611f6b85b502cf572c337e801854ae83f813a12b4461e56ba00670f884002
+MISC ChangeLog 32523 RMD160 4a52721708289416b8fe56aa8d439e00c515925a SHA1 d6977b5accbf7af5afa11137bac4ce2c0cd43e0e SHA256 1ed3f55299b151c01cd79a3cb945c35f52cb0ea06a92b5a330341e3f613cd229
 MISC metadata.xml 265 RMD160 59c880c9c5efb9521978dbd903168505b105564a SHA1 c7ff34e4da0ae454589f8ae79f0c074915754879 SHA256 017dbf66cb3b0c2b77f42714c7544570e19f9605bb260245094b3678a6a34324
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkooINcACgkQNQqtfCuFneO9ngCgjrVFEbrXqbRY4j4uMZUK1isJ
-r6IAn0W2Poa0+WqUUncEj5DISyCBgaWV
-=0mAo
------END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/k3b-1.0.5-r5.ebuild b/app-cdr/k3b/k3b-1.0.5-r5.ebuild
index 056acdba3ccd..bb89af800f54 100644
--- a/app-cdr/k3b/k3b-1.0.5-r5.ebuild
+++ b/app-cdr/k3b/k3b-1.0.5-r5.ebuild
@@ -1,58 +1,50 @@
 # 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.0.5-r5.ebuild,v 1.2 2009/06/04 19:30:25 fauli Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r5.ebuild,v 1.3 2009/06/05 09:50:01 ssuominen Exp $
 
+EAPI=2
 inherit kde eutils multilib
 
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
 DESCRIPTION="K3b, KDE CD Writing Software"
 HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/k3b/${P/_}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="alsa css dvd dvdr encode emovix ffmpeg flac hal mp3 musepack musicbrainz
 	sndfile vcd vorbis"
 
-COMMON_DEPEND="
-	!<app-cdr/k3b-1.0.5-r5
+COMMON_DEPEND="!<app-cdr/k3b-1.0.5-r5
 	media-libs/libsamplerate
 	media-libs/taglib
-	>=media-sound/cdparanoia-3.9.8
+	media-sound/cdparanoia
 	alsa? ( media-libs/alsa-lib )
 	dvd? ( media-libs/libdvdread )
 	encode? ( media-sound/lame )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	ffmpeg? ( >=media-video/ffmpeg-0.5 )
 	flac? ( media-libs/flac[cxx] )
 	hal? ( sys-apps/hal )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
 	musicbrainz? ( media-libs/musicbrainz:1 )
 	sndfile? ( media-libs/libsndfile )
-	vorbis? ( media-libs/libvorbis )
-"
-
+	vorbis? ( media-libs/libvorbis )"
 RDEPEND="${COMMON_DEPEND}
-	>=app-cdr/cdrdao-1.1.7-r3
+	app-cdr/cdrdao
 	media-sound/normalize
 	virtual/cdrtools
-	dvdr? ( >=app-cdr/dvd+rw-tools-7.0 )
+	dvdr? ( >=app-cdr/dvd+rw-tools-7 )
 	css? ( media-libs/libdvdcss )
-	encode? (
-		media-sound/sox
-		media-video/transcode[dvd]
-	)
+	encode? ( media-sound/sox
+		media-video/transcode[dvd] )
 	emovix? ( media-video/emovix )
-	vcd? ( media-video/vcdimager )
-"
+	vcd? ( media-video/vcdimager )"
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
+S=${WORKDIR}/${P/_}
+
 need-kde 3.5
 
 PATCHES=(
@@ -83,7 +75,7 @@ src_unpack() {
 		done
 		rm -f configure
 	fi
-	rm -f "${S}/configure"
+	rm -f "${S}"/configure
 }
 
 src_configure() {