ppc64 stable wrt #281598

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

4 files changed, 9 insertions, 169 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 9902601d31dc..d34b90ad0fcc 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
 # 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.230 2009/09/25 11:26:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.231 2009/10/13 17:39:55 ssuominen Exp $
+
+  13 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> -k3b-1.0.5-r5.ebuild,
+  k3b-1.0.5-r6.ebuild:
+  ppc64 stable wrt #281598
 
   25 Sep 2009; Markus Meier <maekke@gentoo.org> k3b-1.0.5-r6.ebuild:
   amd64 stable, bug #281598
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index aa4965b0c771..7ce3fa019619 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
@@ -10,15 +7,7 @@ AUX k3b-1.66.0_alpha2-fix-musepack-lib-detection.patch 493 RMD160 146162f40fffe1
 DIST k3b-1.0.5.tar.bz2 5113060 RMD160 b562746015cc2e4226652402725b4e69eb846822 SHA1 c45d6f2a36b1bc7ea14101d444149c40fd4b700e SHA256 d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df
 DIST k3b-1.66.0alpha2.tar.bz2 3865548 RMD160 dd1a11bb91a3af1138d74728decbf638401bd884 SHA1 d17ec5743a6f913b7a5cf14b08593844d858fc7e SHA256 2f66ccae344d832c8522a88d6aede2b73e694c9fe1fe87610c0ff0a76f08671d
 DIST k3b-i18n-1.0.5.tar.bz2 7732137 RMD160 6f08c6851da5d25ed4b2ead4ad0c4073ba94e246 SHA1 8697c0f0a9fa458895519a5d94c50120333a71c8 SHA256 068b170cd63c97263d21165b7b5106a8176f2499a1ebcec9baa68b7628395767
-EBUILD k3b-1.0.5-r5.ebuild 3832 RMD160 13740138cbb9f2a24c0a0e09548918417b96e9b6 SHA1 3f2baf1dc9c9a0dc438cce39af25526cba176569 SHA256 8832b7c3b3832310d39ead980050edbc9c3df8b18b23c8797b7f8c217042c35f
-EBUILD k3b-1.0.5-r6.ebuild 3875 RMD160 f2c220e8403aa5cd0e8f94493e2a2e714f1ca33d SHA1 0086b57482c46b078ec86e23021271fb9978d679 SHA256 ccd786008b11b9c4b109fea9edbcc08e275095ac0ff139aada8a56cadd63ea0b
+EBUILD k3b-1.0.5-r6.ebuild 3877 RMD160 eda4811891f7619cfad475607f7c1f0e9c299618 SHA1 58516242c2d108de9467b85b5160c54cbda9f83d SHA256 0915c4678cf844438d11b70ff86664dc488bba966c93345364bc855554c086f2
 EBUILD k3b-1.66.0_alpha2-r1.ebuild 3072 RMD160 60154c9c1c3565e0f4b9e75741747f5175c9887c SHA1 74ae95bacdadd74e17e8ea6ef47564227b7cb79d SHA256 b70d1e34d8329f1cee517ed26054d39b862d2cfc998daa128eff61cea63bb3eb
-MISC ChangeLog 33569 RMD160 16412bb5eb96d80991ddd9613259f8b731d4bb83 SHA1 f8f05b9b642a89338525f379494fb32c9798d7bd SHA256 529ce94d36731976918db830c5bebdd119915d5de85de5c5f1e8e70fe90f713e
+MISC ChangeLog 33699 RMD160 936aa586fa07c445a8078bcaeb095e71fcf31f9a SHA1 0e3df5fc36de0d67ddfb3854ef6f5079cbc6cec7 SHA256 70669867e720d16f62e3559596c819745bc410fa2656f655bff0d2f58f509a70
 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq8qP0ACgkQkKaRLQcq0GKL6QCfX2WdWoDfSvoZKcmXKmUHGVyg
