Clean up and minor ebuild fixes, #104680

Package-Manager: portage-2.0.51.22-r2

11 files changed, 12 insertions, 466 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 36002ebe7d06..f328a48853dd 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
 # 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.122 2005/09/19 14:26:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.123 2005/09/19 22:44:27 carlo Exp $
+
+  19 Sep 2005; Carsten Lohrke <carlo@gentoo.org> -k3b-0.11.23-r2.ebuild,
+  k3b-0.11.24.ebuild, -k3b-0.12.1.ebuild, -k3b-0.12.2.ebuild,
+  -k3b-0.12.3.ebuild, k3b-0.12.4a.ebuild:
+  Clean up and minor ebuild fixes, #104680
 
 *k3b-0.12.4a (19 Sep 2005)
 
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.23-r2 b/app-cdr/k3b/files/digest-k3b-0.11.23-r2
deleted file mode 100644
index 9bb16a54e08c..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.23-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 eaff485fb4c431aae715b0ef95c43fcf k3b-0.11.23.tar.bz2 3195224
-MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/digest-k3b-0.12.1 b/app-cdr/k3b/files/digest-k3b-0.12.1
deleted file mode 100644
index c223ce27ad42..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.12.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d1354cc0d0b1e49b7d3f20defbedc9e9 k3b-0.12.1.tar.bz2 3768711
-MD5 d67b1dc8ededad4ffb75344d865913a2 k3b-i18n-0.12.1.tar.bz2 4138880
diff --git a/app-cdr/k3b/files/digest-k3b-0.12.2 b/app-cdr/k3b/files/digest-k3b-0.12.2
deleted file mode 100644
index f2b11b353778..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.12.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 52dac62c8f22330784f82703385482ee k3b-0.12.2.tar.bz2 3771371
-MD5 bea95a7fe1364231aba822f8aab7e4d9 k3b-i18n-0.12.2.tar.bz2 4023976
diff --git a/app-cdr/k3b/files/digest-k3b-0.12.3 b/app-cdr/k3b/files/digest-k3b-0.12.3
deleted file mode 100644
index 64ed24e9b5e0..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.12.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5a8515ad15d124104a79e63dab12366d k3b-0.12.3.tar.bz2 3778337
-MD5 26464eccb5a8801e175748c783c36974 k3b-i18n-0.12.3.tar.bz2 3649790
diff --git a/app-cdr/k3b/k3b-0.11.23-r2.ebuild b/app-cdr/k3b/k3b-0.11.23-r2.ebuild
deleted file mode 100644
index ea559bf756b5..000000000000
--- a/app-cdr/k3b/k3b-0.11.23-r2.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.23-r2.ebuild,v 1.5 2005/05/10 20:20:31 dertobi123 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
-		  media-video/transcode
-		  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"
-	epatch "${FILESDIR}/k3b-dvdrip-transcode.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.24.ebuild b/app-cdr/k3b/k3b-0.11.24.ebuild
index c9df6aa4119f..522186978e0e 100644
--- a/app-cdr/k3b/k3b-0.11.24.ebuild
+++ b/app-cdr/k3b/k3b-0.11.24.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.24.ebuild,v 1.4 2005/07/30 20:40:39 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.24.ebuild,v 1.5 2005/09/19 22:44:27 carlo Exp $
 
 inherit kde eutils
 
@@ -43,9 +43,6 @@ I18N="${PN}-i18n-${PV%.*}"
 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
