For some reason things gets borked if the linguas stuff is done without

LINGUAS set (I am assuming that it runs the automake in the k3b main source
dir ...), bug #33434. Also add some other cleanups and form fixes.

4 files changed, 122 insertions, 3 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 66bb9d2b8f99..e299f268df07 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.31 2003/12/04 20:18:56 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.32 2003/12/14 21:53:37 azarah Exp $
+
+*k3b-0.10.3-r1 (14 Dec 2003)
+  14 Dec 2003; Martin Schlemmer <azarah@gentoo.org> k3b-0.10.3-r1.ebuild:
+  For some reason things gets borked if the linguas stuff is done without
+  LINGUAS set (I am assuming that it runs the automake in the k3b main source
+  dir ...), bug #33434. Also add some other cleanups and form fixes.
 
 *k3b-0.10.3 (04 Dec 2003)
 
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index ac3998de4da9..f3ce11dcf7bc 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,9 +1,9 @@
 MD5 6e8d54565cd909e1c4369a6b43dfc615 k3b-0.10.ebuild 1357
-MD5 35b54f45434c76e9a6821ed8a4b6d4ca ChangeLog 4917
+MD5 0021315c3f983ad49642034eab3f9076 ChangeLog 4918
 MD5 76f2d6c12c58cabb56e236c70b0c5ddb k3b-0.9-r1.ebuild 1606
 MD5 0debeb38880a8450d851f8b5abad07b1 k3b-0.10.3.ebuild 2843
 MD5 96c9e162f6292e38ee3ff018862cba0e k3b-0.9.ebuild 1321
-MD5 ffa2b7b4043586f123db53efefa44c4c k3b-0.10.3-r1.ebuild 2987
+MD5 646ac0e3801c42b15a09875bb81c8f0b k3b-0.10.3-r1.ebuild 2991
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 8a7c1216879b82cde9cbc9a59847c71c k3b-0.8.1-r1.ebuild 934
 MD5 3a2ad6a2bdefe879915a652e31f36442 k3b-0.10.1.ebuild 2217
diff --git a/app-cdr/k3b/files/digest-k3b-0.10.3-r1 b/app-cdr/k3b/files/digest-k3b-0.10.3-r1
new file mode 100644
index 000000000000..c8145e7e27b5
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-0.10.3-r1
@@ -0,0 +1,2 @@
+MD5 41a21815c2edaa3aaaa55bb922e71750 k3b-0.10.3.tar.gz 2547189
+MD5 a14fd760bb146eaee22802c504e53152 k3b-i18n-0.10.tar.gz 3241287
diff --git a/app-cdr/k3b/k3b-0.10.3-r1.ebuild b/app-cdr/k3b/k3b-0.10.3-r1.ebuild
new file mode 100644
index 000000000000..1cd8652418f7
--- /dev/null
+++ b/app-cdr/k3b/k3b-0.10.3-r1.ebuild
@@ -0,0 +1,111 @@
+# 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.1 2003/12/14 21:53:37 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/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"
+[ -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}" ]; 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}" ]; 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'"
+}