diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index d9b7e295..aff1a3e0 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for app-cdr/k3b -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Jan 2009; Mario Fetka + -k3b-2.0_pre20081219.ebuild, +k3b-2.0_pre20090114.ebuild: + Bump + 19 Dec 2008; Mario Fetka k3b-2.0_pre20081219.ebuild: correct typo diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest index e58606d5..d70d1787 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -1,5 +1,5 @@ AUX k3b-2.0_pre20080808-ffmpeg-1.patch 1461 RMD160 3b84f493f4e497ea3404b23319864f25942e85f2 SHA1 edcd9d0e6d6887c0b919b50c09675973dfeddffb SHA256 8a803ffad28d037d5cc60a4e43c48ccce52a09dd8e0b16142c66ba0f1bb5628d AUX k3b-2.0_pre20081208-lame.patch 756 RMD160 b56f6eb1e2c6a74b342dfc09566b94c5639ed192 SHA1 aadd4d92bddcf2ba7f27051da55a6f90a7bee13a SHA256 6cf351917fe03655877ba62b370224b059a283147c23683aee45157e72c9ff3b -EBUILD k3b-2.0_pre20081219.ebuild 3453 RMD160 8fe4053e222bb666b3b75537995a31b2fd9a6a04 SHA1 0e5af69fc05c791e93257b93abada7929b36cc38 SHA256 d630ac71f3505ca8bfc4bbff416bfe29b42eea56a632b9b6f6f7b73e38016f6a -MISC ChangeLog 829 RMD160 f56244a2f1a1df086c10454f5a88ba7199eab531 SHA1 f8a189a9cedb613fd73c5215c848a4dfdc761338 SHA256 c6ac6a6da01d0e0547c8219126523a6cff8a7be93621c1a119a37612a1ef2f26 +EBUILD k3b-2.0_pre20090114.ebuild 2561 RMD160 9bc33bd2f2d89f0898e2a18ec8d66fc1d864c602 SHA1 5f215fa98ee490486bb1ebd3938f783237c8e350 SHA256 4bd8bac8f462ea44389a6106b35f3a8e6e9cf60f3a59889be6d866c724fc404a +MISC ChangeLog 948 RMD160 5888dc4b75080078e0da9921e395fe3961e390e0 SHA1 d2bd234d8416eb1ec68c903012691ec56fdbc58a SHA256 b137d146f0c09621f28603dd00c2dce7782f66f3b3420fca38430a8e6dd37b9e MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/app-cdr/k3b/k3b-2.0_pre20081219.ebuild b/app-cdr/k3b/k3b-2.0_pre20090114.ebuild similarity index 61% rename from app-cdr/k3b/k3b-2.0_pre20081219.ebuild rename to app-cdr/k3b/k3b-2.0_pre20090114.ebuild index d9a20017..753c7d6b 100644 --- a/app-cdr/k3b/k3b-2.0_pre20081219.ebuild +++ b/app-cdr/k3b/k3b-2.0_pre20090114.ebuild @@ -1,17 +1,12 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="2" KMNAME="extragear/multimedia" -KDE_MINIMAL="4.1" - inherit kde4-base subversion -# Set prefix to KDEDIR to slot the package. -PREFIX="${KDEDIR}" - DESCRIPTION="K3b, KDE CD Writing Software" HOMEPAGE="http://www.k3b.org/" @@ -19,27 +14,20 @@ LICENSE="GPL-2" SLOT="2" KEYWORDS="" IUSE="css debug dvdr dvdread encode -ffmpeg flac hal htmlhandbook mp3 musepack - sndfile vcd vorbis emovix" + musicbrainz sndfile vcd vorbis emovix" ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/${PN}/@{${PV/2.0_pre/}}" -# FIXME: Needed? -# app-doc/doxygen -#find_package(Doxygen) -#laurent: removes this line when Doxyfile.cmake will add to svn -#set(DOXYGEN_EXECUTABLE FALSE) -#if(DOXYGEN_EXECUTABLE) - DEPEND=" - >=kde-base/libkcddb-${KDE_MINIMAL} - >=kde-base/libkcompactdisc-${KDE_MINIMAL} + kde-base/libkcddb + kde-base/libkcompactdisc media-libs/libsamplerate - media-libs/musicbrainz:1 + musicbrainz? ( media-libs/musicbrainz:1 ) media-libs/taglib - x11-libs/qt-webkit:4 + x11-libs/qt-webkit dvdread? ( media-libs/libdvdread ) encode? ( media-sound/lame ) - ffmpeg? ( media-video/ffmpeg ) - flac? ( >=media-libs/flac-1.2.1-r2 ) + ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080206 ) + flac? ( >=media-libs/flac-1.2.1-r2[cxx] ) mp3? ( media-libs/libmad ) musepack? ( media-libs/libmpcdec ) sndfile? ( media-libs/libsndfile ) @@ -55,26 +43,11 @@ RDEPEND="${DEPEND} dvdr? ( >=app-cdr/dvd+rw-tools-7.0 ) emovix? ( media-video/emovix ) encode? ( media-sound/sox - dvdread? ( media-video/transcode ) ) + dvdread? ( media-video/transcode[dvdread] ) ) vcd? ( media-video/vcdimager ) " -pkg_setup() { - use ffmpeg && ewarn "FFMpeg seems to be badly broken in this snapshot. Use it at your own risk!" - if use flac && ! built_with_use media-libs/flac cxx ; then - eerror "In order to build " - eerror "you need media-libs/flac built with cxx USE flag enabled." - die "no cxx support in flac" - fi - if use encode && use dvdread && ! built_with_use media-video/transcode dvdread ; then - eerror "In order to build " - eerror "you need media-video/transcode built with dvdread USE flag" - die "no dvdread support in transcode" - fi -} - -src_compile() { - epatch "${FILESDIR}"/k3b-2.0_pre20081208-lame.patch +src_configure() { if use debug; then mycmakeargs="${mycmakeargs} -DADD_K3B_DEBUG=On" else @@ -83,6 +56,7 @@ src_compile() { mycmakeargs="${mycmakeargs} -DK3BSETUP_BUILD=Off -DWITH_Samplerate=On + $(cmake-utils_use_with musicbrainz MusicBrainz) $(cmake-utils_use_with dvdread DvdRead) $(cmake-utils_use_with ffmpeg FFmpeg) $(cmake-utils_use_with flac Flac) @@ -93,27 +67,25 @@ src_compile() { $(cmake-utils_use_with sndfile Sndfile) $(cmake-utils_use_with vorbis OggVorbis)" - # Build process of K3b - kde4-base_src_compile + kde4-base_src_configure } src_install() { kde4-base_src_install dodoc "${S}"/{FAQ,KNOWNBUGS,PERMISSIONS} || die "Installing additional docs failed." -# dodoc "${S}"/${PN}/{FAQ,KNOWNBUGS,PERMISSIONS} || die "Installing additional docs failed." } pkg_postinst() { - echo + elog elog "We don't install k3bsetup anymore because Gentoo doesn't need it." elog "If you get warnings on start-up, uncheck the \"Check system" elog "configuration\" option in the \"Misc\" settings window." - echo + elog local group=cdrom use kernel_linux || group=operator elog "Make sure you have proper read/write permissions on the cdrom device(s)." elog "Usually, it is sufficient to be in the ${group} group." - echo + elog kde4-base_pkg_postinst }