corrected transcode patch, clean up

(Portage version: 2.0.51.19)

13 files changed, 44 insertions, 444 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 980c6d75e8a5..b399b5fedddb 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.98 2005/04/14 15:24:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.99 2005/04/15 19:43:36 carlo Exp $
+
+*k3b-0.11.23-r2 (15 Apr 2005)
+
+  15 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  files/k3b-dvdrip-transcode.patch, -k3b-0.11.17.ebuild,
+  -k3b-0.11.19.ebuild, -k3b-0.11.20.ebuild, -k3b-0.11.22.ebuild,
+  -k3b-0.11.23-r1.ebuild, +k3b-0.11.23-r2.ebuild:
+  corrected transcode patch, clean up
 
 *k3b-0.11.23-r1 (14 Apr 2005)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 00f731807a90..a26675d51686 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,19 +1,11 @@
-MD5 333eaab63eb718cab524e0169bcc2956 k3b-0.11.17.ebuild 3454
 MD5 e5ab5a820b79edb45adbbb99daf8aab6 k3b-0.11.23.ebuild 3103
-MD5 ff00293c626b651a2118bbcc6aed8709 k3b-0.11.19.ebuild 3258
-MD5 922471c2988878912715fb7c51c95654 k3b-0.11.23-r1.ebuild 3133
-MD5 4aa8fcfa7cbe99ac395db30e431f6f33 k3b-0.11.20.ebuild 3258
-MD5 4a18731d572ed5af0b368bef67ab4775 k3b-0.11.22.ebuild 3103
 MD5 cb5adb6127546e24d965148cf362699f k3b-0.11.18.ebuild 3269
-MD5 2bf6cdbe0f77081303e185012033175c ChangeLog 13992
+MD5 8250563ff6edf35e20c18a976c51f599 ChangeLog 14283
+MD5 d98b6779a565bff94379c620704ad3d3 k3b-0.11.23-r2.ebuild 3202
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 e863d7c5a6bc253125a06ba6b230d561 files/k3b-0.11.18-configure-libsamplerate.patch 830
-MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23-r1 132
+MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23-r2 132
 MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893
-MD5 07a27bd19c22330f89e89f0e3d663a3a files/digest-k3b-0.11.17 132
 MD5 d6b7a5cc59198e0b99b320d118983fd6 files/digest-k3b-0.11.18 132
-MD5 1981f7fa1e6130f50d53e11eec308fca files/digest-k3b-0.11.19 132
-MD5 f88983da017f717fb05f05512a718b03 files/digest-k3b-0.11.20 132
-MD5 a241e6d966bd333debe30f5654aeccae files/digest-k3b-0.11.22 132
 MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23 132
