Make k3b work with cdrdao and 2.6 kernel (we need >=cdrdao-1.1.7-r3 that

have the '-gentoo' appended to its version).

5 files changed, 142 insertions, 4 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 238dc6d2307d..52aff5498708 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,14 @@
 # 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.33 2003/12/14 22:21:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.34 2003/12/16 22:04:08 azarah Exp $
+
+*k3b-0.10.3-r2 (16 Dec 2003)
+
+  16 Dec 2003; Martin Schlemmer <azarah@gentoo.org> k3b-0.10.3-r2.ebuild,
+  files/k3b-0.10.3-hacked-cdrdao.patch:
+  Make k3b work with cdrdao and 2.6 kernel (we need >=cdrdao-1.1.7-r3 that
+  have the '-gentoo' appended to its version).  Note that this is ATAPI
+  support with cdrdao ...
 
   15 Dec 2003; Martin Schlemmer <azarah@gentoo.org> k3b-0.10.3-r1.ebuild:
   Add a '[ -d "${WORKDIR}/${I18N}" ]' check in case the LINGUAS is not supported.
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 4b06bde5733e..9087893f8168 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,9 +1,9 @@
 MD5 6e8d54565cd909e1c4369a6b43dfc615 k3b-0.10.ebuild 1357
-MD5 4788ab86f66508f05f615d637114ac8f ChangeLog 5342
+MD5 bb973869695e44052284e4d4d452abe0 ChangeLog 5393
 MD5 76f2d6c12c58cabb56e236c70b0c5ddb k3b-0.9-r1.ebuild 1606
 MD5 0debeb38880a8450d851f8b5abad07b1 k3b-0.10.3.ebuild 2843
 MD5 96c9e162f6292e38ee3ff018862cba0e k3b-0.9.ebuild 1321
-MD5 1a60463b0370d749704e0d981215529c k3b-0.10.3-r2.ebuild 3224
+MD5 ddc9d032d1527467d9196e79c64b39b8 k3b-0.10.3-r2.ebuild 3224
 MD5 4362ef05983828ae08a3dfc0fa4b6327 k3b-0.10.3-r1.ebuild 3042
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
 MD5 8a7c1216879b82cde9cbc9a59847c71c k3b-0.8.1-r1.ebuild 934
@@ -11,7 +11,7 @@ MD5 3a2ad6a2bdefe879915a652e31f36442 k3b-0.10.1.ebuild 2217
 MD5 b4f3bb652d120e21af8dc7de11402701 files/digest-k3b-0.10.1 129
 MD5 43a105c8a3d881b6ab605196dff8fd70 files/k3b-0.10.1-include-limits.patch 362
 MD5 123359fe8e34b067c388e262b5b61086 files/digest-k3b-0.10.3-r2 129
-MD5 1888662c1dfcbcf596ddc127e47a48de files/k3b-0.10.3-hacked-cdrdao.patch 691
+MD5 af62583ac173cdc2cc55a43cdc1b48f8 files/k3b-0.10.3-hacked-cdrdao.patch 690
 MD5 123359fe8e34b067c388e262b5b61086 files/digest-k3b-0.10.3 129
 MD5 c549a5d24aece143a2693361b98742c1 files/mp3decoder_fix.diff 731
 MD5 4f97636cdaf97e2394166286641f5742 files/digest-k3b-0.8.1-r1 62
diff --git a/app-cdr/k3b/files/digest-k3b-0.10.3-r2 b/app-cdr/k3b/files/digest-k3b-0.10.3-r2
new file mode 100644
index 000000000000..c8145e7e27b5
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-0.10.3-r2
@@ -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/files/k3b-0.10.3-hacked-cdrdao.patch b/app-cdr/k3b/files/k3b-0.10.3-hacked-cdrdao.patch
new file mode 100644
index 000000000000..378bfbf7c1d9
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-0.10.3-hacked-cdrdao.patch
@@ -0,0 +1,12 @@
+--- k3b-0.10.3/src/core/k3bdefaultexternalprograms.cpp.az	2003-12-16 20:39:24.328515576 +0200
++++ k3b-0.10.3/src/core/k3bdefaultexternalprograms.cpp	2003-12-16 20:40:14.855834256 +0200
+@@ -522,7 +522,8 @@
+ 
+   // SuSE 9.0 ships with a patched cdrdao 1.1.7 which contains an updated libschily
+   if( bin->version > K3bVersion( 1, 1, 7 ) || 
+-      ( bin->version == K3bVersion( 1, 1, 7 ) && bin->version.suffix() == "-suse" ) ) {
++      /* K3bVersion treats a version without suffix as newer than one with suffix */
++      ( bin->version <= K3bVersion( 1, 1, 7 ) && bin->version.suffix() == "-gentoo" ) ) {
+     bin->addFeature( "plain-atapi" );
+     bin->addFeature( "hacked-atapi" );
+   }
diff --git a/app-cdr/k3b/k3b-0.10.3-r2.ebuild b/app-cdr/k3b/k3b-0.10.3-r2.ebuild
new file mode 100644
index 000000000000..312bda51f32a
--- /dev/null
+++ b/app-cdr/k3b/k3b-0.10.3-r2.ebuild
@@ -0,0 +1,116 @@
+# 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'"
+}