-blwAnRvH4/5iNgLoeaF+Drrlf2aOMiJg
-=aqe2
------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
deleted file mode 100644
index c5af5e5d4b07..000000000000
--- a/app-cdr/k3b/k3b-1.0.5-r5.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.5 2009/07/04 14:18:40 ranger Exp $
-
-EAPI=2
-inherit kde eutils multilib
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${P/_}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="3.5"
-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
-	media-libs/libsamplerate
-	media-libs/taglib
-	media-sound/cdparanoia
-	alsa? ( media-libs/alsa-lib )
-	dvd? ( media-libs/libdvdread )
-	encode? ( media-sound/lame )
-	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 )"
-RDEPEND="${COMMON_DEPEND}
-	app-cdr/cdrdao
-	media-sound/normalize
-	virtual/cdrtools
-	dvdr? ( >=app-cdr/dvd+rw-tools-7 )
-	css? ( media-libs/libdvdcss )
-	encode? ( media-sound/sox
-		media-video/transcode[dvd] )
-	emovix? ( media-video/emovix )
-	vcd? ( media-video/vcdimager )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P/_}
-
-need-kde 3.5
-
-PATCHES=(
-	"${FILESDIR}/${P}-desktop-entry.diff"
-	"${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-API.patch"
-	"${FILESDIR}/${P}-ffmpeg-0.4.9_p20081014-API.patch"
-	"${FILESDIR}/${P}-transcode-1.1.patch"
-)
-
-I18N="${PN}-i18n-${PV}"
-
-# Supported languages and translated documentation
-LANGS="af ar bg br bs ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hu is it
-	ja ka lt mk ms nb nds nl nn pa pl pt pt_BR ru rw se sk sr sr@Latn sv ta tr uk
-	uz zh_CN zh_TW"
-for X in ${LANGS}; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-	IUSE="${IUSE} linguas_${X}"
-done
-
-src_unpack() {
-	kde_src_unpack
-
-	if [ -d "${WORKDIR}/${I18N}" ]; then
-		cd "${WORKDIR}/${I18N}"
-		for X in ${LANGS}; do
-			use linguas_${X} || rm -rf "${X}"
-		done
-		rm -f configure
-	fi
-	rm -f "${S}"/configure
-}
-
-src_configure() {
-	local myconf="--with-external-libsamplerate
-		--without-resmgr
-		--without-cdrecord-suid-root
-		--without-k3bsetup
-		--with-qt-dir=${QTDIR}
-		--enable-mt
-		--with-qt-libraries=${QTDIR}/$(get_libdir)
-		--disable-dependency-tracking
-		--without-arts
-		$(use_enable debug)
-		$(use_with hal)
-		$(use_with encode lame)
-		$(use_with ffmpeg)
-		$(use_with flac)
-		$(use_with vorbis oggvorbis)
-		$(use_with sndfile)
-		$(use_with mp3 libmad)
-		$(use_with musepack)
-		$(use_with musicbrainz)
-		$(use_with dvd libdvdread)
-		$(use_with alsa)"
-
-	# Build process of K3b
-	kde_src_configure
-
-	# Build process of K3b-i18n
-	if [[ -d "${WORKDIR}/${I18N}" ]]; then
-		myconf="--with-qt-dir=${QTDIR}
-			--with-qt-libraries=${QTDIR}/$(get_libdir)
-			--disable-dependency-tracking
-			--without-arts
-			$(use_enable debug)"
-
-		KDE_S="${WORKDIR}/${I18N}"
-		kde_src_configure
-	fi
-}
-
-src_compile() {
-	KDE_S="${S}"
-	kde_src_compile
-
-	if [[ -d "${WORKDIR}/${I18N}" ]]; then
-		KDE_S="${WORKDIR}/${I18N}"
-		kde_src_compile
-	fi
-}
-
-src_install() {
-	KDE_S="${S}"
-	kde_src_install
-	dodoc FAQ KNOWNBUGS PERMISSIONS || die "dodoc failed"
-
-	if [[ -d "${WORKDIR}/${I18N}" ]]; then
-		KDE_S="${WORKDIR}/${I18N}"
-		kde_src_install
-	fi
-}
-
-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.0.5-r6.ebuild b/app-cdr/k3b/k3b-1.0.5-r6.ebuild
index 89522bff52c1..ec796dcb45f2 100644
--- a/app-cdr/k3b/k3b-1.0.5-r6.ebuild
+++ b/app-cdr/k3b/k3b-1.0.5-r6.ebuild
@@ -1,6 +1,6 @@
 # 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-r6.ebuild,v 1.4 2009/09/25 11:26:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r6.ebuild,v 1.5 2009/10/13 17:39:55 ssuominen Exp $
 
 EAPI=2
 inherit kde eutils multilib
@@ -11,7 +11,7 @@ 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"