-MD5 126b536a3df3e9f61867b04e116d97d3 files/k3b-dvdrip-transcode.patch 1241
+MD5 cadf88fe9212cce203dc7eea67384195 files/k3b-dvdrip-transcode.patch 1998
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.17 b/app-cdr/k3b/files/digest-k3b-0.11.17
deleted file mode 100644
index e428027040a9..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.17
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5c07b7ffc2f931d84b18e9fe7aa2b41c k3b-0.11.17.tar.bz2 3187604
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.19 b/app-cdr/k3b/files/digest-k3b-0.11.19
deleted file mode 100644
index fb569dc822b9..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.19
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4fb2ef833c78e537f9bed429b3190b83 k3b-0.11.19.tar.bz2 3190882
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.20 b/app-cdr/k3b/files/digest-k3b-0.11.20
deleted file mode 100644
index 0ec49f2d2f87..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.20
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6c4844319ccb5e9be3ec69aec80c8d5f k3b-0.11.20.tar.bz2 3190897
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.22 b/app-cdr/k3b/files/digest-k3b-0.11.22
deleted file mode 100644
index 725c49523e35..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.22
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 deb1811763b81a7c90bbfd2dd587ad2c k3b-0.11.22.tar.bz2 3195356
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.23-r1 b/app-cdr/k3b/files/digest-k3b-0.11.23-r2
index 9bb16a54e08c..9bb16a54e08c 100644
--- a/app-cdr/k3b/files/digest-k3b-0.11.23-r1
+++ b/app-cdr/k3b/files/digest-k3b-0.11.23-r2
diff --git a/app-cdr/k3b/files/k3b-dvdrip-transcode.patch b/app-cdr/k3b/files/k3b-dvdrip-transcode.patch
index 855fae55267b..570dc9c885d6 100644
--- a/app-cdr/k3b/files/k3b-dvdrip-transcode.patch
+++ b/app-cdr/k3b/files/k3b-dvdrip-transcode.patch
@@ -1,6 +1,6 @@
-diff -Narup k3b-0.11.20.orig/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.20/src/rip/k3bdvdrippingprocess.cpp
---- k3b-0.11.20.orig/src/rip/k3bdvdrippingprocess.cpp	2004-06-02 21:31:41.000000000 +1200
-+++ k3b-0.11.20/src/rip/k3bdvdrippingprocess.cpp	2005-02-28 15:45:02.641948322 +1300
+diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
+--- k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp	2004-06-02 21:31:41.000000000 +1200
++++ k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp	2005-04-15 11:21:13.000000000 +1200
 @@ -83,7 +83,15 @@ void K3bDvdRippingProcess::checkRippingM
      m_title = QString::number( (*m_dvd).getTitleNumber() );
      if( (*m_dvd).getMaxAngle() == 1 ) {
@@ -18,3 +18,23 @@ diff -Narup k3b-0.11.20.orig/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.20/src/ri
      } else {
          kdDebug() << "K3bDvdRippingProcess) Rip Angle" << endl;
          // workaround due to buggy transcode, angle selection doesn't work with -1 (all chapters)
+@@ -119,13 +127,19 @@ void K3bDvdRippingProcess::startRippingP
+     connect( m_audioProcess, SIGNAL( finished() ), this, SLOT( slotAudioProcessFinished() ) );
+     m_delAudioProcess = true;
+     */
++
+     const K3bExternalBin *m_tccatBin = k3bcore->externalBinManager()->binObject("tccat");
++
++    /*
++     * This check probably not required any more
++     *
+     if( m_tccatBin->version >= K3bVersion( 0, 6, 12 ) ) {
+       emit infoMessage( i18n("Sorry, K3b does not support ripping Video DVDs with transcode >= 0.6.12 yet."),
+ 			ERROR );
+       emit finished( false );
+       return;
+     }
++    */
+ 
+     m_ripProcess = new KShellProcess();
+     kdDebug() << "(K3bDvdRippingProcess)" << m_tccatBin->path << " -i " << m_device <<" "<< m_ripMode << endl;
diff --git a/app-cdr/k3b/k3b-0.11.17.ebuild b/app-cdr/k3b/k3b-0.11.17.ebuild
deleted file mode 100644
index 8753a65cf6b8..000000000000
--- a/app-cdr/k3b/k3b-0.11.17.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.17.ebuild,v 1.14 2005/04/08 09:46:54 greg_g Exp $
-
-inherit kde eutils
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc amd64"
-IUSE="arts dvdr kde oggvorbis mad flac encode"
-
-DEPEND="kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 ) )
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	flac? ( media-libs/flac )
-	mad? ( >=media-sound/madplay-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )
-	arts? ( kde-base/arts )"
-RDEPEND="kde? ( || ( kde-base/kdebase-meta >=kde-base/kdebase-3.1 ) )
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	flac? ( <media-libs/flac-1.1.2 )
-	mad? ( >=media-sound/madplay-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )
-	arts? ( kde-base/arts )
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  media-video/transcode
-		  media-video/vcdimager )"
-need-kde 3.1
-
-I18N="${PN}-i18n-${PV%.*}"
-
-# These are the languages and translated documentation supported by k3b as of 
-# version 0.11.13. If you are using this ebuild as a model for another ebuild 
-# for another version of K3b, DO check whether these values are different.
-# Check the {po,doc}/Makefile.am files in k3b-i18n package.
-LANGS="ar bg bs ca cs da de el en_GB es et fi fo fr gl hu it ja nb nl nso pl pt pt_BR ro ru sk sl sr sv ta tr ven xh xx zh_CN zh_TW zu"
-LANGS_DOC="da de es et fr pt ru sv"
-
-MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-
-for X in $LANGS; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-noarts.patch
-}
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix= $(use_with kde k3bsetup) $(use_with arts)"
-
-	# Build process of K3B
-	kde_src_compile
-
-	# Build process of K3B-i18n, select LINGUAS elements
-	S=${WORKDIR}/${I18N}
-	if [ -n "${LINGUAS}" -a -d "${S}" ] ; then
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_DOC}:" ${S}/doc/Makefile.in
-		kde_src_compile
-	fi
-	S=${_S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog FAQ README TODO
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		cd ${WORKDIR}/${I18N}
-		make DESTDIR=${D} install || die
-	fi
-
-	# install menu entry and icon
-	dodir /usr/share/applications
-	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
-	if use kde; then
-		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
-	fi
-	rm -fR ${D}/usr/share/applnk/
-	dodir /usr/share/pixmaps
-	cp ${D}/usr/share/icons/crystalsvg/32x32/apps/k3b.png ${D}/usr/share/pixmaps/
-}
-
-pkg_postinst() {
-	echo ""
-	einfo "Note that k3b will report problems regarding the permissions of cdrecord"
-	einfo "and cdrdao, and will suggest some changes for your system. You are free"
-	einfo "to follow those advices, note nonetheless that on a default Gentoo install"
-	einfo "k3b should run fine when you are in the cdrom and cdrw group."
-	echo ""
-}
diff --git a/app-cdr/k3b/k3b-0.11.19.ebuild b/app-cdr/k3b/k3b-0.11.19.ebuild
deleted file mode 100644
index 17d252b9a619..000000000000
--- a/app-cdr/k3b/k3b-0.11.19.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.19.ebuild,v 1.6 2005/04/08 09:46:54 greg_g Exp $
-
-inherit kde eutils
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="arts dvdr encode flac kde mad oggvorbis"
-
-DEPEND="arts? ( kde-base/arts )
-	kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	media-libs/libsamplerate
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	flac? ( <media-libs/flac-1.1.2 )
-	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  !amd64? ( <media-video/transcode-0.6.12 )
-		  media-video/vcdimager )"
-
-need-kde 3.1
-
-I18N="${PN}-i18n-${PV%.*}"
-
-# These are the languages and translated documentation supported by k3b for 
-# version 0.11.x. If you are using this ebuild as a model for another ebuild 
-# for another version of K3b, DO check whether these values are different.
-# Check the {po,doc}/Makefile.am files in k3b-i18n package.
-LANGS="ar bg bs ca cs da de el en_GB es et fi fo fr gl hu it ja nb nl nso pl pt pt_BR ro ru sk sl sr sv ta tr ven xh xx zh_CN zh_TW zu"
-LANGS_DOC="da de es et fr pt ru sv"
-
-MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-
-for X in $LANGS; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/k3b-0.11.17-noarts.patch
-
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix= $(use_with kde k3bsetup) \
-		--with-external-libsamplerate"
-
-	# it is important to disable flac for bug #82558.
-	use flac || export ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single="no"
-
-	# Build process of K3B
-	kde_src_compile
-
-	# Build process of K3B-i18n, select LINGUAS elements
-	S=${WORKDIR}/${I18N}
-	if [ -n "${LINGUAS}" -a -d "${S}" ] ; then
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_DOC}:" ${S}/doc/Makefile.in
-		kde_src_compile
-	fi
-	S=${_S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog FAQ README TODO
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		cd ${WORKDIR}/${I18N}
-		make DESTDIR=${D} install || die
-	fi
-
-	# install menu entry and icon
-	dodir /usr/share/applications
-	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
-	if use kde; then
-		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
-	fi
-	rm -fR ${D}/usr/share/applnk/
-	dodir /usr/share/pixmaps
-	cp ${D}/usr/share/icons/crystalsvg/32x32/apps/k3b.png ${D}/usr/share/pixmaps/
-}
-
-pkg_postinst() {
-	echo
-	einfo "Make sure you have proper read/write permissions on the cdrom device(s)."
-	einfo "Usually, it is sufficient to be in the cdrom or cdrw group."
-	echo
-}
diff --git a/app-cdr/k3b/k3b-0.11.20.ebuild b/app-cdr/k3b/k3b-0.11.20.ebuild
deleted file mode 100644
index a2aaac98e3ee..000000000000
--- a/app-cdr/k3b/k3b-0.11.20.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.20.ebuild,v 1.4 2005/04/08 09:46:54 greg_g Exp $
-
-inherit kde eutils
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="arts dvdr encode flac kde mad oggvorbis"
-
-DEPEND="arts? ( kde-base/arts )
-	kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	media-libs/libsamplerate
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	flac? ( <media-libs/flac-1.1.2 )
-	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  !amd64? ( <media-video/transcode-0.6.12 )
-		  media-video/vcdimager )"
-
-need-kde 3.1
-
-I18N="${PN}-i18n-${PV%.*}"
-
-# These are the languages and translated documentation supported by k3b for 
-# version 0.11.x. If you are using this ebuild as a model for another ebuild 
-# for another version of K3b, DO check whether these values are different.
-# Check the {po,doc}/Makefile.am files in k3b-i18n package.
-LANGS="ar bg bs ca cs da de el en_GB es et fi fo fr gl hu it ja nb nl nso pl pt pt_BR ro ru sk sl sr sv ta tr ven xh xx zh_CN zh_TW zu"
-LANGS_DOC="da de es et fr pt ru sv"
-
-MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-
-for X in $LANGS; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/k3b-0.11.17-noarts.patch
-
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix= $(use_with kde k3bsetup) \
-		--with-external-libsamplerate"
-
-	# it is important to disable flac for bug #82558.
-	use flac || export ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single="no"
-
-	# Build process of K3B
-	kde_src_compile
-
-	# Build process of K3B-i18n, select LINGUAS elements
-	S=${WORKDIR}/${I18N}
-	if [ -n "${LINGUAS}" -a -d "${S}" ] ; then
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_DOC}:" ${S}/doc/Makefile.in
-		kde_src_compile
-	fi
-	S=${_S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog FAQ README TODO
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		cd ${WORKDIR}/${I18N}
-		make DESTDIR=${D} install || die
-	fi
-
-	# install menu entry and icon
-	dodir /usr/share/applications
-	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
-	if use kde; then
-		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
-	fi
-	rm -fR ${D}/usr/share/applnk/
-	dodir /usr/share/pixmaps
-	cp ${D}/usr/share/icons/crystalsvg/32x32/apps/k3b.png ${D}/usr/share/pixmaps/
-}
-
-pkg_postinst() {
-	echo
-	einfo "Make sure you have proper read/write permissions on the cdrom device(s)."
-	einfo "Usually, it is sufficient to be in the cdrom or cdrw group."
-	echo
-}
diff --git a/app-cdr/k3b/k3b-0.11.22.ebuild b/app-cdr/k3b/k3b-0.11.22.ebuild
deleted file mode 100644
index 77f87a6a22ac..000000000000
--- a/app-cdr/k3b/k3b-0.11.22.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.22.ebuild,v 1.3 2005/04/08 09:46:54 greg_g Exp $
-
-inherit kde eutils
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://www.k3b.org/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="arts dvdr encode flac kde mad oggvorbis"
-
-DEPEND="arts? ( kde-base/arts )
-	kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	media-libs/libsamplerate
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	oggvorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  !amd64? ( <media-video/transcode-0.6.12 )
-		  media-video/vcdimager )"
-
-need-kde 3.1
-
-I18N="${PN}-i18n-${PV%.*}"
-
-# These are the languages and translated documentation supported by k3b for 
-# version 0.11.x. If you are using this ebuild as a model for another ebuild 
-# for another version of K3b, DO check whether these values are different.
-# Check the {po,doc}/Makefile.am files in k3b-i18n package.
-LANGS="ar bg bs ca cs da de el en_GB es et fi fo fr gl hu it ja nb nl nso pl pt pt_BR ro ru sk sl sr sv ta tr ven xh xx zh_CN zh_TW zu"
-LANGS_DOC="da de es et fr pt ru sv"
-
-MAKE_PO=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-MAKE_DOC=$(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-
-for X in $LANGS; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-src_unpack() {
-	kde_src_unpack
-	epatch "${FILESDIR}/k3b-0.11.17-noarts.patch"
-
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix= $(use_with kde k3bsetup)
-		      --with-external-libsamplerate --without-resmgr
-		      $(use_with oggvorbis) $(use_with mad libmad)
-		      $(use_with flac)"
-
-
-	# Build process of K3B
-	kde_src_compile
-
-	# Build process of K3B-i18n, select LINGUAS elements
-	S=${WORKDIR}/${I18N}
-	if [ -n "${LINGUAS}" -a -d "${S}" ] ; then
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in
-		sed -i -e "s:^SUBDIRS = .*:SUBDIRS = ${MAKE_DOC}:" ${S}/doc/Makefile.in
-		kde_src_compile
-	fi
-	S=${_S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog FAQ README TODO
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		cd ${WORKDIR}/${I18N}
-		make DESTDIR=${D} install || die
-	fi
-
-	# install menu entry
-	dodir /usr/share/applications
-	mv ${D}/usr/share/applnk/Multimedia/k3b.desktop ${D}/usr/share/applications
-	if use kde; then
-		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications
-	fi
-	rm -fR ${D}/usr/share/applnk/
-}
-
-pkg_postinst() {
-	echo
-	einfo "Make sure you have proper read/write permissions on the cdrom device(s)."
-	einfo "Usually, it is sufficient to be in the cdrom or cdrw group."
-	echo
-}
diff --git a/app-cdr/k3b/k3b-0.11.23-r1.ebuild b/app-cdr/k3b/k3b-0.11.23-r2.ebuild
index ade509120a0a..2b1aba77046d 100644
--- a/app-cdr/k3b/k3b-0.11.23-r1.ebuild
+++ b/app-cdr/k3b/k3b-0.11.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.23-r1.ebuild,v 1.1 2005/04/14 15:24:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.23-r2.ebuild,v 1.1 2005/04/15 19:43:36 carlo Exp $
 
 inherit kde eutils
 
@@ -49,6 +49,13 @@ for X in $LANGS; do
 	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
 done
 
+pkg_setup() {
+	if use encode ; then
+		echo
+		ewarn "Please notice, that K3b does not support ripping Video DVDs with >=media-video/transcode-0.6.12."
+		echo
+	fi
+}
 src_unpack() {
 	kde_src_unpack
 	epatch "${FILESDIR}/k3b-0.11.17-noarts.patch"