version bump (with lingas support, bug #43540), remove old versions

11 files changed, 53 insertions, 288 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 0b1ab4a76377..fe1d0c46a637 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # 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.41 2004/02/24 11:52:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.42 2004/03/06 12:32:47 lanius Exp $
+
+*k3b-0.11.6 (06 Mar 2004)
+
+  06 Mar 2004; Heinrich Wendel <lanius@gentoo.org> k3b-0.10.3-r2.ebuild,
+  k3b-0.11.2.ebuild, k3b-0.11.4.ebuild, k3b-0.11.6.ebuild, k3b-0.9.ebuild:
+  version bump (with linguas support, bug #43540), remove old versions
 
 *k3b-0.11.5 (24 Feb 2004)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 12e2e56b5e03..010ebf38e32e 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -2,6 +2,7 @@ MD5 e88bb17f9f5d1cbbff169f4e79a0d37b k3b-0.11.1-r1.ebuild 2491
 MD5 6ba78fc9f0c36e86f442d9da1df730e3 k3b-0.11.2.ebuild 2494
 MD5 96c9e162f6292e38ee3ff018862cba0e k3b-0.9.ebuild 1321
 MD5 4defd444d2186bb43753b64897b4c3af k3b-0.11.4.ebuild 2494
+MD5 0948b2b98a4266c6f695baa33e311409 k3b-0.11.6.ebuild 2772
 MD5 ddc9d032d1527467d9196e79c64b39b8 k3b-0.10.3-r2.ebuild 3224
 MD5 c77f7620238af79e3422d3ea18a9c514 ChangeLog 6465
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
@@ -10,6 +11,7 @@ MD5 bd8dd88243b4b87472986447644ce855 files/digest-k3b-0.9 60
 MD5 696ec80ff2d00d0d42dfacdc3e99dd93 files/digest-k3b-0.11.2 64
 MD5 70ba48978ba6b3abcb833670071b7558 files/digest-k3b-0.11.4 64
 MD5 d6c50dbf92dd7a5eb336530b87c2ac2e files/digest-k3b-0.11.5 64
+MD5 8424e87b486b4f6ef9d435a617908d5d files/digest-k3b-0.11.6 131
 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.3-r2 b/app-cdr/k3b/files/digest-k3b-0.10.3-r2
deleted file mode 100644
index c8145e7e27b5..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.10.3-r2
+++ /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.2 b/app-cdr/k3b/files/digest-k3b-0.11.2
deleted file mode 100644
index f50fab8c84e9..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8874af367c624dd4c25bce83812ad606 k3b-0.11.2.tar.bz2 2666607
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.4 b/app-cdr/k3b/files/digest-k3b-0.11.4
deleted file mode 100644
index e21178d4657b..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.11.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9850a7b87b6a7e051818bc72dcb4727f k3b-0.11.4.tar.bz2 3192354
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.6 b/app-cdr/k3b/files/digest-k3b-0.11.6
new file mode 100644
index 000000000000..cd04c0af5e0c
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-0.11.6
@@ -0,0 +1,2 @@
+MD5 0015b9ad457713425464dbdad6a15ab9 k3b-0.11.6.tar.bz2 3194007
+MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463
diff --git a/app-cdr/k3b/files/digest-k3b-0.9 b/app-cdr/k3b/files/digest-k3b-0.9
deleted file mode 100644
index 4af88e013c7a..000000000000
--- a/app-cdr/k3b/files/digest-k3b-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cac0c1e80862070e9b0da2ead5ff4521 k3b-0.9.tar.gz 2952798
diff --git a/app-cdr/k3b/k3b-0.10.3-r2.ebuild b/app-cdr/k3b/k3b-0.10.3-r2.ebuild
deleted file mode 100644
index 312bda51f32a..000000000000
--- a/app-cdr/k3b/k3b-0.10.3-r2.ebuild
+++ /dev/null
@@ -1,116 +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-r2.ebuild,v 1.1 2003/12/16 22:04:08 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.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
-
-	cd ${S}
-	# Make k3b work with cdrdao and 2.6 kernel (we need >=cdrdao-1.1.7-r3
-	# that have the '-gentoo' appended to its version).
-	epatch ${FILESDIR}/${P}-hacked-cdrdao.patch
-}
-
-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.11.4.ebuild b/app-cdr/k3b/k3b-0.11.4.ebuild
deleted file mode 100644
index 07b32e4acb86..000000000000
--- a/app-cdr/k3b/k3b-0.11.4.ebuild
+++ /dev/null
@@ -1,90 +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.4.ebuild,v 1.1 2004/02/17 14:21:39 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"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-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
-
-	dodoc AUTHORS COPYING ChangeLog FAQ README TODO
-
-#	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-#		cd "${WORKDIR}/${I18N}"
-#		make DESTDIR=${D} install || die
-#	fi
-}
-
-pkg_postinst()
-{
-	if use kde; then
-		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
-	fi
-	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.2.ebuild b/app-cdr/k3b/k3b-0.11.6.ebuild
index 18a7762a488d..b81d41bdb49c 100644
--- a/app-cdr/k3b/k3b-0.11.2.ebuild
+++ b/app-cdr/k3b/k3b-0.11.6.ebuild
@@ -1,12 +1,11 @@
 # 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.2.ebuild,v 1.1 2004/02/09 20:57:20 lanius Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.11.6.ebuild,v 1.1 2004/03/06 12:32:47 lanius Exp $
 inherit kde
 need-kde 3.1
 
 DESCRIPTION="K3b, KDE CD Writing Software"
-HOMEPAGE="http://k3b.sourceforge.net/"
+HOMEPAGE="http://www.k3b.org/"
 SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -20,7 +19,7 @@ DEPEND="${DEPEND}
 	flac? ( media-libs/flac )
 	mad? ( >=media-sound/mad-0.14.2b )
 	oggvorbis? ( media-libs/libvorbis )"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	>=app-cdr/cdrtools-1.11
 	>=app-cdr/cdrdao-1.1.7-r3
 	media-sound/normalize
@@ -30,21 +29,25 @@ RDEPEND="${RDEPEND}
 		  media-video/transcode
 		  media-video/vcdimager )"
 
