Version bump

8 files changed, 141 insertions, 26 deletions

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 365432ab86ac..ad96f865b32a 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.134 2004/11/17 11:18:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.135 2004/12/09 02:17:22 caleb Exp $
+
+*kdemultimedia-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdemultimedia-3.3.2.ebuild:
+  Version bump
 
   17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
   kdemultimedia-3.3.1.ebuild:
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 1e31bb51cd2d..fae9b00efa8d 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,21 +1,23 @@
-MD5 ada7fc68bd11f6f4afc7e47ca1548743 ChangeLog 19814
+MD5 2153652a6da5c8d90b225cc858c85cca kdemultimedia-3.3.2.ebuild 1680
 MD5 c4e2811488f5b7057830a07c7372764e kdemultimedia-3.1.5.ebuild 2689
+MD5 f357275645a4a8346ee79dd77d66b222 kdemultimedia-3.2.3.ebuild 1544
+MD5 905b8466b08097680bce1e45dfedb7fe kdemultimedia-3.3.1.ebuild 1675
 MD5 78a5d756b72f651a8038451801e9bee6 kdemultimedia-3.2.0.ebuild 2255
 MD5 cb93ab2aa47f5cfa2918e4d596a3569a kdemultimedia-3.2.2-r1.ebuild 1460
-MD5 f357275645a4a8346ee79dd77d66b222 kdemultimedia-3.2.3.ebuild 1544
 MD5 d14011222ca2e60526a7b1cf97f643c9 kdemultimedia-3.3.0.ebuild 1803
-MD5 905b8466b08097680bce1e45dfedb7fe kdemultimedia-3.3.1.ebuild 1675
+MD5 ada7fc68bd11f6f4afc7e47ca1548743 ChangeLog 19814
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 b9cce2b0015700be978730f7bba11352 files/3.2.3-Makefile-synth.am.diff 537
+MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450
+MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2-r1 73
+MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300
 MD5 b9cce2b0015700be978730f7bba11352 files/3.3.0-Makefile-synth.am.diff 537
+MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
+MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590
+MD5 b9cce2b0015700be978730f7bba11352 files/3.2.3-Makefile-synth.am.diff 537
 MD5 b7333a2e3e5c81a1c904c67f1a79c0ca files/3.3.0-Makefile.am.diff 459
 MD5 239528cb3f6dd1fcc4e2bc4fd2ba9ba8 files/digest-kdemultimedia-3.1.5 73
 MD5 498d3a9ec387535d759af9fd59f3dc07 files/digest-kdemultimedia-3.2.0 73
-MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2-r1 73
 MD5 ddadc716d5d607434a4fa830a241ac65 files/digest-kdemultimedia-3.2.3 73
 MD5 ff71f209a5c07db1d7ba70b4109484f0 files/digest-kdemultimedia-3.3.0 73
 MD5 b25b44699f69e998481bd9aad08e1cef files/digest-kdemultimedia-3.3.1 73
-MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450
-MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300
-MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278
+MD5 30810bdee5baa766c389b0a4d8533a4e files/digest-kdemultimedia-3.3.2 73
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.2 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.2
new file mode 100644
index 000000000000..8fa4ab15688f
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.2
@@ -0,0 +1 @@
+MD5 2f393da809542dab5bf75bf7a91d1ec0 kdemultimedia-3.3.2.tar.bz2 5384470
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild
new file mode 100644
index 000000000000..fab9d3be931a
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.1 2004/12/09 02:17:22 caleb Exp $
+
+inherit kde-dist flag-o-matic eutils
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
+
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64 ~hppa ~alpha"
+IUSE="alsa audiofile cdparanoia encode flac oggvorbis speex xine"
+
+DEPEND="~kde-base/kdebase-${PV}
+	audiofile? ( media-libs/audiofile )
+	cdparanoia? ( media-sound/cdparanoia )
+	flac? ( media-libs/flac )
+	encode? ( media-sound/lame )
+	oggvorbis? ( media-sound/vorbis-tools )
+	xine? ( >=media-libs/xine-lib-1_beta12 )
+	alsa? ( media-libs/alsa-lib )
+	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
+	>=media-libs/taglib-1.2
+	media-libs/tunepimp
+	!media-sound/juk"
+
+src_unpack() {
+	kde_src_unpack
+}
+
+src_compile() {
+	replace-flags -O3 -O2
+	# Still persists with 3.2.1 - kaboodle
+	filter-flags "-fno-default-inline"
+
+	use xine && myconf="$myconf --with-xine-prefix=/usr"
+	use xine || DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"
+
+	myconf="${myconf} `use_with cdparanoia`"
+
+	# make -j2 fails, at least on ppc
+	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
+	use hppa && append-flags -ffunction-sections
+
+	# alsa 0.9 not supported
+	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
+	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
+	use encode	&& myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
+
+	myconf="$myconf --disable-strict --disable-warnings"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 8336ca712ae2..6363990ac41b 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.117 2004/12/06 23:56:48 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.118 2004/12/09 02:13:44 caleb Exp $
+
+*kdenetwork-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.3.2.ebuild:
+  Version bump
 
   05 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   kdenetwork-3.3.1-r1.ebuild:
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 989e6426a3b9..e5176f819db3 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,27 +1,29 @@
-MD5 1baba26a1fad96179d44cdfcee13daf8 ChangeLog 15392
 MD5 bc9a8ef963f846d204e3deb605482fe9 kdenetwork-3.1.5.ebuild 897
+MD5 0ec2c51c6328a9c2d4f77b6c6e64a007 kdenetwork-3.2.3.ebuild 1243
+MD5 15ba8e503304d746e65dedba1b142f03 kdenetwork-3.3.1.ebuild 1225
 MD5 8ca1ddb44e1789e711218d60395307b3 kdenetwork-3.2.0.ebuild 1182
+MD5 32eb688d0dcb8db75edde73c6831cee2 kdenetwork-3.3.1-r1.ebuild 1302
 MD5 3bece517a429d8a402d85ffc30a37427 kdenetwork-3.2.2.ebuild 1276
-MD5 2ebf1e1662cf3fb9e7dd2c400672793c kdenetwork-3.2.3-r1.ebuild 1319
-MD5 0ec2c51c6328a9c2d4f77b6c6e64a007 kdenetwork-3.2.3.ebuild 1243
 MD5 01567182a1024587ce102e345b27a9b9 kdenetwork-3.3.0.ebuild 1290
-MD5 32eb688d0dcb8db75edde73c6831cee2 kdenetwork-3.3.1-r1.ebuild 1302
-MD5 15ba8e503304d746e65dedba1b142f03 kdenetwork-3.3.1.ebuild 1225
+MD5 2ebf1e1662cf3fb9e7dd2c400672793c kdenetwork-3.2.3-r1.ebuild 1319
+MD5 91521ce0c7f78bfccf9367e2f4f4c528 kdenetwork-3.3.2.ebuild 1255
+MD5 1baba26a1fad96179d44cdfcee13daf8 ChangeLog 15392
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 8dcaf6114da2b32d2bce63e39a38758e files/3.3.0-kget.diff 1321
-MD5 805378603d34bf14a7b856f30374428b files/3.3.0-kopete.diff 566
+MD5 732cc856c1e48585781d79173f5d271b files/lisa 538
+MD5 28c3ba792f8a0ce436216062cefa7908 files/reslisa 549
+MD5 93d1b5a88409a2adfec615de70dcaf70 files/linuxwirelesswidget.cpp.diff 796
+MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
+MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
 MD5 8dcaf6114da2b32d2bce63e39a38758e files/3.3.1-kget.diff 1321
+MD5 805378603d34bf14a7b856f30374428b files/3.3.0-kopete.diff 566
+MD5 72eca9b8637e868d730399e0becc045d files/digest-kdenetwork-3.2.3-r1 70
+MD5 a0086a72d069c5606f1e2ea81b98fea8 files/digest-kdenetwork-3.3.1-r1 70
+MD5 8dcaf6114da2b32d2bce63e39a38758e files/3.3.0-kget.diff 1321
+MD5 a32555833318266feb7ea1f68742fdf7 files/yahoo-fix-connect-062404.patch 1139
 MD5 419e4285f4c61e2c2f5cb24cfc3c6145 files/digest-kdenetwork-3.1.5 70
 MD5 62110957dfcdb489a410148cb79839e1 files/digest-kdenetwork-3.2.0 70
 MD5 804c7026171e401cf3733ba8e6987461 files/digest-kdenetwork-3.2.2 70
 MD5 72eca9b8637e868d730399e0becc045d files/digest-kdenetwork-3.2.3 70
-MD5 72eca9b8637e868d730399e0becc045d files/digest-kdenetwork-3.2.3-r1 70
 MD5 ee738112b91143ae2af44dceb3d26ab1 files/digest-kdenetwork-3.3.0 70
 MD5 a0086a72d069c5606f1e2ea81b98fea8 files/digest-kdenetwork-3.3.1 70
-MD5 a0086a72d069c5606f1e2ea81b98fea8 files/digest-kdenetwork-3.3.1-r1 70
-MD5 93d1b5a88409a2adfec615de70dcaf70 files/linuxwirelesswidget.cpp.diff 796
-MD5 732cc856c1e48585781d79173f5d271b files/lisa 538
-MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
-MD5 28c3ba792f8a0ce436216062cefa7908 files/reslisa 549
-MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
-MD5 a32555833318266feb7ea1f68742fdf7 files/yahoo-fix-connect-062404.patch 1139
+MD5 8dae5eac25d478ebf23279132c4a0ead files/digest-kdenetwork-3.3.2 70
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.3.2 b/kde-base/kdenetwork/files/digest-kdenetwork-3.3.2
new file mode 100644
index 000000000000..34a515ef7192
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.3.2
@@ -0,0 +1 @@
+MD5 652a5703b8dc937c4009e002dc3035f3 kdenetwork-3.3.2.tar.bz2 6959207
diff --git a/kde-base/kdenetwork/kdenetwork-3.3.2.ebuild b/kde-base/kdenetwork/kdenetwork-3.3.2.ebuild
new file mode 100644
index 000000000000..13e3e2559122
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.3.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.2.ebuild,v 1.1 2004/12/09 02:13:44 caleb Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE network apps: kopete, kppp, kget..."
+
+KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc ~hppa ~alpha"
+IUSE="slp samba wifi ssl"
+
+DEPEND="~kde-base/kdebase-${PV}
+	slp? ( net-libs/openslp )
+	samba? ( net-fs/samba )
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete
+	wifi? ( net-wireless/wireless-tools )
+	!net-misc/ksambaplugin"
+
+src_unpack() {
+	kde_src_unpack
+}
+
+src_compile() {
+	myconf="$myconf `use_enable slp`"
+	use wifi || DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
+	export DO_NOT_COMPILE
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod +s ${D}/${KDEDIR}/bin/reslisa
+
+	# empty config file needed for lisa to work with default settings
+	touch ${D}/etc/lisarc
+
+	# lisa, reslisa initscripts
+	dodir /etc/init.d
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
+	chmod +x ${D}/etc/init.d/*
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/lisa.conf lisa
+	newins ${FILESDIR}/reslisa.conf reslisa
+}