remove some old versions; fix up 0.11.1 ebuild

19 files changed, 104 insertions, 605 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 19d12e1699ff..36e669d9757d 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.35 2004/01/26 17:27:11 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.36 2004/01/27 14:52:57 lanius Exp $
+
+*k3b-0.11.1-r1 (27 Jan 2004)
+
+  27 Jan 2004; Heinrich Wendel <lanius@gentoo.org> k3b-0.10.1.ebuild,
+  k3b-0.10.3-r1.ebuild, k3b-0.10.3.ebuild, k3b-0.10.ebuild,
+  k3b-0.11.1-r1.ebuild, k3b-0.11.1.ebuild, k3b-0.8.1-r1.ebuild,
+  k3b-0.9-r1.ebuild, files/k3b-0.10.1-include-limits.patch,
+  files/mp3decoder_fix.diff:
+  remove some old versions; fix up 0.11.1 ebuild
 
 *k3b-0.11.1 (26 Jan 2004)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 28bbe410095a..82372d869d26 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,23 +1,9 @@
-MD5 2d2dfffbe3b43feecb301f1399ffc54b k3b-0.10.ebuild 1356
-MD5 b835c44caeb8bd669a03518d94431ce7 k3b-0.10.1.ebuild 2216
-MD5 c8059f04dbaf19c751511c752a353b75 k3b-0.9.ebuild 1320
-MD5 5118615296ac5de7c1885db236a42b97 ChangeLog 5513
-MD5 e6f88272265ae98cbfa985a86070cf5d k3b-0.11.1.ebuild 3044
-MD5 5182d2d849b74868b2ed18cc4924db72 k3b-0.9-r1.ebuild 1605
-MD5 8754504a614d5a1b7a739a2b2109c70f k3b-0.8.1-r1.ebuild 933
+MD5 0144613bb6a8ad1107f3a0355a660975 k3b-0.11.1-r1.ebuild 2429
+MD5 96c9e162f6292e38ee3ff018862cba0e k3b-0.9.ebuild 1321
+MD5 ddc9d032d1527467d9196e79c64b39b8 k3b-0.10.3-r2.ebuild 3224
+MD5 1fc47acccb1376c8d0806aa80ed36163 ChangeLog 5876
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 737a20c6b77d9cdadbb3a1a8496b3aa5 k3b-0.10.3-r1.ebuild 3041
-MD5 c37b176b7f0a897312ff3a3931b89acc k3b-0.10.3-r2.ebuild 3223
-MD5 f2376520a1e4cd8a3903ae808e7c6b0d k3b-0.10.3.ebuild 2842
-MD5 43a105c8a3d881b6ab605196dff8fd70 files/k3b-0.10.1-include-limits.patch 362
-MD5 123359fe8e34b067c388e262b5b61086 files/digest-k3b-0.10.3-r1 129
-MD5 ca7ada914db5a1dd08f88d73a03c7f13 files/digest-k3b-0.11.1 64
-MD5 c549a5d24aece143a2693361b98742c1 files/mp3decoder_fix.diff 731
-MD5 b4f3bb652d120e21af8dc7de11402701 files/digest-k3b-0.10.1 129
-MD5 123359fe8e34b067c388e262b5b61086 files/digest-k3b-0.10.3 129
-MD5 bccf6b7471b1197e4a45d35fca9b5984 files/digest-k3b-0.10 61
-MD5 af62583ac173cdc2cc55a43cdc1b48f8 files/k3b-0.10.3-hacked-cdrdao.patch 690
-MD5 4f97636cdaf97e2394166286641f5742 files/digest-k3b-0.8.1-r1 62
-MD5 bd8dd88243b4b87472986447644ce855 files/digest-k3b-0.9-r1 60
 MD5 bd8dd88243b4b87472986447644ce855 files/digest-k3b-0.9 60
 MD5 123359fe8e34b067c388e262b5b61086 files/digest-k3b-0.10.3-r2 129