@@ -54,6 +51,8 @@ src_unpack() {
 	kde_src_unpack
 	epatch "${FILESDIR}/k3b-0.11.17-noarts.patch"
 	make -f admin/Makefile.common || die
+	MAKE_PO=$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))
+	MAKE_DOC=$(echo $(echo "${LINGUAS} ${LANGS_DOC}" | fmt -w 1 | sort | uniq -d))
 }
 
 src_compile() {
diff --git a/app-cdr/k3b/k3b-0.12.1.ebuild b/app-cdr/k3b/k3b-0.12.1.ebuild
deleted file mode 100644
index aa023d634270..000000000000
--- a/app-cdr/k3b/k3b-0.12.1.ebuild
+++ /dev/null
@@ -1,115 +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.12.1.ebuild,v 1.3 2005/07/13 13:44:10 swegener Exp $
-
-inherit kde eutils flag-o-matic
-
-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"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="css dvdr encode ffmpeg flac hal kde mp3 musepack vorbis"
-
-DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	hal? ( =sys-apps/dbus-0.23*
-		=sys-apps/hal-0.4* )
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	media-libs/taglib
-	media-libs/musicbrainz
-	>=media-sound/cdparanoia-3.9.8
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	mp3? ( media-libs/libmad )
-	musepack? ( media-libs/libmpcdec )
-	vorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	css? ( media-libs/libdvdcss )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  media-video/transcode
-		  media-video/vcdimager )"
-
-need-kde 3.3
-
-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="bg br bs ca cs cy da de el en_GB es et fr ga hi hu is it lt mk nb nl nn pa pt pt_BR ru sr sv ta tr uk zh_CN"
-
-MAKE_LANGS=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-MAKE_lANGS=${MAKE_lANGS/sr/sr sr@Latn}
-
-for X in ${LANGS}; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-pkg_setup() {
-	use hal && if ! built_with_use sys-apps/dbus qt ; then
-		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
-		eerror "but sys-apps/dbus is not built with Qt support."
-		die
-	fi
-}
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix= --with-external-libsamplerate \
-			--without-resmgr --with-musicbrainz \
-			$(use_with kde k3bsetup)	\
-			$(use_with hal)			\
-			$(use_with encode lame)		\
-			$(use_with ffmpeg)		\
-			$(use_with flac)		\
-			$(use_with vorbis oggvorbis)	\
-			$(use_with mp3 libmad)		\
-			$(use_with musepack)"
-
-	# 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_LANGS}:" ${S}/Makefile.in
-		kde_src_compile
-	fi
-	S=${_S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL KNOWNBUGS PERMISSIONS README TODO
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		cd ${WORKDIR}/${I18N}
-		make DESTDIR=${D} install || die
-	fi
-
-	# install menu entry
-	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.12.2.ebuild b/app-cdr/k3b/k3b-0.12.2.ebuild
deleted file mode 100644
index df78247fda87..000000000000
--- a/app-cdr/k3b/k3b-0.12.2.ebuild
+++ /dev/null
@@ -1,115 +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.12.2.ebuild,v 1.4 2005/07/13 13:44:10 swegener Exp $
-
-inherit kde eutils flag-o-matic
-
-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"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="css dvdr encode ffmpeg flac hal kde mp3 musepack vorbis"
-
-DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	hal? ( =sys-apps/dbus-0.23*
-		=sys-apps/hal-0.4* )
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	media-libs/taglib
-	media-libs/musicbrainz
-	>=media-sound/cdparanoia-3.9.8
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	mp3? ( media-libs/libmad )
-	musepack? ( media-libs/libmpcdec )
-	vorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	css? ( media-libs/libdvdcss )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  media-video/transcode
-		  media-video/vcdimager )"
-
-need-kde 3.3
-
-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="bg br bs ca cs cy da de el en_GB es et fr ga hi hu is it lt mk nb nl nn pa pl pt pt_BR ru sl sr sv ta tr uk zh_CN"
-
-MAKE_LANGS=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-MAKE_LANGS=${MAKE_LANGS/sr/sr sr@Latn}
-
-for X in ${LANGS}; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-pkg_setup() {
-	use hal && if ! built_with_use sys-apps/dbus qt ; then
-		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
-		eerror "but sys-apps/dbus is not built with Qt support."
-		die
-	fi
-}
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix= --with-external-libsamplerate \
-			--without-resmgr --with-musicbrainz \
-			$(use_with kde k3bsetup)	\
-			$(use_with hal)			\
-			$(use_with encode lame)		\
-			$(use_with ffmpeg)		\
-			$(use_with flac)		\
-			$(use_with vorbis oggvorbis)	\
-			$(use_with mp3 libmad)		\
-			$(use_with musepack)"
-
-	# 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_LANGS}:" ${S}/Makefile.in
-		kde_src_compile
-	fi
-	S=${_S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL KNOWNBUGS PERMISSIONS README TODO
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		cd ${WORKDIR}/${I18N}
-		make DESTDIR=${D} install || die
-	fi
-
-	# install menu entry
-	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 group."
-	echo
-}
diff --git a/app-cdr/k3b/k3b-0.12.3.ebuild b/app-cdr/k3b/k3b-0.12.3.ebuild
deleted file mode 100644
index 266cad05bb4d..000000000000
--- a/app-cdr/k3b/k3b-0.12.3.ebuild
+++ /dev/null
@@ -1,115 +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.12.3.ebuild,v 1.1 2005/07/31 23:08:00 carlo Exp $
-
-inherit kde eutils flag-o-matic
-
-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"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="css dvdr encode ffmpeg flac hal kde mp3 musepack vorbis"
-
-DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
-	hal? ( =sys-apps/dbus-0.23*
-		=sys-apps/hal-0.4* )
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	media-libs/taglib
-	media-libs/musicbrainz
-	>=media-sound/cdparanoia-3.9.8
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac )
-	mp3? ( media-libs/libmad )
-	musepack? ( media-libs/libmpcdec )
-	vorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}
-	virtual/cdrtools
-	>=app-cdr/cdrdao-1.1.7-r3
-	media-sound/normalize
-	dvdr? ( app-cdr/dvd+rw-tools )
-	css? ( media-libs/libdvdcss )
-	encode? ( media-sound/lame
-		  media-sound/sox
-		  media-video/transcode
-		  media-video/vcdimager )"
-
-need-kde 3.3
-
-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="bg br bs ca cs cy da de el en_GB es et fr ga hi hu is it lt mk nb nl nn pa pl pt pt_BR ru sl sr sv ta tr uk zh_CN"
-
-MAKE_LANGS=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-MAKE_LANGS=${MAKE_LANGS/sr/sr sr@Latn}
-
-for X in ${LANGS}; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
-done
-
-pkg_setup() {
-	use hal && if ! built_with_use sys-apps/dbus qt ; then
-		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
-		eerror "but sys-apps/dbus is not built with Qt support."
-		die
-	fi
-}
-
-src_compile() {
-	local _S=${S}
-	local myconf="--enable-libsuffix= --with-external-libsamplerate \
-			--without-resmgr --with-musicbrainz \
-			$(use_with kde k3bsetup)	\
-			$(use_with hal)			\
-			$(use_with encode lame)		\
-			$(use_with ffmpeg)		\
-			$(use_with flac)		\
-			$(use_with vorbis oggvorbis)	\
-			$(use_with mp3 libmad)		\
-			$(use_with musepack)"
-
-	# 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_LANGS}:" ${S}/Makefile.in
-		kde_src_compile
-	fi
-	S=${_S}
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ INSTALL KNOWNBUGS PERMISSIONS README TODO
-
-	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-		cd ${WORKDIR}/${I18N}
-		make DESTDIR=${D} install || die
-	fi
-
-	# install menu entry
-	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 group."
-	echo
-}
diff --git a/app-cdr/k3b/k3b-0.12.4a.ebuild b/app-cdr/k3b/k3b-0.12.4a.ebuild
index df1006dcea98..9280a40e13a9 100644
--- a/app-cdr/k3b/k3b-0.12.4a.ebuild
+++ b/app-cdr/k3b/k3b-0.12.4a.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.12.4a.ebuild,v 1.1 2005/09/19 14:26:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.4a.ebuild,v 1.2 2005/09/19 22:44:27 carlo Exp $
 
 inherit kde eutils flag-o-matic
 
@@ -50,9 +50,6 @@ I18N="${PN}-i18n-${PV}"
 # Check the {po,doc}/Makefile.am files in k3b-i18n package.
 LANGS="bg br bs ca cs cy da de el en_GB es et fr ga hi hu is it lt mk nb nl nn pa pl pt pt_BR ru sl sr sv ta tr uk zh_CN"
 
-MAKE_LANGS=$(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d | fmt -w 10000)
-MAKE_LANGS=${MAKE_LANGS/sr/sr sr@Latn}
-
 for X in ${LANGS}; do
 	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
 done
@@ -63,6 +60,8 @@ pkg_setup() {
 		eerror "but sys-apps/dbus is not built with Qt support."
 		die
 	fi
+	MAKE_LANGS=$(echo $(echo "${LINGUAS} ${LANGS}" | fmt -w 1 | sort | uniq -d))
+	MAKE_LANGS=${MAKE_LANGS/sr/sr sr@Latn}
 }
 
 src_compile() {