-# i18n support will be available in following releases
+LANGS="ar bg ca bs da de cs el es et fi fo fr gl hu ja it nb nl pl \
+pt ro ru sk sl ta sr sv tr xh xx zu nso ven en_GB pt_BR zh_CN zh_TW"
 
-#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"
+# Documentation packages are less (in general they may contain
+# other packages too,  not in this case)
+LANGS_DOC="da de es et fr it pt ru sv pt_BR"
 
-#I18N="${PN}-i18n-${PV%.*}"
+# The package is unpacked as k3b-i18n-0.11.6, even though its name 
+# is k3b.i18n-0.11.tar.bz2.
+I18N="${PN}-i18n-${PV%.*}"
+SI18N="${WORKDIR}/${PN}-i18n-${PV}"
 
-#for pkg in ${LANGS}
-#do
-#	SRC_URI="${SRC_URI} linguas_${pkg}? ( mirror://sourceforge/k3b/${I18N}.tar.gz )"
-#done
+for pkg in ${LANGS}
+do
+	SRC_URI="${SRC_URI} linguas_${pkg}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
+done
 
 src_compile() {
-#	local _S="${S}"
-
+	local _S=${S}
 	local myconf="--enable-libsuffix="
 
 	use debug && myconf="${myconf} --enable-debugging --enable-profiling" \
@@ -54,14 +57,26 @@ src_compile() {
 	# 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}"
+	# Build process of K3B-i18n, select LINGUAS elements
+	S=${SI18N}
+	if [ -n "${LINGUAS}" -a -d "${S}" ]; then
+		MAKE_PO="SUBDIRS = "
+		for lang in ${LANGS}
+		do
+			use linguas_${lang} && MAKE_PO="${MAKE_PO} ${lang}"
+		done
+		sed -i -e "s:^SUBDIRS = .*:${MAKE_PO}:" ${S}/po/Makefile.in
+
+		MAKE_DOC="SUBDIRS = " 
+		for langdoc in ${LANGS_DOC}
+		do
+			use linguas_${langdoc} && MAKE_DOC="${MAKE_DOC} ${langdoc}" 
+		done
+		sed -i -e "s:^SUBDIRS = .*:${MAKE_DOC}:" ${S}/doc/Makefile.in
+
+		kde_src_compile
+	fi
+	S=${_S}
 }
 
 src_install() {
@@ -69,22 +84,18 @@ src_install() {
 
 	dodoc AUTHORS COPYING ChangeLog FAQ README TODO
 
-#	if [ -n "${LINGUAS}" -a -d "${WORKDIR}/${I18N}" ]; then
-#		cd "${WORKDIR}/${I18N}"
-#		make DESTDIR=${D} install || die
-#	fi
+	if [ -n "${LINGUAS}" -a -d "${SI18N}" ]; then
+		cd ${SI18N}
+		make DESTDIR=${D} install || die
+	fi
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	if use kde; then
 		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
 	fi
-	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.9.ebuild b/app-cdr/k3b/k3b-0.9.ebuild
deleted file mode 100644
index 99574baa6a6c..000000000000
--- a/app-cdr/k3b/k3b-0.9.ebuild
+++ /dev/null
@@ -1,45 +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.ebuild,v 1.6 2003/09/08 02:00:39 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"
-
-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."
-}