+MD5 ca7ada914db5a1dd08f88d73a03c7f13 files/digest-k3b-0.11.1-r1 64
+MD5 af62583ac173cdc2cc55a43cdc1b48f8 files/k3b-0.10.3-hacked-cdrdao.patch 690
diff --git a/app-cdr/k3b/files/digest-k3b-0.10 b/app-cdr/k3b/files/digest-k3b-0.10
deleted file mode 100644
index a7e5304b73fd..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 480b6d6777a9151868677a1ae078e7c7 k3b-0.10.tar.gz 2545583
diff --git a/app-cdr/k3b/files/digest-k3b-0.10.1 b/app-cdr/k3b/files/digest-k3b-0.10.1
deleted file mode 100644
index 9c6d172ffa71..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.10.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8895fb017501ea02bd1200c0d8a56f2a k3b-0.10.1.tar.gz 2547322
-MD5 a14fd760bb146eaee22802c504e53152 k3b-i18n-0.10.tar.gz 3241287
diff --git a/app-cdr/k3b/files/digest-k3b-0.10.3 b/app-cdr/k3b/files/digest-k3b-0.10.3
deleted file mode 100644
index c8145e7e27b5..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.10.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 41a21815c2edaa3aaaa55bb922e71750 k3b-0.10.3.tar.gz 2547189
-MD5 a14fd760bb146eaee22802c504e53152 k3b-i18n-0.10.tar.gz 3241287
diff --git a/app-cdr/k3b/files/digest-k3b-0.10.3-r1 b/app-cdr/k3b/files/digest-k3b-0.10.3-r1
deleted file mode 100644
index c8145e7e27b5..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.10.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 41a21815c2edaa3aaaa55bb922e71750 k3b-0.10.3.tar.gz 2547189
-MD5 a14fd760bb146eaee22802c504e53152 k3b-i18n-0.10.tar.gz 3241287
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.1 b/app-cdr/k3b/files/digest-k3b-0.11.1-r1
index 8bc2f156bdc6..8bc2f156bdc6 100644
--- a/app-cdr/k3b/files/digest-k3b-0.11.1
+++ b/app-cdr/k3b/files/digest-k3b-0.11.1-r1
diff --git a/app-cdr/k3b/files/digest-k3b-0.8.1-r1 b/app-cdr/k3b/files/digest-k3b-0.8.1-r1
deleted file mode 100644
index 9cb6b1bd37c3..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.8.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f205fcb7afb11d8db07cac20e431819 k3b-0.8.1.tar.gz 2840802
diff --git a/app-cdr/k3b/files/digest-k3b-0.9-r1 b/app-cdr/k3b/files/digest-k3b-0.9-r1
deleted file mode 100644
index 4af88e013c7a..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cac0c1e80862070e9b0da2ead5ff4521 k3b-0.9.tar.gz 2952798
diff --git a/app-cdr/k3b/files/k3b-0.10.1-include-limits.patch b/app-cdr/k3b/files/k3b-0.10.1-include-limits.patch
deleted file mode 100644
index f2fcac468f54..000000000000
--- a/app-cdr/k3b/files/k3b-0.10.1-include-limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- k3b-0.10.1/src/core/device/k3bdevicemanager.cpp.orig	2003-10-31 10:47:23.000000000 +0200
-+++ k3b-0.10.1/src/core/device/k3bdevicemanager.cpp	2003-10-31 10:47:56.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <errno.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#include <linux/limits.h>
- 
- /* Fix definitions for 2.5 kernels */
- #include <linux/version.h>
diff --git a/app-cdr/k3b/files/mp3decoder_fix.diff b/app-cdr/k3b/files/mp3decoder_fix.diff
deleted file mode 100644
index 6a389d0f7086..000000000000
--- a/app-cdr/k3b/files/mp3decoder_fix.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/audio/input/mp3/k3bmp3module.cpp	2003-05-27 03:43:45.000000000 -0500
-+++ src/audio/input/mp3/k3bmp3module_1.cpp	2003-08-31 06:46:57.000000000 -0500
-@@ -425,7 +425,7 @@ unsigned int K3bMp3Module::resampleBlock
- 
-     while (step < MAD_F_ONE) {
-        *target++ = step ?
-- 	last + mad_f_mul(*source - last, step) 
-+ 	last + __extension__ mad_f_mul(*source - last, step) 
-  	: last;
- 
-        step += m_madResampledRatio;
-@@ -442,7 +442,7 @@ unsigned int K3bMp3Module::resampleBlock
-     step = mad_f_fracpart(step);
- 
-     *target++ = step ?
--      *source + mad_f_mul(source[1] - source[0], step) 
-+      *source + __extension__ mad_f_mul(source[1] - source[0], step) 
-       : *source;
- 
-     step += m_madResampledRatio;
diff --git a/app-cdr/k3b/k3b-0.10.1.ebuild b/app-cdr/k3b/k3b-0.10.1.ebuild
deleted file mode 100644
index 1f46806eb678..000000000000
--- a/app-cdr/k3b/k3b-0.10.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.10.1.ebuild,v 1.3 2003/11/08 10:33:24 dholm Exp $
-
-inherit kde
-need-kde 3.1
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://k3b.sourceforge.net/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="debug dvd oggvorbis mad dvdr"
-
-newdepend ">=sys-apps/portage-2.0.49-r8
-	>=media-sound/mpg123-0.59
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	mad? ( >=media-sound/mad-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )"
-
-RDEPEND="$RDEPEND sys-apps/eject
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.5
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	dvd? ( media-video/transcode media-libs/xvid )"
-
-LANGS="af bg ca cs cy da de el en_GB eo es et fa fr he hu it
-ja nb nl nn pl pt pt_BR ru se sk sl sr sv tr ven xh zh_CN zh_TW"
-
-I18N=${PN}-i18n-${PV/10.1/10}
-
-for pkg in $LANGS
-do
-	SRC_URI="$SRC_URI linguas_${pkg}? (mirror://sourceforge/k3b/${I18N}.tar.gz)"
-done
-
-myconf="$myconf --enable-sso"
-[ `use debug` ] \
-	&& myconf="$myconf --enable-debugging --enable-profiling" \
-	|| myconf="$myconf --disable-debugging --disable-profiling"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	base_src_unpack unpack
-	epatch ${FILESDIR}/${P}-include-limits.patch
-}
-
-src_compile() {
-	local _S=${S}
-	if ! [ -z $LINGUAS ]; then
-		echo "SUBDIRS = "${LINGUAS} > ${WORKDIR}/${I18N}/po/Makefile.am
-	fi
-	for dir in `ls ${WORKDIR}`; do
-		S=${WORKDIR}/$dir
-		kde_src_compile myconf
-		myconf="$myconf --prefix=$KDEDIR -C"
-		kde_src_compile configure
-		kde_src_compile make
-	done
-	S=${_S}
-}
-
-src_install() {
-	local _S=${S}
-	for dir in `ls ${WORKDIR}`; do
-		cd ${WORKDIR}/$dir
-		make install DESTDIR=${D} destdir=${D}
-	done
-	S=${_S}
-}
-
-pkg_postinst()
-{
-	einfo "The k3b setup program will offer to change some permissions and"
-	einfo "create a user group.  These changes are not necessary.  We recommend"
-	einfo "that you clear the two check boxes that let k3b make changes for"
-	einfo "cdrecord and cdrdao and let k3b make changes for the devices when"
-	einfo "running k3b setup."
-}
diff --git a/app-cdr/k3b/k3b-0.10.3-r1.ebuild b/app-cdr/k3b/k3b-0.10.3-r1.ebuild
deleted file mode 100644
index 3509ea7269f4..000000000000
--- a/app-cdr/k3b/k3b-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.10.3-r1.ebuild,v 1.3 2003/12/14 22:21:07 azarah Exp $
-
-inherit kde
-need-kde 3.1
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://k3b.sourceforge.net/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="debug dvd oggvorbis mad dvdr"
-
-newdepend ">=sys-apps/portage-2.0.49-r8
-	>=media-sound/mpg123-0.59
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	mad? ( >=media-sound/mad-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${RDEPEND} sys-apps/eject
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.5
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	dvd? ( media-video/transcode media-libs/xvid )"
-
-LANGS="af bg ca cs cy da de el en_GB eo es et fa fr he hu it \
-ja nb nl nn pl pt pt_BR ru se sk sl sr sv tr ven xh zh_CN zh_TW"
-
-I18N="${PN}-i18n-${PV%.*}"
-
-for pkg in ${LANGS}
-do
-	SRC_URI="${SRC_URI} linguas_${pkg}? ( mirror://sourceforge/k3b/${I18N}.tar.gz )"
-done
-
-myconf="$myconf --enable-sso"
-[ -n "`use debug`" ] \
-	&& myconf="${myconf} --enable-debugging --enable-profiling" \
-	|| myconf="${myconf} --disable-debugging --disable-profiling"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	base_src_unpack unpack
-}
-
-src_compile() {
-	local myconf=
-	local _S="${S}"
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		echo "SUBDIRS = ${LINGUAS}" > ${WORKDIR}/${I18N}/po/Makefile.am
-	fi
-
-	# Build process of K3B
-	S="${WORKDIR}/k3b-${PV}"
-	cd ${S} && aclocal
-	kde_src_compile myconf
-	myconf="${myconf} --prefix=${KDEDIR} -C"
-	kde_src_compile configure
-	kde_src_compile make
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		# Build process for K3B-i18n
-		# I think running this in a for-loop is not necessary, 
-		# because there should be only those two directories. 
-		# If you find a better way for running aclocal and automake, do so... :)
-		S="${WORKDIR}/${I18N}"
-		ebegin "Running aclocal and automake, fixes bug #32564..."
-		kde_src_compile myconf
-		aclocal
-		if [ "$?" -eq 0 ]; then
-			WANT_AUTOMAKE="1.7" automake
-		fi
-		eend $?
-		myconf="${myconf} --prefix=${KDEDIR} -C"
-		kde_src_compile configure
-		kde_src_compile make
-	fi
-
-	S="${_S}"
-}
-
-src_install() {
-	local dir=
-
-	for dir in `ls ${WORKDIR}`; do
-		if [ -d "${WORKDIR}/${dir}" ]; then
-			cd ${WORKDIR}/${dir}
-			make install DESTDIR=${D} destdir=${D} || die
-		fi
-	done
-}
-
-pkg_postinst()
-{
-	einfo "The k3b setup program will offer to change some permissions and"
-	einfo "create a user group.  These changes are not necessary.  We recommend"
-	einfo "that you clear the two check boxes that let k3b make changes for"
-	einfo "cdrecord and cdrdao and let k3b make changes for the devices when"
-	einfo "running k3b setup."
-	echo
-	einfo "The k3b setup program is now part of the KDE Control Center"
-	einfo "under System Administration.  It can be accessed by running"
-	einfo "'kcmshell k3bsetup2'"
-}
diff --git a/app-cdr/k3b/k3b-0.10.3.ebuild b/app-cdr/k3b/k3b-0.10.3.ebuild
deleted file mode 100644
index f8a07ef29743..000000000000
--- a/app-cdr/k3b/k3b-0.10.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.10.3.ebuild,v 1.1 2003/12/04 20:18:56 caleb Exp $
-
-inherit kde
-need-kde 3.1
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://k3b.sourceforge.net/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="debug dvd oggvorbis mad dvdr"
-
-newdepend ">=sys-apps/portage-2.0.49-r8
-	>=media-sound/mpg123-0.59
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	mad? ( >=media-sound/mad-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )"
-
-RDEPEND="$RDEPEND sys-apps/eject
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.5
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	dvd? ( media-video/transcode media-libs/xvid )"
-
-LANGS="af bg ca cs cy da de el en_GB eo es et fa fr he hu it
-ja nb nl nn pl pt pt_BR ru se sk sl sr sv tr ven xh zh_CN zh_TW"
-
-I18N=${PN}-i18n-${PV/10.3/10}
-
-for pkg in $LANGS
-do
-	SRC_URI="$SRC_URI linguas_${pkg}? (mirror://sourceforge/k3b/${I18N}.tar.gz)"
-done
-
-myconf="$myconf --enable-sso"
-[ `use debug` ] \
-	&& myconf="$myconf --enable-debugging --enable-profiling" \
-	|| myconf="$myconf --disable-debugging --disable-profiling"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	base_src_unpack unpack
-}
-
-src_compile() {
-	local _S=${S}
-	if ! [ -z $LINGUAS ]; then
-		echo "SUBDIRS = "${LINGUAS} > ${WORKDIR}/${I18N}/po/Makefile.am
-	fi
-
-	# Build process of K3B
-	S=${WORKDIR}/k3b-${PV}
-	cd ${S} && aclocal
-	kde_src_compile myconf
-	myconf="$myconf --prefix=$KDEDIR -C"
-	kde_src_compile configure
-	kde_src_compile make
-
-	# Build process for K3B-i18n
-	# I think running this in a for-loop is not necessary, 
-	# because there should be only those two directories. 
-	# If you find a better way for running aclocal and automake, do so... :)
-	S=${WORKDIR}/${I18N}
-	ebegin "Running aclocal and automake, fixes bug #32564..."
-	kde_src_compile myconf
-	aclocal
-	if [ "$?" == "0" ];
-		then WANT_AUTOMAKE=1.7 automake;
-	fi;
-	eend $?
-	myconf="$myconf --prefix=$KDEDIR -C"
-	kde_src_compile configure
-	kde_src_compile make
-
-	S=${_S}
-}
-
-src_install() {
-	local _S=${S}
-	for dir in `ls ${WORKDIR}`; do
-		cd ${WORKDIR}/$dir
-		make install DESTDIR=${D} destdir=${D}
-	done
-	S=${_S}
-}
-
-pkg_postinst()
-{
-	einfo "The k3b setup program will offer to change some permissions and"
-	einfo "create a user group.  These changes are not necessary.  We recommend"
-	einfo "that you clear the two check boxes that let k3b make changes for"
-	einfo "cdrecord and cdrdao and let k3b make changes for the devices when"
-	einfo "running k3b setup."
-	echo
-	einfo "The k3b setup program is now part of the KDE Control Center"
-	einfo "under System Administration.  It can be accessed by running"
-	einfo "'kcmshell k3bsetup2'"
-}
diff --git a/app-cdr/k3b/k3b-0.10.ebuild b/app-cdr/k3b/k3b-0.10.ebuild
deleted file mode 100644
index a3f9a9131341..000000000000
--- a/app-cdr/k3b/k3b-0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.10.ebuild,v 1.2 2003/10/14 19:13:03 caleb Exp $
-
-inherit kde-base
-need-kde 3.1
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://k3b.sourceforge.net/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="debug dvd oggvorbis mad dvdr"
-
-newdepend ">=media-sound/mpg123-0.59
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	mad? ( >=media-sound/mad-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )"
-
-RDEPEND="$RDEPEND sys-apps/eject
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.5
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	dvd? ( media-video/transcode media-libs/xvid )"
-
-myconf="$myconf --enable-sso"
-[ `use debug` ] \
-	&& myconf="$myconf --enable-debugging --enable-profiling" \
-	|| myconf="$myconf --disable-debugging --disable-profiling"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_postinst()
-{
-	einfo "The k3b setup program will offer to change some permissions and"
-	einfo "create a user group.  These changes are not necessary.  We recommend"
-	einfo "that you clear the two check boxes that let k3b make changes for"
-	einfo "cdrecord and cdrdao and let k3b make changes for the devices when"
-	einfo "running k3b setup."
-}
diff --git a/app-cdr/k3b/k3b-0.11.1-r1.ebuild b/app-cdr/k3b/k3b-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..be0b3753609b
--- /dev/null
+++ b/app-cdr/k3b/k3b-0.11.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.1-r1.ebuild,v 1.1 2004/01/27 14:52:57 lanius Exp $
+
+inherit kde
+need-kde 3.1
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://k3b.sourceforge.net/"
+SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+IUSE="debug dvdr kde oggvorbis mad flac encode"
+
+DEPEND="${DEPEND}
+	kde? ( >=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/mad-0.14.2b )
+	oggvorbis? ( media-libs/libvorbis )"
+
+RDEPEND="${RDEPEND}
+	>=app-cdr/cdrtools-1.11
+	>=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 )"
+
+# i18n support will be available in following releases
+
+#LANGS="af bg ca cs cy da de el en_GB eo es et fa fr he hu it \
+#ja nb nl nn pl pt pt_BR ru se sk sl sr sv tr ven xh zh_CN zh_TW"
+
+#I18N="${PN}-i18n-${PV%.*}"
+
+#for pkg in ${LANGS}
+#do
+#	SRC_URI="${SRC_URI} linguas_${pkg}? ( mirror://sourceforge/k3b/${I18N}.tar.gz )"
+#done
+
+src_compile() {
+#	local _S="${S}"
+
+	local myconf="--enable-libsuffix="
+
+	use debug && myconf="${myconf} --enable-debugging --enable-profiling" \
+		|| myconf="${myconf} --disable-debugging --disable-profiling"
+	use kde || myconf="${myconf} --without-k3bsetup"
+
+	# Build process of K3B
+	kde_src_compile
+
+#	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
+#		# Build process for K3B-i18n
+#		S="${WORKDIR}/${I18N}"
+#		echo "SUBDIRS = ${LINGUAS}" > ${S}/po/Makefile.am
+#		kde_src_compile
+#	fi
+
+#	S="${_S}"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+#	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
+#		cd "${WORKDIR}/${I18N}"
+#		make DESTDIR=${D} install || die
+#	fi
+}
+
+pkg_postinst()
+{
+	einfo "The k3b setup program will offer to change some permissions and"
+	einfo "create a user group.  These changes are not necessary.  We recommend"
+	einfo "that you clear the two check boxes that let k3b make changes for"
+	einfo "cdrecord and cdrdao and let k3b make changes for the devices when"
+	einfo "running k3b setup."
+	echo
+	einfo "I18n tarballs are not evailable yet, due to kde 3.2 release plan."
+	einfo "LINGUAS is \"disabled\" therefore."
+}
diff --git a/app-cdr/k3b/k3b-0.11.1.ebuild b/app-cdr/k3b/k3b-0.11.1.ebuild
deleted file mode 100644
index b228bdfe63d1..000000000000
--- a/app-cdr/k3b/k3b-0.11.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.1.ebuild,v 1.1 2004/01/26 17:27:11 lu_zero Exp $
-
-inherit kde
-need-kde 3.1
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://k3b.sourceforge.net/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS=" ~ppc"
-IUSE="debug dvd oggvorbis mad dvdr"
-
-newdepend ">=sys-apps/portage-2.0.49-r8
-	>=media-sound/mpg123-0.59
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	mad? ( >=media-sound/mad-0.14.2b )
-	oggvorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${RDEPEND} sys-apps/eject
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	dvd? ( media-video/transcode media-libs/xvid )"
-
-LANGS="af bg ca cs cy da de el en_GB eo es et fa fr he hu it \
-ja nb nl nn pl pt pt_BR ru se sk sl sr sv tr ven xh zh_CN zh_TW"
-
-#I18N="${PN}-i18n-${PV%.*}"
-
-#for pkg in ${LANGS}
-#do
-#	SRC_URI="${SRC_URI} linguas_${pkg}? ( mirror://sourceforge/k3b/${I18N}.tar.gz )"
-#done
-
-myconf="$myconf --enable-sso"
-[ -n "`use debug`" ] \
-	&& myconf="${myconf} --enable-debugging --enable-profiling" \
-	|| myconf="${myconf} --disable-debugging --disable-profiling"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	base_src_unpack unpack
-}
-
-src_compile() {
-	local myconf=
-	local _S="${S}"
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		echo "SUBDIRS = ${LINGUAS}" > ${WORKDIR}/${I18N}/po/Makefile.am
-	fi
-
-	# Build process of K3B
-	S="${WORKDIR}/k3b-${PV}"
-	cd ${S} && aclocal
-	kde_src_compile myconf
-	myconf="${myconf} --prefix=${KDEDIR} -C"
-	kde_src_compile configure
-	kde_src_compile make
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		# Build process for K3B-i18n
-		# I think running this in a for-loop is not necessary, 
-		# because there should be only those two directories. 
-		# If you find a better way for running aclocal and automake, do so... :)
-		S="${WORKDIR}/${I18N}"
-		ebegin "Running aclocal and automake, fixes bug #32564..."
-		kde_src_compile myconf
-		aclocal
-		if [ "$?" -eq 0 ]; then
-			WANT_AUTOMAKE="1.7" automake
-		fi
-		eend $?
-		myconf="${myconf} --prefix=${KDEDIR} -C"
-		kde_src_compile configure
-		kde_src_compile make
-	fi
-
-	S="${_S}"
-}
-
-src_install() {
-	local dir=
-
-	for dir in `ls ${WORKDIR}`; do
-		if [ -d "${WORKDIR}/${dir}" ]; then
-			cd ${WORKDIR}/${dir}
-			make install DESTDIR=${D} destdir=${D} || die
-		fi
-	done
-}
-
-pkg_postinst()
-{
-	einfo "The k3b setup program will offer to change some permissions and"
-	einfo "create a user group.  These changes are not necessary.  We recommend"
-	einfo "that you clear the two check boxes that let k3b make changes for"
-	einfo "cdrecord and cdrdao and let k3b make changes for the devices when"
-	einfo "running k3b setup."
-	echo
-	einfo "The k3b setup program is now part of the KDE Control Center"
-	einfo "under System Administration.  It can be accessed by running"
-	einfo "'kcmshell k3bsetup2'"
-}
diff --git a/app-cdr/k3b/k3b-0.8.1-r1.ebuild b/app-cdr/k3b/k3b-0.8.1-r1.ebuild
deleted file mode 100644
index 3044bb8a8ff7..000000000000
--- a/app-cdr/k3b/k3b-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.8.1-r1.ebuild,v 1.4 2003/08/01 20:11:43 vapier Exp $
-
-inherit kde-base
-need-kde 3
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://k3b.sourceforge.net/"
-SRC_URI="mirror://sourceforge/k3b/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-IUSE="debug"
-
-newdepend ">=media-sound/mpg123-0.59
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	>=media-sound/mad-0.14.2b-r1
-	media-libs/libvorbis
-	>=kde-base/kdebase-3"
-
-RDEPEND="$RDEPEND sys-apps/eject
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.5
-	media-sound/normalize
-	dvd? ( media-video/transcode media-libs/xvid )"
-
-myconf="$myconf --enable-sso"
-[ `use debug` ] \
-	&& myconf="$myconf --enable-debugging --enable-profiling" \
-	|| myconf="$myconf --disable-debugging --disable-profiling"
diff --git a/app-cdr/k3b/k3b-0.9-r1.ebuild b/app-cdr/k3b/k3b-0.9-r1.ebuild
deleted file mode 100644
index 2d4912fa1ba6..000000000000
--- a/app-cdr/k3b/k3b-0.9-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.9-r1.ebuild,v 1.1 2003/10/02 15:41:15 caleb Exp $
-
-inherit kde-base
-need-kde 3.1
-
-MY_P=${P/_/""}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://k3b.sourceforge.net/"
-SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="debug"
-
-newdepend ">=media-sound/mpg123-0.59
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/id3lib-3.8.0_pre2
-	>=media-sound/mad-0.14.2b
-	media-libs/libvorbis"
-
-RDEPEND="$RDEPEND sys-apps/eject
-	>=app-cdr/cdrtools-1.11
-	>=app-cdr/cdrdao-1.1.5
-	media-sound/normalize
-	dvd? ( media-video/transcode media-libs/xvid )"
-
-myconf="$myconf --enable-sso"
-[ `use debug` ] \
-	&& myconf="$myconf --enable-debugging --enable-profiling" \
-	|| myconf="$myconf --disable-debugging --disable-profiling"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_compile()
-{
-	econf $myconf
-	sed 's:-pedantic::' src/audio/input/mp3/Makefile > src/audio/input/mp3/Makefile.temp
-	cp src/audio/input/mp3/Makefile.temp src/audio/input/mp3/Makefile
-	emake
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/mp3decoder_fix.diff
-}
-
-pkg_postinst()
-{
-	einfo "The k3b setup program will offer to change some permissions and"
-	einfo "create a user group.  These changes are not necessary.  We recommend"
-	einfo "that you clear the two check boxes that let k3b make changes for"
-	einfo "cdrecord and cdrdao and let k3b make changes for the devices when"
-	einfo "running k3b setup."
-}