KDE 3.5 prerelease.

(Portage version: 2.0.51.22-r2)

7 files changed, 230 insertions, 2 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 4f98c967a32b..3e2bed7017e1 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.181 2005/08/08 20:13:47 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.182 2005/08/24 23:25:40 greg_g Exp $
+
+*kdegraphics-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegraphics-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease. app-text/poppler replaces app-text/xpdf for pdf support.
 
   08 Aug 2005; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.3.2-r3.ebuild,
   kdegraphics-3.4.1-r1.ebuild:
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5_alpha1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5_alpha1
new file mode 100644
index 000000000000..c9e6e024ee8d
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.5_alpha1
@@ -0,0 +1 @@
+MD5 343930cf2632b16eb16d558a0e177eaf kdegraphics-3.4.90.tar.bz2 6865526
diff --git a/kde-base/kdegraphics/kdegraphics-3.5_alpha1.ebuild b/kde-base/kdegraphics/kdegraphics-3.5_alpha1.ebuild
new file mode 100644
index 000000000000..77e011b56f4a
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-3.5_alpha1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5_alpha1.ebuild,v 1.1 2005/08/24 23:25:40 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE graphics-related apps"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gphoto2 imlib openexr opengl pdflib povray scanner tetex"
+
+DEPEND="~kde-base/kdebase-${PV}
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	gphoto2? ( media-libs/libgphoto2 )
+	scanner? ( media-gfx/sane-backends )
+	media-libs/libart_lgpl
+	media-libs/lcms
+	dev-libs/fribidi
+	imlib? ( media-libs/imlib )
+	virtual/ghostscript
+	media-libs/tiff
+	openexr? ( >=media-libs/openexr-1.2 )
+	povray? ( media-gfx/povray
+		  virtual/opengl )
+	pdflib? ( >=app-text/poppler-0.3.1 )"
+
+RDEPEND="${DEPEND}
+	tetex? (
+	|| ( >=app-text/tetex-2
+	     app-text/ptex
+	     app-text/cstetex
+	     app-text/dvipdfm ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_compile() {
+	local myconf="$(use_with openexr) $(use_with pdflib poppler)
+	              $(use_with gphoto2 kamera)"
+
+	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
+
+	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
+	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
+
+	kde_src_compile
+}
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 4de8106fc0de..5cf50dcba0e3 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.167 2005/07/29 11:53:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.168 2005/08/24 23:26:27 greg_g Exp $
+
+*kdemultimedia-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.5_alpha1-compile.patch,
+  +kdemultimedia-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease. aKode is not included anymore, it will be released
+  outside KDE as media-libs/akode.
 
   29 Jul 2005; Dan Armak <danarmak@gentoo.org> kdemultimedia-3.4.2.ebuild:
   Add explicit dep on musicbrainz in addition to tunepimp, since the juk
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5_alpha1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5_alpha1
new file mode 100644
index 000000000000..b06a0ad53e64
--- /dev/null
+++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5_alpha1
@@ -0,0 +1 @@
+MD5 d07e12a7389bd03f1f4bfb57df73f26a kdemultimedia-3.4.90.tar.bz2 5430692
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile.patch
new file mode 100644
index 000000000000..11b67024e724
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile.patch
@@ -0,0 +1,90 @@
+diff -Nur kdemultimedia-3.4.90.orig/kioslave/audiocd/configure.in.in kdemultimedia-3.4.90/kioslave/audiocd/configure.in.in
+--- kdemultimedia-3.4.90.orig/kioslave/audiocd/configure.in.in	2005-08-06 11:40:01.000000000 +0200
++++ kdemultimedia-3.4.90/kioslave/audiocd/configure.in.in	2005-08-22 14:53:39.000000000 +0200
+@@ -0,0 +1,46 @@
++AC_DEFUN([AC_CHECK_LIBFLAC],
++[
++  AC_LANG_SAVE
++  AC_LANG_C
++  have_libFLAC=no
++  KDE_CHECK_HEADER(FLAC/metadata.h,
++  [
++     KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++	          have_libFLAC=yes)
++
++    ])
++  if test "x$have_libFLAC" = "xyes"; then
++      LIBFLAC="-lFLAC"
++      AC_DEFINE(HAVE_LIBFLAC, 1,
++        [Define if you have libFLAC (required for loading FLAC files)])
++  fi
++  AC_SUBST(LIBFLAC)
++  AC_LANG_RESTORE
++])
++
++AC_DEFUN([AC_CHECK_LIBOGGFLAC],
++[
++  AC_LANG_SAVE
++  AC_LANG_C
++  have_libOggFLAC=no
++  KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h,
++  [
++     KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single,
++	          have_libOggFLAC=yes,,[-lm -lOggFLAC -lFLAC])
++
++    ])
++  if test "x$have_libOggFLAC" = "xyes"; then
++      LIBOGGFLAC="-lOggFLAC"
++      AC_DEFINE(HAVE_LIBOGGFLAC, 1,
++        [Define if you have libOggFLAC (required for loading OggFLAC files)])
++  fi
++  AC_SUBST(LIBOGGFLAC)
++  AC_LANG_RESTORE
++])
++
++AC_ARG_WITH(flac,AC_HELP_STRING([--with-flac],[Enable FLAC support @<:@default=check@:>@]),[flac_test="$withval"],[flac_test="yes"])
++
++if test "x$flac_test" = "xyes" ; then
++  AC_CHECK_LIBFLAC
++  AC_CHECK_LIBOGGFLAC
++fi
+diff -Nur kdemultimedia-3.4.90.orig/kioslave/audiocd/plugins/flac/encoderflac.cpp kdemultimedia-3.4.90/kioslave/audiocd/plugins/flac/encoderflac.cpp
+--- kdemultimedia-3.4.90.orig/kioslave/audiocd/plugins/flac/encoderflac.cpp	2005-08-06 11:40:01.000000000 +0200
++++ kdemultimedia-3.4.90/kioslave/audiocd/plugins/flac/encoderflac.cpp	2005-08-22 14:54:00.000000000 +0200
+@@ -32,7 +32,7 @@
+ 
+ extern "C"
+ {
+-  void create_audiocd_encoders(KIO::SlaveBase *slave, QPtrList<AudioCDEncoder> &encoders)
++  KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, QPtrList<AudioCDEncoder> &encoders)
+   {
+     encoders.append(new EncoderFLAC(slave));
+   }
+@@ -153,14 +153,14 @@
+     return 0;
+ }
+ 
+-void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment )
++void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment )
+ {
+     d->metadata = new FLAC__StreamMetadata*[1];
+     d->metadata[0] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ //    d->metadata[1] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING);
+ //    d->metadata[2] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE)
+ 
+-    typedef QPair<QString, QVarient> Comment;
++    typedef QPair<QString, QVariant> Comment;
+     Comment comments[7] = { Comment("Title", info.trackInfoList[track].get("title")),
+ 	    	    	    Comment("Artist", info.get("artist")),
+ 	    	    	    Comment("Album",  info.get("title")),
+@@ -168,8 +168,8 @@
+ 	    	    	    Comment("Tracknumber", QString::number(track)),
+ 	                    Comment("Comment", comment),
+ 	    	    	    Comment("Date", QString::null )};
+-    if (cdYear > 0) {
+-    	QDateTime dt = QDate(info.year, 1, 1);
++    if (info.get("Year").toInt() > 0) {
++    	QDateTime dt = QDate(info.get("Year").toInt(), 1, 1);
+     	comments[6] = Comment("Date", dt.toString(Qt::ISODate));
+     }
+ 
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild
new file mode 100644
index 000000000000..10dd8f43eacd
--- /dev/null
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5_alpha1.ebuild,v 1.1 2005/08/24 23:26:27 greg_g Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="alsa audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
+
+DEPEND="~kde-base/kdebase-${PV}
+	media-sound/cdparanoia
+	audiofile? ( media-libs/audiofile )
+	xine? ( >=media-libs/xine-lib-1.0 )
+	alsa? ( media-libs/alsa-lib )
+	theora? ( media-libs/libtheora )
+	gstreamer? ( >=media-libs/gstreamer-0.8
+	             >=media-libs/gst-plugins-0.8 )
+	>=media-libs/taglib-1.2
+	musicbrainz? ( media-libs/tunepimp
+	               media-libs/musicbrainz )
+	encode? ( mp3? ( media-sound/lame )
+	          vorbis? ( media-sound/vorbis-tools )
+	          flac? ( media-libs/flac ) )"
+
+RDEPEND="${DEPEND}
+	gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
+		     vorbis? ( >=media-plugins/gst-plugins-ogg-0.8
+		               >=media-plugins/gst-plugins-vorbis-0.8 )
+		     flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Applied upstream.
+	epatch "${FILESDIR}/${P}-compile.patch"
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	local myconf="--with-cdparanoia --with-taglib
+	              $(use_with alsa) $(use_with audiofile)
+	              $(use_with gstreamer)
+	              $(use_with xine) $(use_with theora)
+	              $(use_with musicbrainz)"
+
+	# encoding can happen through:
+	# - kio_audiocd (based on libflac for flac,
+	#   on libvorbis for vorbis, on the lame binary for mp3)
+	# - kaudiocreator (based on the flac binary for flac,
+	#   on the lame binary for mp3, on the oggenc binary for vorbis)
+	# - krec (based on libvorbis for vorbis,
+	#   on libmp3lame for mp3)
+	if use encode; then
+		myconf="${myconf} $(use_with mp3 lame)
+	                $(use_with vorbis) $(use_with flac)"
+	else
+		myconf="${myconf} --without-lame
+	                --without-vorbis --without-flac"
+	fi
+
+	# Compile without akode support until there's a
+	# standalone release of akode.
+	myconf="${myconf} --without-akode"
+
+	# Not used anymore and scheduled for removal.
+	export DO_NOT_COMPILE="${DO_NOT_COMPILE} mpeglib mpeglib_artsplug"
+
+	kde_src_compile
+}