From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3E5A3138D01 for ; Sat, 27 Jun 2015 21:11:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69FBFE082D; Sat, 27 Jun 2015 21:11:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4BC8E082D for ; Sat, 27 Jun 2015 21:11:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20DC23408EA for ; Sat, 27 Jun 2015 21:11:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43C2A72E for ; Sat, 27 Jun 2015 21:11:12 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1435438900.d748bc8f539e39318f8b5ebf4534edc0716370df.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/ X-VCS-Repository: proj/kde X-VCS-Files: app-cdr/k3b/k3b-5.9999.ebuild app-cdr/k3b/k3b-9999.ebuild X-VCS-Directories: app-cdr/k3b/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: d748bc8f539e39318f8b5ebf4534edc0716370df X-VCS-Branch: master Date: Sat, 27 Jun 2015 21:11:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3e21c0dc-fce6-42f2-920e-df9bff1ffc43 X-Archives-Hash: 996c94e99f4743f8954c46c3cce2280c commit: d748bc8f539e39318f8b5ebf4534edc0716370df Author: Johannes Huber gentoo org> AuthorDate: Sat Jun 27 21:01:40 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sat Jun 27 21:01:40 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d748bc8f [app-cdr/k3b ] Drop SLOT 4 Package-Manager: portage-2.2.20 app-cdr/k3b/k3b-5.9999.ebuild | 128 ------------------------------------------ app-cdr/k3b/k3b-9999.ebuild | 47 +++++++++++----- 2 files changed, 33 insertions(+), 142 deletions(-) diff --git a/app-cdr/k3b/k3b-5.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild deleted file mode 100644 index c80697e..0000000 --- a/app-cdr/k3b/k3b-5.9999.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -EGIT_BRANCH="kf5" -KDE_HANDBOOK="true" -KDE_TEST="true" -# Translations are only in the tarballs, not in the git repo -if [[ ${PV} != *9999* ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2" - DOCS=( FAQ PERMISSIONS README ) - S=${WORKDIR}/${P/_*} -else - DOCS=( FAQ.txt PERMISSIONS.txt README.txt ) -fi - -inherit kde5 - -DESCRIPTION="The CD/DVD Kreator for KDE" -HOMEPAGE="http://www.k3b.org/" - -LICENSE="GPL-2 FDL-1.2" -SLOT="5" -KEYWORDS="" -IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdoctools) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep solid) - $(add_kdeapps_dep libkcddb) - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qttest:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - media-libs/libsamplerate - dvd? ( media-libs/libdvdread ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:0= ) - ) - flac? ( >=media-libs/flac-1.2[cxx] ) - mp3? ( media-sound/lame ) - mad? ( media-libs/libmad ) - musepack? ( >=media-sound/musepack-tools-444 ) - sndfile? ( media-libs/libsndfile ) - taglib? ( >=media-libs/taglib-1.5 ) - vorbis? ( media-libs/libvorbis ) -" -# $(add_frameworks_dep kdelibs 'udev,udisks(+)') -RDEPEND="${DEPEND} - app-cdr/cdrdao - media-sound/cdparanoia - virtual/cdrtools - dvd? ( - >=app-cdr/dvd+rw-tools-7 - encode? ( media-video/transcode[dvd] ) - ) - emovix? ( media-video/emovix ) - sox? ( media-sound/sox ) - vcd? ( media-video/vcdimager ) - !app-cdr/k3b:4 -" - -DOCS+=( ChangeLog ) - -REQUIRED_USE=" - mp3? ( encode ) - sox? ( encode ) -" - -src_prepare() { - # we have to patch first, because some doc sed magic in kde5.eclass will make the patch invalid - epatch "${FILESDIR}/${PN}-tests-optional.patch" - kde5_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DK3B_BUILD_API_DOCS=OFF - -DK3B_BUILD_K3BSETUP=OFF - -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON - -DK3B_ENABLE_HAL_SUPPORT=OFF - -DK3B_ENABLE_MUSICBRAINZ=OFF - $(cmake-utils_use debug K3B_DEBUG) - $(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING) - $(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN) - $(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN) - $(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN) - $(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN) - $(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN) - $(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN) - $(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN) - $(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN) - $(cmake-utils_use taglib K3B_ENABLE_TAGLIB) - $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN) - $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) - ) - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - - echo - 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 - - 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 -} diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild index 36fefb0..c80697e 100644 --- a/app-cdr/k3b/k3b-9999.ebuild +++ b/app-cdr/k3b/k3b-9999.ebuild @@ -4,16 +4,11 @@ EAPI=5 -MULTIMEDIA_REQUIRED="always" -WEBKIT_REQUIRED="always" -KDE_HANDBOOK="optional" - +EGIT_BRANCH="kf5" +KDE_HANDBOOK="true" +KDE_TEST="true" # Translations are only in the tarballs, not in the git repo if [[ ${PV} != *9999* ]]; then - KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga - gl he hi hne hr hu is it ja km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru - se sk sl sv th tr uk zh_CN zh_TW" - SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2" DOCS=( FAQ PERMISSIONS README ) S=${WORKDIR}/${P/_*} @@ -21,18 +16,35 @@ else DOCS=( FAQ.txt PERMISSIONS.txt README.txt ) fi -inherit kde4-base +inherit kde5 DESCRIPTION="The CD/DVD Kreator for KDE" HOMEPAGE="http://www.k3b.org/" LICENSE="GPL-2 FDL-1.2" +SLOT="5" KEYWORDS="" -SLOT="4" -IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdoctools) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep solid) $(add_kdeapps_dep libkcddb) + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qttest:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread ) ffmpeg? ( @@ -47,8 +59,8 @@ DEPEND=" taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) " +# $(add_frameworks_dep kdelibs 'udev,udisks(+)') RDEPEND="${DEPEND} - $(add_kdebase_dep kdelibs 'udev,udisks(+)') app-cdr/cdrdao media-sound/cdparanoia virtual/cdrtools @@ -59,6 +71,7 @@ RDEPEND="${DEPEND} emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) + !app-cdr/k3b:4 " DOCS+=( ChangeLog ) @@ -68,6 +81,12 @@ REQUIRED_USE=" sox? ( encode ) " +src_prepare() { + # we have to patch first, because some doc sed magic in kde5.eclass will make the patch invalid + epatch "${FILESDIR}/${PN}-tests-optional.patch" + kde5_src_prepare +} + src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF @@ -89,11 +108,11 @@ src_configure() { $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN) $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) ) - kde4-base_src_configure + kde5_src_configure } pkg_postinst() { - kde4-base_pkg_postinst + kde5_pkg_postinst echo elog "We don't install k3bsetup anymore because Gentoo doesn't need it."