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 C0D4A1389E2 for ; Mon, 24 Nov 2014 12:48:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F564E0AEA; Mon, 24 Nov 2014 12:48:15 +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 03179E0AEA for ; Mon, 24 Nov 2014 12:48:14 +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 C1246340589 for ; Mon, 24 Nov 2014 12:48:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 483A6ACEB for ; Mon, 24 Nov 2014 12:48:12 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1416833293.42f249a23445909e78b8573e962aaabcbc7179ab.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/ X-VCS-Repository: proj/kde X-VCS-Files: app-cdr/k3b/k3b-4.9999.ebuild app-cdr/k3b/k3b-5.9999.ebuild app-cdr/k3b/k3b-9999.ebuild X-VCS-Directories: app-cdr/k3b/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 42f249a23445909e78b8573e962aaabcbc7179ab X-VCS-Branch: master Date: Mon, 24 Nov 2014 12:48: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: 086d8462-05e4-4025-8372-43bad694b474 X-Archives-Hash: ceae12b3b6eee566e5ad008468ac0899 commit: 42f249a23445909e78b8573e962aaabcbc7179ab Author: Michael Palimaka gentoo org> AuthorDate: Mon Nov 24 12:48:13 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Nov 24 12:48:13 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=42f249a2 [app-cdr/k3b] Update for KDE Applications. 9999 becomes master and 5.9999 becomes frameworks branch. Package-Manager: portage-2.2.14 --- .../k3b/{k3b-4.9999.ebuild => k3b-5.9999.ebuild} | 37 ++++++++++++++++------ app-cdr/k3b/k3b-9999.ebuild | 35 ++++++-------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app-cdr/k3b/k3b-4.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild similarity index 78% rename from app-cdr/k3b/k3b-4.9999.ebuild rename to app-cdr/k3b/k3b-5.9999.ebuild index 56df9c6..2aa83d3 100644 --- a/app-cdr/k3b/k3b-4.9999.ebuild +++ b/app-cdr/k3b/k3b-5.9999.ebuild @@ -4,9 +4,8 @@ EAPI=5 -MULTIMEDIA_REQUIRED="always" -WEBKIT_REQUIRED="always" -KDE_HANDBOOK="optional" +EGIT_BRANCH="kf5" +KDE_HANDBOOK="true" # Translations are only in the tarballs, not in the git repo if [[ ${PV} != *9999* ]]; then @@ -21,18 +20,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 mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" DEPEND=" - $(add_kdebase_dep libkcddb) + $(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? ( virtual/ffmpeg ) @@ -44,8 +60,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 @@ -56,6 +72,7 @@ RDEPEND="${DEPEND} emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) + !app-cdr/k3b:4 " DOCS+=( ChangeLog ) @@ -86,11 +103,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." diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild index 1250394..56df9c6 100644 --- a/app-cdr/k3b/k3b-9999.ebuild +++ b/app-cdr/k3b/k3b-9999.ebuild @@ -4,8 +4,9 @@ EAPI=5 -EGIT_BRANCH="kf5" -KDE_HANDBOOK="true" +MULTIMEDIA_REQUIRED="always" +WEBKIT_REQUIRED="always" +KDE_HANDBOOK="optional" # Translations are only in the tarballs, not in the git repo if [[ ${PV} != *9999* ]]; then @@ -20,35 +21,18 @@ else DOCS=( FAQ.txt PERMISSIONS.txt README.txt ) fi -inherit kde5 +inherit kde4-base 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 mad mp3 musepack sndfile sox taglib vcd vorbis" +SLOT="4" +IUSE="debug dvd emovix encode ffmpeg flac 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_kdebase_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? ( virtual/ffmpeg ) @@ -60,8 +44,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 @@ -72,7 +56,6 @@ RDEPEND="${DEPEND} emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) - !app-cdr/k3b:4 " DOCS+=( ChangeLog ) @@ -103,11 +86,11 @@ src_configure() { $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN) $(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN) ) - kde5_src_configure + kde4-base_src_configure } pkg_postinst() { - kde5_pkg_postinst + kde4-base_pkg_postinst echo elog "We don't install k3bsetup anymore because Gentoo doesn't need it."