ppc64 stable wrt #281598

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 7 insertions, 156 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/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"