From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D51FF1382F7 for ; Thu, 7 Jul 2016 19:57:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4249E0B3E; Thu, 7 Jul 2016 19:57:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A612E0B3E for ; Thu, 7 Jul 2016 19:57:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75CA1340CAD for ; Thu, 7 Jul 2016 19:57:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09355243D for ; Thu, 7 Jul 2016 19:57:17 +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: <1467921423.ff26f66c25c26133ed3daa849c2d043fbe8b3729.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/ X-VCS-Repository: proj/kde X-VCS-Files: media-plugins/kipi-plugins/kipi-plugins-5.0.0.ebuild media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta6.ebuild media-plugins/kipi-plugins/kipi-plugins-9999.ebuild media-plugins/kipi-plugins/metadata.xml X-VCS-Directories: media-plugins/kipi-plugins/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: ff26f66c25c26133ed3daa849c2d043fbe8b3729 X-VCS-Branch: master Date: Thu, 7 Jul 2016 19:57:17 +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: 191423a7-7e2e-4a5a-85ba-2d68fe320ee8 X-Archives-Hash: 4913ae697070f433ffc9720ffd5b0e00 commit: ff26f66c25c26133ed3daa849c2d043fbe8b3729 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jul 7 19:56:44 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Jul 7 19:57:03 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff26f66c media-plugins/kipi-plugins: version bump Package-Manager: portage-2.3.0 .../kipi-plugins/kipi-plugins-5.0.0.ebuild | 96 ++++++++++++++ .../kipi-plugins/kipi-plugins-5.0.0_beta6.ebuild | 141 --------------------- .../kipi-plugins/kipi-plugins-9999.ebuild | 97 ++++---------- media-plugins/kipi-plugins/metadata.xml | 4 - 4 files changed, 123 insertions(+), 215 deletions(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-5.0.0.ebuild new file mode 100644 index 0000000..4edd31f --- /dev/null +++ b/media-plugins/kipi-plugins/kipi-plugins-5.0.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_HANDBOOK="true" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Plugins for the KDE Image Plugin Interface" +HOMEPAGE="http://www.digikam.org/" + +LICENSE="GPL-2+ handbook? ( FDL-1.2 )" +KEYWORDS="~amd64 ~x86" +IUSE="flashexport mediawiki vkontakte" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + MY_PV="${PV/_/-}" + MY_P="digikam-${MY_PV}" + + if [[ ${PV} =~ beta[0-9]$ ]]; then + SRC_BRANCH="unstable" + else + SRC_BRANCH="stable" + fi + + SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz" + + S="${WORKDIR}/${MY_P}/extra/${PN}" +fi + +COMMON_DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) + kde-apps/libkipi:5= + flashexport? ( $(add_frameworks_dep karchive) ) + mediawiki? ( net-libs/libmediawiki:5 ) + vkontakte? ( net-libs/libkvkontakte:5 ) +" +DEPEND="${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND="${COMMON_DEPEND} + !media-plugins/kipi-plugins:4 +" + +# hangs +RESTRICT="test" + +src_prepare() { + kde5_src_prepare + + if [[ ${KDE_BUILD_TYPE} = release ]]; then + # prepare the handbook + mv "${WORKDIR}"/${MY_P}/doc/${PN} "${S}"/doc || die + + if use handbook; then + echo "add_subdirectory( doc )" >> CMakeLists.txt || die + fi + + if [[ ${SRC_BRANCH} = stable ]]; then + # prepare the translations + mv "${WORKDIR}/${MY_P}/po" po || die + find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die + echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die + echo "add_subdirectory( po )" >> CMakeLists.txt || die + fi + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package flashexport KF5Archive) + $(cmake-utils_use_find_package mediawiki KF5MediaWiki) + $(cmake-utils_use_find_package vkontakte KF5Vkontakte) + ) + + kde5_src_configure +} diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta6.ebuild b/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta6.ebuild deleted file mode 100644 index d013c64..0000000 --- a/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta6.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - KDE_HANDBOOK=true - KDE_TEST=true -fi - -inherit kde5 - -DESCRIPTION="Plugins for the KDE Image Plugin Interface" -HOMEPAGE="http://www.digikam.org/" - -LICENSE="GPL-2" -KEYWORDS="" -IUSE="calendar expoblending flashexport mediawiki panorama phonon viewers vkontakte" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - - MY_PV=${PV/_/-} - MY_P="digikam-${MY_PV}" - - SRC_BRANCH=stable - [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable - SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.bz2" - - S=${WORKDIR}/${MY_P}/extra/${PN} - -fi - -COMMON_DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwebkit) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - $(add_qt_dep qtxmlpatterns) - kde-apps/libkipi:5= - calendar? ( $(add_kdeapps_dep kcalcore) ) - flashexport? ( $(add_frameworks_dep karchive) ) - mediawiki? ( net-libs/libmediawiki:5 ) - panorama? ( $(add_frameworks_dep threadweaver) ) - phonon? ( media-libs/phonon[qt5] ) - viewers? ( - $(add_qt_dep qtopengl) - x11-libs/libX11 - x11-libs/libXrandr - virtual/opengl - ) - vkontakte? ( net-libs/libkvkontakte:5 ) -" - -DEPEND="${COMMON_DEPEND} - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" - -RDEPEND="${COMMON_DEPEND} - !media-plugins/kipi-plugins:4 - expoblending? ( media-gfx/hugin ) - panorama? ( - media-gfx/enblend - media-gfx/hugin - ) -" - -RESTRICT=test - -src_prepare() { - - undetect_lib() { - local _use=${1} - local _name=${2} - [[ -z ${_name} ]] && _name=$(echo ${_use} | sed 's/./\U&/g') - use $_use || \ - sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die - } - - undetect_lib mediawiki - undetect_lib vkontakte KVKONTAKTE - - sed -i -e "/add_subdirectory(expoblending)/ s/^/#DONT/" CMakeLists.txt || die - - if [[ ${KDE_BUILD_TYPE} != live ]]; then - # prepare the handbook - mv "${WORKDIR}"/${MY_P}/doc/${PN} "${S}"/doc || die - - if use handbook; then - echo "add_subdirectory( doc )" >> CMakeLists.txt || die - fi - - if [[ ${SRC_BRANCH} != unstable ]]; then - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die - echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die - echo "add_subdirectory( po )" >> CMakeLists.txt || die - fi - fi - - kde5_src_prepare - -} - -src_configure() { - - local mycmakeargs=( - $(cmake-utils_use_find_package calendar KF5CalendarCore) - $(cmake-utils_use_find_package flashexport KF5Archive) - $(cmake-utils_use_find_package panorama BISON) - $(cmake-utils_use_find_package panorama FLEX) - $(cmake-utils_use_find_package panorama KF5ThreadWeaver) - $(cmake-utils_use_find_package phonon Phonon4Qt5) - $(cmake-utils_use_find_package viewers OpenGL) - $(cmake-utils_use_find_package viewers Qt5OpenGL) - $(cmake-utils_use_find_package viewers X11) - ) - - kde5_src_configure - -} diff --git a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild index ac6cafd..9d17dd2 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild @@ -2,106 +2,72 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -# -# TODO: complete packaging of qtsoap and qtkoauth -# - EAPI=6 -if [[ ${KDE_BUILD_TYPE} != live ]]; then - KDE_HANDBOOK=true - SRC_BRANCH=stable -fi - -KDE_TEST=true +KDE_HANDBOOK="true" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" inherit kde5 -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - DESCRIPTION="Plugins for the KDE Image Plugin Interface" HOMEPAGE="http://www.digikam.org/" -LICENSE="GPL-2" +LICENSE="GPL-2+ handbook? ( FDL-1.2 )" KEYWORDS="" -IUSE="calendar expoblending flashexport mediawiki panorama phonon viewers vkontakte" +IUSE="flashexport mediawiki vkontakte" -if [[ ${KDE_BUILD_TYPE} != live ]]; then - LICENSE="${LICENSE} handbook? ( FDL-1.2 )" - MY_PV=${PV/_/-} +if [[ ${KDE_BUILD_TYPE} = release ]]; then + MY_PV="${PV/_/-}" MY_P="digikam-${MY_PV}" - [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable - SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.bz2" - S=${WORKDIR}/${MY_P}/extra/${PN} + + if [[ ${PV} =~ beta[0-9]$ ]]; then + SRC_BRANCH="unstable" + else + SRC_BRANCH="stable" + fi + + SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz" + + S="${WORKDIR}/${MY_P}/extra/${PN}" fi COMMON_DEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep libkipi '' '' '5=') $(add_qt_dep qtconcurrent) $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) $(add_qt_dep qtprintsupport) $(add_qt_dep qtsvg) - $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) $(add_qt_dep qtxmlpatterns) - calendar? ( $(add_kdeapps_dep kcalcore) ) + kde-apps/libkipi:5= flashexport? ( $(add_frameworks_dep karchive) ) mediawiki? ( net-libs/libmediawiki:5 ) - panorama? ( $(add_frameworks_dep threadweaver) ) - phonon? ( media-libs/phonon[qt5] ) - viewers? ( - $(add_qt_dep qtopengl) - x11-libs/libX11 - x11-libs/libXrandr - virtual/opengl - ) vkontakte? ( net-libs/libkvkontakte:5 ) " DEPEND="${COMMON_DEPEND} sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) " RDEPEND="${COMMON_DEPEND} !media-plugins/kipi-plugins:4 - expoblending? ( media-gfx/hugin ) - panorama? ( - media-gfx/enblend - media-gfx/hugin - ) " -RESTRICT=test +# hangs +RESTRICT="test" src_prepare() { - undetect_lib() { - local _use=${1} - local _name=${2} - [[ -z ${_name} ]] && _name=$(echo ${_use} | sed 's/./\U&/g') - use $_use || \ - sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die - } - - undetect_lib mediawiki - undetect_lib vkontakte KVKONTAKTE - - sed -i -e "/add_subdirectory(expoblending)/ s/^/#DONT/" CMakeLists.txt || die + kde5_src_prepare - if [[ ${KDE_BUILD_TYPE} != live ]]; then + if [[ ${KDE_BUILD_TYPE} = release ]]; then # prepare the handbook mv "${WORKDIR}"/${MY_P}/doc/${PN} "${S}"/doc || die @@ -109,30 +75,21 @@ src_prepare() { echo "add_subdirectory( doc )" >> CMakeLists.txt || die fi - if [[ ${SRC_BRANCH} != unstable ]]; then + if [[ ${SRC_BRANCH} = stable ]]; then # prepare the translations mv "${WORKDIR}/${MY_P}/po" po || die find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die - echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die echo "add_subdirectory( po )" >> CMakeLists.txt || die fi fi - - kde5_src_prepare } src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package calendar KF5CalendarCore) $(cmake-utils_use_find_package flashexport KF5Archive) - $(cmake-utils_use_find_package panorama BISON) - $(cmake-utils_use_find_package panorama FLEX) - $(cmake-utils_use_find_package panorama KF5ThreadWeaver) - $(cmake-utils_use_find_package phonon Phonon4Qt5) - $(cmake-utils_use_find_package viewers OpenGL) - $(cmake-utils_use_find_package viewers Qt5OpenGL) - $(cmake-utils_use_find_package viewers X11) + $(cmake-utils_use_find_package mediawiki KF5MediaWiki) + $(cmake-utils_use_find_package vkontakte KF5Vkontakte) ) kde5_src_configure diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml index 6a85583..7976151 100644 --- a/media-plugins/kipi-plugins/metadata.xml +++ b/media-plugins/kipi-plugins/metadata.xml @@ -9,12 +9,8 @@ Gentoo KDE Project - Build the expoblending plugin, which requires media-gfx/hugin Build the flash export plugin Build the mediawiki export plugin - Pull in dependencies needed by panorama plugin - Enable sound support via media-libs/phonon - Build image- and advanced slideshow viewers Build plugin for vkontakte.ru