[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, kde-apps/kipi-plugins/, profiles/updates/
commit: 9afb178f0d553c719c61c685ed3ed63fee6c20b8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jul 15 20:27:02 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 15 20:30:00 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9afb178f
media-plugins/kipi-plugins: pkgmove to kde-apps/kipi-plugins
Part of KDE Applications starting with 19.08
Signed-off-by: Andreas Sturmlechner gentoo.org>
{media-plugins => kde-apps}/kipi-plugins/kipi-plugins-.ebuild | 0
{media-plugins => kde-apps}/kipi-plugins/metadata.xml | 0
profiles/updates/3Q-2019 | 1 +
3 files changed, 1 insertion(+)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/kde-apps/kipi-plugins/kipi-plugins-.ebuild
similarity index 100%
rename from media-plugins/kipi-plugins/kipi-plugins-.ebuild
rename to kde-apps/kipi-plugins/kipi-plugins-.ebuild
diff --git a/media-plugins/kipi-plugins/metadata.xml
b/kde-apps/kipi-plugins/metadata.xml
similarity index 100%
rename from media-plugins/kipi-plugins/metadata.xml
rename to kde-apps/kipi-plugins/metadata.xml
diff --git a/profiles/updates/3Q-2019 b/profiles/updates/3Q-2019
new file mode 100644
index 00..912c0240d8
--- /dev/null
+++ b/profiles/updates/3Q-2019
@@ -0,0 +1 @@
+move media-plugins/kipi-plugins kde-apps/kipi-plugins
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 7cc3c4a5da999e4d3ea4ede3cf2dcc3ac51e7fae
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 5 18:57:14 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 8 18:04:29 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7cc3c4a5
media-plugins/kipi-plugins: Fix cmake arg
Upstream commit 76dca8e8459fe64ed066fd15cc0d7aea16d943b8
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index a14ddbc333..e5c7924836 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -43,7 +43,7 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package flashexport KF5Archive)
$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
- -DENABLE_KIO=$(usex remotestorage)
+ $(cmake-utils_use_find_package remotestorage KF5KIO)
$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
)
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 3ca2fbc7f797d39c1b90fd9302ec0027b794c5d0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 17 10:34:10 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 17 10:34:10 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3ca2fbc7
media-plugins/kipi-plugins: No longer a digikam project
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index 687d5e96c2..a14ddbc333 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -7,14 +7,10 @@ KDE_TEST="true"
inherit kde5
DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://www.digikam.org/;
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://kde/stable/digikam/digikam-${PV}.tar.xz"
-fi
+HOMEPAGE="https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/;
LICENSE="GPL-2+"
+KEYWORDS=""
IUSE="flashexport mediawiki +remotestorage vkontakte"
BDEPEND="sys-devel/gettext"
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 8a0996554a4b45c0c0b080670a83369e8fc477f5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 16:59:10 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 17:12:15 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a099655
media-plugins/kipi-plugins: Cleanup, no longer a 'digiKam' project
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../kipi-plugins/kipi-plugins-.ebuild | 40 --
1 file changed, 7 insertions(+), 33 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index 5a19db4293..3cf1afdd1a 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,24 +9,15 @@ inherit kde5
DESCRIPTION="Plugins for the KDE Image Plugin Interface"
HOMEPAGE="https://www.digikam.org/;
-LICENSE="GPL-2+"
-IUSE="flashexport mediawiki +remotestorage vkontakte"
-
if [[ ${KDE_BUILD_TYPE} = release ]]; then
KEYWORDS="~amd64 ~x86"
- if [[ ${PV} =~ beta[0-9]$ ]]; then
- SRC_BRANCH="unstable"
- else
- SRC_BRANCH="stable"
- fi
-
- MY_PV="${PV/_/-}"
- MY_P="digikam-${MY_PV}"
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}/extra/${PN}"
+ SRC_URI="mirror://kde/stable/digikam/digikam-${PV}.tar.xz"
fi
-COMMON_DEPEND="
+LICENSE="GPL-2+"
+IUSE="flashexport mediawiki +remotestorage vkontakte"
+
+RDEPEND="
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -47,27 +38,10 @@ COMMON_DEPEND="
remotestorage? ( $(add_frameworks_dep kio) )
vkontakte? ( net-libs/libkvkontakte:5 )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
$(add_qt_dep qtconcurrent)
sys-devel/gettext
"
-RDEPEND="${COMMON_DEPEND}
- !media-plugins/kipi-plugins:4
-"
-
-src_prepare() {
- if [[ ${KDE_BUILD_TYPE} = release ]]; 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(Gettext REQUIRED)" >> CMakeLists.txt
|| die
- echo "add_subdirectory( po )" >> CMakeLists.txt || die
- fi
- fi
-
- kde5_src_prepare
-}
src_configure() {
local mycmakeargs=(
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 95622ede88254f93b4704338f8204d680e55ce77
Author: Johannes Huber gentoo org>
AuthorDate: Wed Sep 6 18:49:09 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed Sep 6 18:49:09 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=95622ede
media-plugins/kipi-plugins: Sync with maint tree
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index c8c614155c..8f69d80805 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -10,21 +10,19 @@ DESCRIPTION="Plugins for the KDE Image Plugin Interface"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2+"
-KEYWORDS=""
IUSE="flashexport mediawiki +remotestorage vkontakte"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- MY_PV="${PV/_/-}"
- MY_P="digikam-${MY_PV}"
-
+ KEYWORDS="~amd64 ~x86"
if [[ ${PV} =~ beta[0-9]$ ]]; then
SRC_BRANCH="unstable"
else
SRC_BRANCH="stable"
fi
+ MY_PV="${PV/_/-}"
+ MY_P="digikam-${MY_PV}"
SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-
S="${WORKDIR}/${MY_P}/extra/${PN}"
fi
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 885f1a546b5a1db667d15e5177f7b4ae381dedfe Author: Johannes Huber gentoo org> AuthorDate: Fri Dec 23 09:15:57 2016 + Commit: Johannes Huber gentoo org> CommitDate: Fri Dec 23 10:10:21 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=885f1a54 media-plugins/kipi-plugins: Drop CMAKE_MIN_VERSION Covered by cmake-utils eclass now. Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-plugins/kipi-plugins/kipi-plugins-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild b/media-plugins/kipi-plugins/kipi-plugins-.ebuild index 9e999a1..760a87a 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild @@ -4,7 +4,6 @@ EAPI=6 -CMAKE_MIN_VERSION="3.0" KDE_TEST="true" inherit kde5
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 09961e73074d235659296c683f9f99565c314828
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sat Nov 26 13:11:06 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Nov 26 13:11:06 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=09961e73
media-plugins/kipi-plugins: Use upstream provided build switch for KIO
Package-Manager: portage-2.3.0
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index bc6fddb..9e999a1 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -77,7 +77,7 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package flashexport KF5Archive)
$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
- $(cmake-utils_use_find_package remotestorage KF5KIO)
+ -DENABLE_KIO=$(usex remotestorage)
$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
)
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 2a0e4d44f5004037de9a2dac7a2772471247f844 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 20 18:50:16 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 20 18:57:37 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a0e4d44 media-plugins/kipi-plugins: use https Package-Manager: portage-2.3.2 media-plugins/kipi-plugins/kipi-plugins-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild b/media-plugins/kipi-plugins/kipi-plugins-.ebuild index 0dff1b9..feab188 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild @@ -10,7 +10,7 @@ KDE_TEST="true" inherit kde5 DESCRIPTION="Plugins for the KDE Image Plugin Interface" -HOMEPAGE="http://www.digikam.org/; +HOMEPAGE="https://www.digikam.org/; LICENSE="GPL-2+ handbook? ( FDL-1.2 )" KEYWORDS=""
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 7098d554d2cd3a58385f3498799d735e4b7dead5
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 20 18:52:10 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 20 18:57:37 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7098d554
media-plugins/kipi-plugins: remove handbook
kipi-plugins-doc.git was emptied upstream.
Package-Manager: portage-2.3.2
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index feab188..661afec 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -5,14 +5,13 @@
EAPI=6
CMAKE_MIN_VERSION="3.0"
-KDE_HANDBOOK="true"
KDE_TEST="true"
inherit kde5
DESCRIPTION="Plugins for the KDE Image Plugin Interface"
HOMEPAGE="https://www.digikam.org/;
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+LICENSE="GPL-2+"
KEYWORDS=""
IUSE="flashexport mediawiki +remotestorage vkontakte"
@@ -63,13 +62,6 @@ RDEPEND="${COMMON_DEPEND}
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
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: a74c771899f04566a8ba8ec126d01df94824ecb9 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 20 18:56:58 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 20 18:57:37 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a74c7718 media-plugins/kipi-plugins: remove unused dependency Upstream-commit: b2fbdb1687795ee133f9d175f9ca32ba5411e727 Package-Manager: portage-2.3.2 media-plugins/kipi-plugins/kipi-plugins-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild b/media-plugins/kipi-plugins/kipi-plugins-.ebuild index 661afec..bc6fddb 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild @@ -36,7 +36,6 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep ki18n) - $(add_frameworks_dep kservice) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) $(add_kdeapps_dep libkipi '' '' '5=')
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 0fc7659bebbdc936488f2785c000fc2599f614bc
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Sep 21 16:52:11 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Sep 21 16:52:14 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0fc7659b
media-plugins/kipi-plugins: virtualx is no longer required for tests
Upstream-commit: 315b177031c07415e7965828f7c432bc73753c82
Package-Manager: portage-2.3.0
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index 205f6c5..0dff1b9 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -7,7 +7,6 @@ EAPI=6
CMAKE_MIN_VERSION="3.0"
KDE_HANDBOOK="true"
KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
inherit kde5
DESCRIPTION="Plugins for the KDE Image Plugin Interface"
@@ -62,9 +61,6 @@ RDEPEND="${COMMON_DEPEND}
!media-plugins/kipi-plugins:4
"
-# hangs
-RESTRICT="test"
-
src_prepare() {
if [[ ${KDE_BUILD_TYPE} = release ]]; then
# prepare the handbook
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 99bd80c26deb5ccf7c081860b4ad6ccd7892057c
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Aug 10 17:26:50 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Aug 10 17:26:53 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=99bd80c2
media-plugins/kipi-plugins: qtconcurrent usage is header-only
Package-Manager: portage-2.3.0
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index 649db78..205f6c5 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -42,7 +42,6 @@ COMMON_DEPEND="
$(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)
@@ -56,6 +55,7 @@ COMMON_DEPEND="
vkontakte? ( net-libs/libkvkontakte:5 )
"
DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
sys-devel/gettext
"
RDEPEND="${COMMON_DEPEND}
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 5e9f140a163c0a192587caf16806d2e774539b34
Author: Johannes Huber gentoo org>
AuthorDate: Sun Jul 10 11:02:27 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Jul 10 11:02:27 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e9f140a
media-plugins/kipi-plugins: Remove 5.0.0
Moved to gentoo main tree.
Package-Manager: portage-2.3.0
.../kipi-plugins/kipi-plugins-5.0.0.ebuild | 96 --
1 file changed, 96 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
deleted file mode 100644
index f053f5c1..000
--- a/media-plugins/kipi-plugins/kipi-plugins-5.0.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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() {
- 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
-
- kde5_src_prepare
-}
-
-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
-}
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 79dec96552dcbc00cd2e96e50c975580915db785
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Jul 7 20:04:24 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Jul 7 20:04:56 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=79dec965
media-plugins/kipi-plugins: restore kde5_src_prepare placement
Earlier and po/ does not exist yet (due to our splitting) so no gettext-like
behaviour can occur.
Package-Manager: portage-2.3.0
media-plugins/kipi-plugins/kipi-plugins-5.0.0.ebuild | 4 ++--
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 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
index 4edd31f..f053f5c1 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-5.0.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-5.0.0.ebuild
@@ -65,8 +65,6 @@ RDEPEND="${COMMON_DEPEND}
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
@@ -83,6 +81,8 @@ src_prepare() {
echo "add_subdirectory( po )" >> CMakeLists.txt || die
fi
fi
+
+ kde5_src_prepare
}
src_configure() {
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index 9d17dd2..76a8bae 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -65,8 +65,6 @@ RDEPEND="${COMMON_DEPEND}
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
@@ -83,6 +81,8 @@ src_prepare() {
echo "add_subdirectory( po )" >> CMakeLists.txt || die
fi
fi
+
+ kde5_src_prepare
}
src_configure() {
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 5f3fe69b1769320ff001ede8bdb1b3c5c4a3dc95
Author: Felix Leif Keppmann keppmann de>
AuthorDate: Thu Apr 28 07:47:47 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Thu Apr 28 10:10:00 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f3fe69b
media-plugins/kipi-plugins: version bump to 5.0.0_beta6
Ebuild for beta version of Kipi Plugins 5 along with Digikam 5.
Signed-off-by: Johannes Huber gentoo.org>
.../{kipi-plugins-5.0.0_beta5.ebuild => kipi-plugins-5.0.0_beta6.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta5.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta6.ebuild
similarity index 100%
rename from media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta5.ebuild
rename to media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta6.ebuild
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: fd23d202189a6399ac215202b37c8bb4a1e7cd38
Author: Felix Leif Keppmann keppmann de>
AuthorDate: Sun Apr 10 13:29:27 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Apr 12 17:55:25 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd23d202
media-plugins/kipi-plugins: version bump to 5.0.0_beta5
Ebuild for beta version of Kipi Plugins 5 along with Digikam 5.
Signed-off-by: Johannes Huber gentoo.org>
.../{kipi-plugins-5.0.0_beta4.ebuild => kipi-plugins-5.0.0_beta5.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta4.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta5.ebuild
similarity index 100%
rename from media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta4.ebuild
rename to media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta5.ebuild
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 61e168e25ad2678d6c19234be603b149deb1424e
Author: Felix Leif Keppmann keppmann de>
AuthorDate: Wed Feb 24 23:05:00 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Feb 25 09:13:31 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=61e168e2
media-plugins/kipi-plugins: version bump to 5.0.0_beta4
Ebuild for beta version of Kipi Plugins 5 along with Digikam 5.
.../kipi-plugins/kipi-plugins-5.0.0_beta4.ebuild | 141 +
1 file changed, 141 insertions(+)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta4.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta4.ebuild
new file mode 100644
index 000..d013c64
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-5.0.0_beta4.ebuild
@@ -0,0 +1,141 @@
+# 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)
+
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 306870ae416df860921c14b8233c7700bc0b1ecd
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Jan 31 23:30:48 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jan 31 23:30:48 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=306870ae
media-plugins/kipi-plugins: EAPI=6, use add_kdeapps_dep slot override
Package-Manager: portage-2.2.27
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index b2e4e6d..ac6cafd 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -6,7 +6,7 @@
# TODO: complete packaging of qtsoap and qtkoauth
#
-EAPI=5
+EAPI=6
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_HANDBOOK=true
@@ -47,6 +47,7 @@ COMMON_DEPEND="
$(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 qtprintsupport)
@@ -55,7 +56,6 @@ COMMON_DEPEND="
$(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 )
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 622b4d3295b3c2eae63664742eb2044e1cedff73
Author: Andreas Sturmlechner gmail com>
AuthorDate: Fri Oct 16 13:50:43 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Oct 16 18:24:10 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=622b4d32
media-plugins/kipi-plugins: Frameworks merged to master
Package-Manager: portage-2.2.20.1
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index c49f4dd..a4324cb 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -12,7 +12,6 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_HANDBOOK=true
fi
-EGIT_BRANCH=frameworks
KDE_TEST=true
inherit flag-o-matic kde5
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: cc8229f62c2852b43e5b8dcb81278ae7a09b463d Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Oct 14 21:48:38 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 15 08:13:42 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc8229f6 media-plugins/kipi-plugins: Upstream removed DEPENDs Package-Manager: portage-2.2.23 media-plugins/kipi-plugins/kipi-plugins-.ebuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild b/media-plugins/kipi-plugins/kipi-plugins-.ebuild index 13a1aa8..524be98 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild @@ -49,7 +49,6 @@ COMMONDEPEND=" $(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) @@ -57,8 +56,6 @@ COMMONDEPEND=" $(add_frameworks_dep kparts) $(add_frameworks_dep kservice) $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) $(add_frameworks_dep threadweaver)
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 024e187072dd05707cf502cbbb9b41683d6d1f6c Author: Andreas Sturmlechner gmail com> AuthorDate: Thu Oct 15 12:33:28 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 15 16:46:04 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=024e1870 media-plugins/kipi-plugins: Drop libkdcraw DEPEND Package-Manager: portage-2.2.20.1 media-plugins/kipi-plugins/kipi-plugins-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild b/media-plugins/kipi-plugins/kipi-plugins-.ebuild index 524be98..c49f4dd 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild @@ -68,7 +68,6 @@ COMMONDEPEND=" dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 - kde-apps/libkdcraw:5= kde-apps/libkexiv2:5= kde-apps/libkipi:5= media-libs/libpng:0=
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: c88a71d7510c2fbd741462d842af4bbec24747e2
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Sep 27 01:05:53 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Mon Oct 5 20:26:27 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c88a71d7
media-plugins/kipi-plugins: Fix DEPENDs, clean up
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 6 ++
media-plugins/kipi-plugins/metadata.xml | 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index cba7fba..13a1aa8 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.digikam.org/;
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="cdr calendar expoblending geolocator +imagemagick mediawiki opengl
panorama vkontakte"
+IUSE="cdr calendar expoblending +imagemagick mediawiki opengl panorama
vkontakte"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
LICENSE="${LICENSE} handbook? ( FDL-1.2 )"
@@ -50,11 +50,9 @@ COMMONDEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep khtml)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
@@ -103,7 +101,7 @@ RDEPEND="${COMMONDEPEND}
imagemagick? ( || ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] ) )
panorama? (
media-gfx/enblend
- >=media-gfx/hugin-2011.0.0
+ media-gfx/hugin
)
"
diff --git a/media-plugins/kipi-plugins/metadata.xml
b/media-plugins/kipi-plugins/metadata.xml
index 1b66415..dc89873 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/metadata.xml
@@ -7,7 +7,6 @@
Build the expoblending plugin, which
requires media-gfx/hugin
- Build the geolocator plugin, which
requires kde-apps/libkgeomap and thereby marble
Build the mediawiki export plugin
Pull in dependencies needed by panorama
plugin
Build plugin for vkontakte.ru
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
commit: b00082619558b9f98dbf506abbcec1c61b6bb2b6
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sat Sep 19 17:12:12 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sat Sep 19 20:00:56 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0008261
media-plugins/kipi-plugins: Fix DEPENDs, expoblending patch
Package-Manager: portage-2.2.20.1
.../kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch | 9 -
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 5 -
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git
a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
index d548f34..2293826 100644
--- a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
@@ -1,14 +1,13 @@
--- a/CMakeLists.txt 2015-08-02 14:04:46.650113184 +0200
+++ b/CMakeLists.txt 2015-09-15 19:07:39.0 +0200
-@@ -310,7 +310,10 @@
+@@ -310,7 +310,9 @@
add_subdirectory(kmlexport)
add_subdirectory(sendimages)
add_subdirectory(flashexport)
-add_subdirectory(expoblending)
-+
+if(ENABLE_expoblending)
+add_subdirectory(expoblending)
+endif()
-
- if(BUILD_VIEWERS)
- add_subdirectory(advancedslideshow)
+ add_subdirectory(flickr)
+ add_subdirectory(smug)
+ add_subdirectory(imageshack)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index c78bc7c..cba7fba 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -80,10 +80,6 @@ COMMONDEPEND="
media-libs/tiff:0
virtual/jpeg:0
calendar? ( $(add_kdeapps_dep kcalcore) )
- geolocator? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep libkgeomap)
- )
mediawiki? ( net-libs/libmediawiki:5 )
opengl? (
dev-qt/qtopengl:5
@@ -127,7 +123,6 @@ src_prepare() {
sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die
}
- undetect_lib geolocator KGEOMAP
undetect_lib mediawiki
undetect_lib vkontakte KVKONTAKTE
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
commit: a12d61732fb9bbda5c59cd8bc0ee84b0ff5c9140
Author: Andreas Sturmlechner gmail com>
AuthorDate: Tue Sep 15 17:11:16 2015 +
Commit: Manuel Rüger gentoo org>
CommitDate: Thu Sep 17 08:38:00 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a12d6173
media-plugins/kipi-plugins: Fix DEPENDs, expoblending patch
See also: https://bugs.gentoo.org/show_bug.cgi?id=560562
Package-Manager: portage-2.2.20.1
.../files/kipi-plugins-5.0.0-expoblending.patch | 16 +++-
media-plugins/kipi-plugins/kipi-plugins-.ebuild | 14 ++
2 files changed, 9 insertions(+), 21 deletions(-)
diff --git
a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
index 33fcb33..d548f34 100644
--- a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
@@ -1,16 +1,14 @@
--- a/CMakeLists.txt 2015-08-02 14:04:46.650113184 +0200
-+++ b/CMakeLists.txt 2015-08-02 14:06:44.499115207 +0200
-@@ -312,9 +312,12 @@
b/CMakeLists.txt 2015-09-15 19:07:39.0 +0200
+@@ -310,7 +310,10 @@
+ add_subdirectory(kmlexport)
add_subdirectory(sendimages)
- add_subdirectory(timeadjust)
add_subdirectory(flashexport)
-add_subdirectory(expoblending)
- add_subdirectory(metadataedit)
-
++
+if(ENABLE_expoblending)
+add_subdirectory(expoblending)
+endif()
-+
- if(KF5Sane_FOUND)
- add_subdirectory(acquireimages)
- endif()
+
+ if(BUILD_VIEWERS)
+ add_subdirectory(advancedslideshow)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
index ce36d7d..c78bc7c 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.digikam.org/;
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="cdr calendar expoblending geolocator +imagemagick mediawiki opengl
panorama scanner vkontakte"
+IUSE="cdr calendar expoblending geolocator +imagemagick mediawiki opengl
panorama vkontakte"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
LICENSE="${LICENSE} handbook? ( FDL-1.2 )"
@@ -50,7 +50,6 @@ COMMONDEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep khtml)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
@@ -92,10 +91,6 @@ COMMONDEPEND="
x11-libs/libXrandr
virtual/opengl
)
- scanner? (
- $(add_kdeapps_dep libksane)
- media-gfx/sane-backends
- )
vkontakte? ( net-libs/libkvkontakte:5 )
"
DEPEND="${COMMONDEPEND}
@@ -134,12 +129,9 @@ src_prepare() {
undetect_lib geolocator KGEOMAP
undetect_lib mediawiki
- undetect_lib scanner KSANE
undetect_lib vkontakte KVKONTAKTE
-# if ! use redeyes ; then
-# sed -i -e "/DETECT_OPENCV/d" CMakeLists.txt || die
-# fi
+# undetect_lib redeyes OPENCV #TODO: Add back when ported
if [[ ${KDE_BUILD_TYPE} != live ]]; then
# prepare the handbook
@@ -172,8 +164,6 @@ src_configure() {
# $(cmake-utils_use_find_package redeyes OpenCV)
# $(cmake-utils_use_with crypt QCA2)
# $(cmake-utils_use_with videoslideshow QtGStreamer)
-# FIXME? not optional since >=5.0.0
-# $(cmake-utils_use_with upnp Hupnp)
kde5_src_configure
}
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 902318960af00f79acaf1c0cf486988e95eddaec Author: Andreas Sturmlechner gmail com> AuthorDate: Sat Sep 5 21:16:06 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Tue Sep 8 02:50:20 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=90231896 media-plugins/kipi-plugins: Drop media-libs/herqq DEPEND Package-Manager: portage-2.2.20.1 media-plugins/kipi-plugins/kipi-plugins-.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-.ebuild b/media-plugins/kipi-plugins/kipi-plugins-.ebuild index 435051c..ce36d7d 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-.ebuild @@ -43,7 +43,6 @@ fi # >=media-libs/qt-gstreamer-0.9.0[qt5(+)] # || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) # ) -# FIXME? media-libs/herqq not optional since >=5.0.0 COMMONDEPEND=" $(add_frameworks_dep karchive) @@ -78,7 +77,6 @@ COMMONDEPEND=" kde-apps/libkdcraw:5= kde-apps/libkexiv2:5= kde-apps/libkipi:5= - media-libs/herqq media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg:0
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: eb50b25111faf91b962d692fe75e6788208f4d94
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sat Aug 8 07:52:21 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Aug 8 07:52:21 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb50b251
[media-plugins/kipi-plugins] Drop KDE_MINIMAL on ancient version
Package-Manager: portage-2.2.20
media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
index f925bb3..8a045af 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
@@ -9,17 +9,12 @@
EAPI=5
OPENGL_REQUIRED=optional
-
-KDE_MINIMAL=4.10
-
+KDE_HANDBOOK=optional
KDE_LINGUAS=af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr
sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK
zh_TW
zu
-
-KDE_HANDBOOK=optional
-
inherit flag-o-matic kde4-base
MY_PV=${PV/_/-}
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: 008e6abf29dffcef58489581c601e1f332cd0ccb
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sat Aug 8 08:03:39 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Aug 8 08:03:39 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=008e6abf
[media-plugins/kipi-plugins] Drop KDE_LINGUAS
Handled by kde5.eclass automatically.
Package-Manager: portage-2.2.20
media-plugins/kipi-plugins/kipi-plugins-5..ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5..ebuild
b/media-plugins/kipi-plugins/kipi-plugins-5..ebuild
index b75932e..1a25928 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-5..ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-5..ebuild
@@ -10,10 +10,6 @@ EAPI=5
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_HANDBOOK=true
-KDE_LINGUAS=af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
-fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
-mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv
-ta te tg th tr tt uk uz ven vi wa xh zh_CN zh_HK zh_TW zu
fi
EGIT_BRANCH=frameworks
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
commit: 1b2d5ae6301abab0f97d1c39343db9a77a453713 Author: Johannes Huber johu AT gentoo DOT org AuthorDate: Sat Aug 8 08:46:00 2015 + Commit: Johannes Huber johu AT gentoo DOT org CommitDate: Sat Aug 8 08:46:00 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b2d5ae6 [media-plugins/kipi-plugins] Moved to the main tree Package-Manager: portage-2.2.20 .../files/kipi-plugins-4.10.0-jpeg.patch | 76 --- .../files/kipi-plugins-4.6.0-options.patch | 24 .../kipi-plugins/kipi-plugins-4.12.0.ebuild| 145 - ...gins-5..ebuild = kipi-plugins-.ebuild} | 0 media-plugins/kipi-plugins/metadata.xml| 7 - 5 files changed, 252 deletions(-) diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch b/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch deleted file mode 100644 index 361059e..000 --- a/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -u -r a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-16 09:54:40.0 +0200 -+++ b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-24 20:46:51.471208340 +0200 -@@ -181,8 +181,8 @@ - cinfo.comp_info[2].v_samp_factor = 1; - - // bug #154273: use 99 compression level instead 100 to reduce output JPEG file size. --jpeg_set_quality(cinfo, 99, true); --jpeg_start_compress(cinfo, true); -+jpeg_set_quality(cinfo, 99, boolean (true)); -+jpeg_start_compress(cinfo, boolean(true)); - - // Write ICC color profile. - if (!d-iccProfile.isEmpty()) -diff -u -r a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp b/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp 2014-12-16 09:54:40.0 +0200 -+++ b/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp 2014-12-24 20:53:06.757881558 +0200 -@@ -197,10 +197,10 @@ - JCOPY_OPTION copyoption = JCOPYOPT_ALL; - jpeg_transform_info transformoption; - --transformoption.perfect = false; --transformoption.force_grayscale = false; --transformoption.trim= false; --transformoption.crop= false; -+transformoption.perfect = boolean(false); -+transformoption.force_grayscale = boolean(false); -+transformoption.trim= boolean(false); -+transformoption.crop= boolean(false); - - struct jpeg_decompress_struct srcinfo; - struct jpeg_compress_struct dstinfo; -@@ -277,7 +277,7 @@ - kp_jpeg_qiodevice_src(srcinfo, input_file); - jcopy_markers_setup(srcinfo, copyoption); - --(void) jpeg_read_header(srcinfo, true); -+(void) jpeg_read_header(srcinfo, boolean(true)); - - // First rotate - execute even if rotate is JXFORM_NONE to apply new EXIF settings - transformoption.transform = rotate; -@@ -296,10 +296,10 @@ - kp_jpeg_qiodevice_dest(dstinfo, output_file); - - // Do not write a JFIF header if previously the image did not contain it --dstinfo.write_JFIF_header = false; -+dstinfo.write_JFIF_header = boolean(false); - - // Start compressor (note no image data is actually written here) --dstinfo.optimize_coding = true; -+dstinfo.optimize_coding = boolean(true); - jpeg_write_coefficients(dstinfo, dst_coef_arrays); - - // Copy to the output file any extra markers that we want to preserve -@@ -349,7 +349,7 @@ - kp_jpeg_qiodevice_src(srcinfo, input_file); - jcopy_markers_setup(srcinfo, copyoption); - --(void) jpeg_read_header(srcinfo, true); -+(void) jpeg_read_header(srcinfo, boolean(true)); - - transformoption.transform=flip; - jtransform_request_workspace(srcinfo, transformoption); -@@ -366,10 +366,10 @@ - kp_jpeg_qiodevice_dest(dstinfo, output_file); - - // Do not write a JFIF header if previously the image did not contain it --dstinfo.write_JFIF_header = false; -+dstinfo.write_JFIF_header = boolean(false); - - // Start compressor (note no image data is actually written here) --dstinfo.optimize_coding = true; -+dstinfo.optimize_coding = boolean(true); - jpeg_write_coefficients(dstinfo, dst_coef_arrays); - - // Copy to the output file any extra markers that we want to preserve diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch deleted file mode 100644 index 100e935..000 --- a/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
commit: 57c3fb7e5b974a6fd55b6e35b2ddf7e556558add Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com AuthorDate: Sat Aug 1 19:10:23 2015 + Commit: Johannes Huber johu AT gentoo DOT org CommitDate: Mon Aug 3 19:11:30 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=57c3fb7e [media-plugins/kipi-plugins] Version bump Package-Manager: portage-2.2.20 .../files/kipi-plugins-4.10.0-jpeg.patch | 76 +++ .../files/kipi-plugins-4.6.0-options.patch | 24 .../kipi-plugins/kipi-plugins-4.12.0.ebuild| 150 + media-plugins/kipi-plugins/metadata.xml| 21 +++ 4 files changed, 271 insertions(+) diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch b/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch new file mode 100644 index 000..361059e --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-4.10.0-jpeg.patch @@ -0,0 +1,76 @@ +diff -u -r a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp +--- a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-16 09:54:40.0 +0200 b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-24 20:46:51.471208340 +0200 +@@ -181,8 +181,8 @@ + cinfo.comp_info[2].v_samp_factor = 1; + + // bug #154273: use 99 compression level instead 100 to reduce output JPEG file size. +-jpeg_set_quality(cinfo, 99, true); +-jpeg_start_compress(cinfo, true); ++jpeg_set_quality(cinfo, 99, boolean (true)); ++jpeg_start_compress(cinfo, boolean(true)); + + // Write ICC color profile. + if (!d-iccProfile.isEmpty()) +diff -u -r a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp b/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp +--- a/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp 2014-12-16 09:54:40.0 +0200 b/extra/kipi-plugins/jpeglossless/transform/jpegtransform.cpp 2014-12-24 20:53:06.757881558 +0200 +@@ -197,10 +197,10 @@ + JCOPY_OPTION copyoption = JCOPYOPT_ALL; + jpeg_transform_info transformoption; + +-transformoption.perfect = false; +-transformoption.force_grayscale = false; +-transformoption.trim= false; +-transformoption.crop= false; ++transformoption.perfect = boolean(false); ++transformoption.force_grayscale = boolean(false); ++transformoption.trim= boolean(false); ++transformoption.crop= boolean(false); + + struct jpeg_decompress_struct srcinfo; + struct jpeg_compress_struct dstinfo; +@@ -277,7 +277,7 @@ + kp_jpeg_qiodevice_src(srcinfo, input_file); + jcopy_markers_setup(srcinfo, copyoption); + +-(void) jpeg_read_header(srcinfo, true); ++(void) jpeg_read_header(srcinfo, boolean(true)); + + // First rotate - execute even if rotate is JXFORM_NONE to apply new EXIF settings + transformoption.transform = rotate; +@@ -296,10 +296,10 @@ + kp_jpeg_qiodevice_dest(dstinfo, output_file); + + // Do not write a JFIF header if previously the image did not contain it +-dstinfo.write_JFIF_header = false; ++dstinfo.write_JFIF_header = boolean(false); + + // Start compressor (note no image data is actually written here) +-dstinfo.optimize_coding = true; ++dstinfo.optimize_coding = boolean(true); + jpeg_write_coefficients(dstinfo, dst_coef_arrays); + + // Copy to the output file any extra markers that we want to preserve +@@ -349,7 +349,7 @@ + kp_jpeg_qiodevice_src(srcinfo, input_file); + jcopy_markers_setup(srcinfo, copyoption); + +-(void) jpeg_read_header(srcinfo, true); ++(void) jpeg_read_header(srcinfo, boolean(true)); + + transformoption.transform=flip; + jtransform_request_workspace(srcinfo, transformoption); +@@ -366,10 +366,10 @@ + kp_jpeg_qiodevice_dest(dstinfo, output_file); + + // Do not write a JFIF header if previously the image did not contain it +-dstinfo.write_JFIF_header = false; ++dstinfo.write_JFIF_header = boolean(false); + + // Start compressor (note no image data is actually written here) +-dstinfo.optimize_coding = true; ++dstinfo.optimize_coding = boolean(true); + jpeg_write_coefficients(dstinfo, dst_coef_arrays); + + // Copy to the output file any extra markers that we want to preserve diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch new file mode 100644 index 000..100e935 --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch @@ -0,0 +1,24 @@ +diff -ruN digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/, media-plugins/kipi-plugins/files/
commit: 90b6e5146c56d3c204b5326b7bc59175a9d1e0af
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sun Aug 2 13:38:05 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Aug 3 19:17:48 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=90b6e514
[media-plugins/kipi-plugins] Add kf5 version
Package-Manager: portage-2.2.20
.../files/kipi-plugins-5.0.0-expoblending.patch| 16 ++
.../files/kipi-plugins-5.0.0-jpeg.patch| 14 ++
.../kipi-plugins/kipi-plugins-5..ebuild| 185 +
media-plugins/kipi-plugins/metadata.xml| 1 +
4 files changed, 216 insertions(+)
diff --git
a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
new file mode 100644
index 000..33fcb33
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-expoblending.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt 2015-08-02 14:04:46.650113184 +0200
b/CMakeLists.txt 2015-08-02 14:06:44.499115207 +0200
+@@ -312,9 +312,12 @@
+ add_subdirectory(sendimages)
+ add_subdirectory(timeadjust)
+ add_subdirectory(flashexport)
+-add_subdirectory(expoblending)
+ add_subdirectory(metadataedit)
+
++if(ENABLE_expoblending)
++add_subdirectory(expoblending)
++endif()
++
+ if(KF5Sane_FOUND)
+ add_subdirectory(acquireimages)
+ endif()
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-jpeg.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-jpeg.patch
new file mode 100644
index 000..72b3862
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-5.0.0-jpeg.patch
@@ -0,0 +1,14 @@
+diff -u -r
a/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp
b/extra/kipi-plugins/common/libkipiplugins/tools/imageio/kpwriteimage.cpp
+--- a/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-16
09:54:40.0 +0200
b/common/libkipiplugins/tools/imageio/kpwriteimage.cpp 2014-12-24
20:46:51.471208340 +0200
+@@ -181,8 +181,8 @@
+ cinfo.comp_info[2].v_samp_factor = 1;
+
+ // bug #154273: use 99 compression level instead 100 to reduce output
JPEG file size.
+-jpeg_set_quality(cinfo, 99, true);
+-jpeg_start_compress(cinfo, true);
++jpeg_set_quality(cinfo, 99, boolean (true));
++jpeg_start_compress(cinfo, boolean(true));
+
+ // Write ICC color profile.
+ if (!d-iccProfile.isEmpty())
diff --git a/media-plugins/kipi-plugins/kipi-plugins-5..ebuild
b/media-plugins/kipi-plugins/kipi-plugins-5..ebuild
new file mode 100644
index 000..b75932e
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-5..ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+#
+# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for
work in progress
+#
+
+EAPI=5
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+KDE_HANDBOOK=true
+KDE_LINGUAS=af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
+fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
+mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv
+ta te tg th tr tt uk uz ven vi wa xh zh_CN zh_HK zh_TW zu
+fi
+
+EGIT_BRANCH=frameworks
+KDE_TEST=true
+inherit flag-o-matic 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
+KEYWORDS=
+IUSE=cdr calendar expoblending geolocator +imagemagick mediawiki opengl
panorama scanner vkontakte
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ LICENSE=${LICENSE} handbook? ( FDL-1.2 )
+ MY_PV=${PV/_/-}
+ MY_P=digikam-${MY_PV}
+ SRC_URI=mirror://kde/stable/digikam/${MY_P}.tar.bz2
+ S=${WORKDIR}/${MY_P}/extra/${PN}
+fi
+
+# TODO: Add back when ported
+# dev-libs/libxml2
+# dev-libs/libxslt
+# crypt? ( app-crypt/qca:2[qt5(+)] )
+# redeyes? ( =media-libs/opencv-2.4.9 )
+# videoslideshow? (
+# =media-libs/qt-gstreamer-0.9.0[qt5(+)]
+# || ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] )
+# )
+# FIXME? media-libs/herqq not optional since =5.0.0
+
+COMMONDEPEND=
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep khtml)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kjobwidgets)
+
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-gfx/digikam/, net-libs/libkvkontakte/, ...
commit: ceb4c45aebd0a398eadd0388ffa824bfecc75adb
Author: Andreas K. Huettel (dilfridge) dilfridge AT gentoo DOT org
AuthorDate: Tue May 19 22:51:29 2015 +
Commit: Andreas Hüttel dilfridge AT gentoo DOT org
CommitDate: Tue May 19 22:51:29 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ceb4c45a
[digikam] 4.10.0 in the main tree, delete 4.9.0 here
media-gfx/digikam/digikam-4.9.0.ebuild | 163 -
.../digikam/files/digikam-4.9.0-fix-hang.patch | 21 ---
media-gfx/digikam/metadata.xml | 14 --
media-libs/libkgeomap/libkgeomap-4.9.0.ebuild | 31
media-libs/libkgeomap/metadata.xml | 5 -
.../files/kipi-plugins-4.6.0-options.patch | 24 ---
.../kipi-plugins/kipi-plugins-4.9.0.ebuild | 148 ---
media-plugins/kipi-plugins/metadata.xml| 21 ---
net-libs/libkvkontakte/libkvkontakte-4.9.0.ebuild | 25
net-libs/libkvkontakte/metadata.xml| 5 -
net-libs/libmediawiki/libmediawiki-4.9.0.ebuild| 22 ---
net-libs/libmediawiki/metadata.xml | 5 -
12 files changed, 484 deletions(-)
diff --git a/media-gfx/digikam/digikam-4.9.0.ebuild
b/media-gfx/digikam/digikam-4.9.0.ebuild
deleted file mode 100644
index 49d2d26..000
--- a/media-gfx/digikam/digikam-4.9.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_LINGUAS=af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu
fa fi fo fr fy ga gl ha he hi hr hsb
-hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms mt nb nds ne nl nn nso
oc pa pl pt pt_BR ro ru
-rw se sk sl sq sr sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven vi wa
xh zh_CN zh_HK zh_TW zu
-
-KDE_HANDBOOK=optional
-KDE_MINIMAL=4.10
-
-KDE_DOC_DIRS=doc-digikam doc-showfoto
-
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION=Digital photo management application for KDE
-HOMEPAGE=http://www.digikam.org/;
-SRC_URI=mirror://kde/stable/${PN}/${MY_P}.tar.bz2
-
-LICENSE=GPL-2
- handbook? ( FDL-1.2 )
-KEYWORDS=~amd64 ~x86
-SLOT=4
-IUSE=addressbook debug doc gphoto2 mysql semantic-desktop +thumbnails video
-
-CDEPEND=
- || (
- ( kde-apps/kdebase-kioslaves:4
- kde-apps/libkdcraw:4=
- kde-apps/libkexiv2:4=
- kde-apps/libkipi:4
- kde-apps/marble:4=[plasma] )
- ( $(add_kdebase_dep kdebase-kioslaves)
- kde-base/libkdcraw:4=
- kde-base/libkexiv2:4=
- $(add_kdebase_dep libkipi)
- kde-base/marble:4=[plasma] )
- )
- dev-qt/qtgui:4
- media-libs/jasper
- media-libs/lcms:2
- =media-libs/lensfun-0.2.6
- || ( =kde-apps/libkface-14.12.0:4 =media-libs/libkface-4.6.0 )
- =media-libs/libkgeomap-4.6.0:=
- media-libs/liblqr
- =media-libs/libpgf-6.12.27
- media-libs/libpng:0=
- =media-libs/opencv-2.4.9
- media-libs/phonon[qt4]
- =media-libs/tiff-3.8.2:0
- virtual/jpeg:0
- x11-libs/libX11
- || ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
- addressbook? ( $(add_kdebase_dep kdepimlibs) )
- gphoto2? ( media-libs/libgphoto2:= )
- mysql? ( virtual/mysql )
- semantic-desktop? (
- $(add_kdebase_dep baloo '' 4.12.0)
- )
-
-RDEPEND=${CDEPEND}
- || ( kde-apps/kreadconfig:4 $(add_kdebase_dep kreadconfig) )
- media-plugins/kipi-plugins
- video? (
- || (
- kde-apps/ffmpegthumbs:4
- kde-apps/mplayerthumbs:4
- $(add_kdebase_dep mplayerthumbs)
- $(add_kdebase_dep ffmpegthumbs)
- )
- )
-
-DEPEND=${CDEPEND}
- dev-cpp/eigen:3
- dev-libs/boost
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-
-
-S=${WORKDIR}/${MY_P}/core
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( ${FILESDIR}/${P}-fix-hang.patch )
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf ${WORKDIR}/${MY_P}/extra || die
-
- # prepare the handbook
- mkdir doc-digikam doc-showfoto || die
- echo add_subdirectory( en ) doc-digikam/CMakeLists.txt || die
- mv ${WORKDIR}/${MY_P}/doc/${PN}/digikam doc-digikam/en || die
- echo add_subdirectory( en ) doc-showfoto/CMakeLists.txt || die
- mv ${WORKDIR}/${MY_P}/doc/${PN}/showfoto doc-showfoto/en || die
- sed -i -e 's:../digikam/:../../doc-digikam/en/:g'
doc-showfoto/en/index.docbook || die
-
- # prepare the translations
- mv ${WORKDIR}/${MY_P}/po po || die
- find po -name *.po -and -not -name digikam.po -exec rm {} +
-
- echo find_package(Msgfmt REQUIRED)
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/
commit: d2ececee162500858ea41086a935c22dea913746 Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com AuthorDate: Mon Apr 20 22:56:05 2015 + Commit: Michael Palimaka kensington AT gentoo DOT org CommitDate: Wed Apr 22 15:51:59 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d2ececee [media-plugins/kipi-plugins] Add slot operators Package-Manager: portage-2.2.18 media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild index 80e70bb..9073c4f 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild @@ -46,8 +46,8 @@ COMMONDEPEND= dev-qt/qtxmlpatterns:4 gpssync?( =media-libs/libkgeomap-4.6.0 ) media-libs/libpng:0= - media-libs/tiff - virtual/jpeg + media-libs/tiff:0 + virtual/jpeg:0 calendar? ( $(add_kdebase_dep kdepimlibs) ) crypt? ( app-crypt/qca:2[qt4(+)] ) ipod? (
[gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/
commit: 9c703ca45bafb30df3dabf5dafe6025474a3a9e0
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sat Apr 18 20:38:49 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Apr 18 20:38:49 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c703ca4
[media-plugins/kipi-plugins] 4.9.0 version bump
Package-Manager: portage-2.2.14
.../files/kipi-plugins-4.6.0-options.patch | 24
.../kipi-plugins/kipi-plugins-4.9.0.ebuild | 148 +
media-plugins/kipi-plugins/metadata.xml| 21 +++
3 files changed, 193 insertions(+)
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
new file mode 100644
index 000..100e935
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch
@@ -0,0 +1,24 @@
+diff -ruN digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt
digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt
+--- digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt 2014-12-16
08:54:40.0 +0100
digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt2014-12-21
21:50:39.901188497 +0100
+@@ -370,7 +370,11 @@
+ add_subdirectory(picasawebexport)
+ add_subdirectory(smug)
+ add_subdirectory(printimages)
++
++if(ENABLE_expoblending)
+ add_subdirectory(expoblending)
++endif()
++
+ add_subdirectory(kopete)
+ add_subdirectory(batchprocessimages)
+ add_subdirectory(rajceexport)
+@@ -451,7 +455,7 @@
+ add_subdirectory(mediawiki)
+ endif()
+
+-if(FLEX_FOUND AND BISON_FOUND)
++if(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama)
+ add_subdirectory(panorama)
+ endif()
+
diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild
b/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild
new file mode 100644
index 000..80e70bb
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.9.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+#
+# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for
work in progress
+#
+
+EAPI=5
+
+OPENGL_REQUIRED=optional
+
+KDE_MINIMAL=4.10
+
+KDE_LINGUAS=af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa
+fi fo fr fy ga gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi
+mk mn ms mt nb nds ne nl nn nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv
+ta te tg th tr tt uk uz ven vi wa xh zh_CN zh_HK zh_TW zu
+
+KDE_HANDBOOK=optional
+
+inherit flag-o-matic kde4-base
+
+MY_PV=${PV/_/-}
+MY_P=digikam-${MY_PV}
+
+DESCRIPTION=Plugins for the KDE Image Plugin Interface
+HOMEPAGE=http://www.digikam.org/;
+SRC_URI=mirror://kde/stable/digikam/${MY_P}.tar.bz2
+
+LICENSE=GPL-2
+ handbook? ( FDL-1.2 )
+KEYWORDS=~amd64 ~x86
+SLOT=4
+IUSE=cdr calendar crypt debug expoblending gpssync +imagemagick ipod
mediawiki panorama redeyes scanner upnp videoslideshow vkontakte
+
+COMMONDEPEND=
+ || ( kde-apps/libkipi:4 $(add_kdebase_dep libkipi) )
+ || ( kde-apps/libkdcraw:4= kde-base/libkdcraw:4= )
+ || ( kde-apps/libkexiv2:4= kde-base/libkexiv2:4= )
+ dev-libs/expat
+ dev-libs/kqoauth
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/qjson
+ dev-qt/qtxmlpatterns:4
+ gpssync?( =media-libs/libkgeomap-4.6.0 )
+ media-libs/libpng:0=
+ media-libs/tiff
+ virtual/jpeg
+ calendar? ( $(add_kdebase_dep kdepimlibs) )
+ crypt? ( app-crypt/qca:2[qt4(+)] )
+ ipod? (
+ media-libs/libgpod
+ x11-libs/gtk+:2
+ )
+ mediawiki? ( =net-libs/libmediawiki-3.0.0 )
+ opengl? (
+ media-libs/phonon[qt4]
+ x11-libs/libXrandr
+ )
+ redeyes?( =media-libs/opencv-2.4.9 )
+ scanner?(
+ || ( kde-apps/libksane:4 $(add_kdebase_dep libksane) )
+ media-gfx/sane-backends
+ )
+ upnp? ( media-libs/herqq )
+ videoslideshow? (
+ =media-libs/qt-gstreamer-0.9.0[qt4(+)]
+ || ( media-gfx/imagemagick
media-gfx/graphicsmagick[imagemagick] )
+ )
+ vkontakte? ( net-libs/libkvkontakte )
+
+DEPEND=${COMMONDEPEND}
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+
+RDEPEND=${COMMONDEPEND}
+ cdr?( app-cdr/k3b )
+ expoblending? ( media-gfx/hugin )
+ imagemagick?( || (
