[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2024-01-14 Thread Andreas Sturmlechner
commit: 78e2a97c4357ad9532907141a44e6ec88babe2e9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 14 22:09:12 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 14 22:28:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78e2a97c

media-gfx/kphotoalbum: drop 5.11.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest  |  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild | 70 -
 2 files changed, 71 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 81a99faaaded..5c2d696da98d 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.11.0.tar.xz 12005836 BLAKE2B 
1a2872bc791cec6701a4bfe8b6ddac264731f7afdcb35d864bcd07cc0b5e5a4015184a071d9db9735d21b080c898d5ea598d0879bb979032abe464434f6fb821
 SHA512 
dd521b5e158a691da69e333fcefd3cf48135053c7510dbd7f22d94299059fe58037c56e70b92edfcd1d8d7a55b04f80278ff3bdde08dba16507dc43ca77af96e
 DIST kphotoalbum-5.12.0.tar.xz 11907204 BLAKE2B 
c4a9193d74c902788a5f68794948ca544f92eb1d2ef7a8c856b96832c7f1b8c5ba8b828744407e74a7101c3e954e83758444d31138c35c3a9045fae94f227e39
 SHA512 
f4d31d1c00ae2d8ec5a0475a4b3332e32f1ed980034419e6d07388544b65a6bd445c04c0640fba4fd5084c83840b6211ee64d556b6a82e4b182b5f07fbab3338

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
deleted file mode 100644
index 86170165ca71..
--- a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
-SLOT="5"
-IUSE="map phonon +raw share +vlc"
-
-REQUIRED_USE="|| ( phonon vlc )"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5[jpeg]
-   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   media-gfx/exiv2:=
-   media-libs/libjpeg-turbo:=
-   map? ( kde-apps/marble:5 )
-   phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
-   raw? ( kde-apps/libkdcraw:5 )
-   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-   vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}
-   media-video/ffmpeg
-"
-
-DOCS=( CHANGELOG.{md,old} README.md )
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited
-   $(cmake_use_find_package map Marble)
-   $(cmake_use_find_package phonon Phonon4Qt5)
-   $(cmake_use_find_package raw KF5KDcraw)
-   $(cmake_use_find_package share KF5Purpose)
-   $(cmake_use_find_package vlc LIBVLC)
-   )
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2024-01-12 Thread Sam James
commit: 8667a08f32f00864bc802d94daec94ebfa620fd9
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 12 16:53:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 12 16:53:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8667a08f

media-gfx/kphotoalbum: Stabilize 5.12.0 amd64, #921834

Signed-off-by: Sam James  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
index d0743323bf3b..4c1bf98ad156 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2024-01-12 Thread Arthur Zamarin
commit: c418b70afa40b6e96a058a68c94fd525d37c24f7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 08:17:53 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 08:17:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c418b70a

media-gfx/kphotoalbum: Stabilize 5.12.0 x86, #921834

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
index 60d41b1ab741..d0743323bf3b 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-12-12 Thread Andreas Sturmlechner
commit: 2768cce157861e3e8e0e89457ffa4184731634f6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 12 12:52:25 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 12 12:52:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2768cce1

media-gfx/kphotoalbum: add 5.12.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest  |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index eb90501ca754..81a99faaaded 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.11.0.tar.xz 12005836 BLAKE2B 
1a2872bc791cec6701a4bfe8b6ddac264731f7afdcb35d864bcd07cc0b5e5a4015184a071d9db9735d21b080c898d5ea598d0879bb979032abe464434f6fb821
 SHA512 
dd521b5e158a691da69e333fcefd3cf48135053c7510dbd7f22d94299059fe58037c56e70b92edfcd1d8d7a55b04f80278ff3bdde08dba16507dc43ca77af96e
+DIST kphotoalbum-5.12.0.tar.xz 11907204 BLAKE2B 
c4a9193d74c902788a5f68794948ca544f92eb1d2ef7a8c856b96832c7f1b8c5ba8b828744407e74a7101c3e954e83758444d31138c35c3a9045fae94f227e39
 SHA512 
f4d31d1c00ae2d8ec5a0475a4b3332e32f1ed980034419e6d07388544b65a6bd445c04c0640fba4fd5084c83840b6211ee64d556b6a82e4b182b5f07fbab3338

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
new file mode 100644
index ..60d41b1ab741
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.12.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
+SLOT="5"
+IUSE="map phonon +raw share +vlc"
+
+REQUIRED_USE="|| ( phonon vlc )"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5[jpeg]
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   media-libs/libjpeg-turbo:=
+   map? ( kde-apps/marble:5 )
+   phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+   vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+"
+
+DOCS=( CHANGELOG.{md,old} README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited
+   $(cmake_use_find_package map Marble)
+   $(cmake_use_find_package phonon Phonon4Qt5)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package share KF5Purpose)
+   $(cmake_use_find_package vlc LIBVLC)
+   )
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2023-08-03 Thread Andreas Sturmlechner
commit: 48e1a66ca8a4046a1695b03951822a37fe515016
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  3 15:18:37 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  3 15:34:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e1a66c

media-gfx/kphotoalbum: drop 5.10.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |   1 -
 .../files/kphotoalbum-5.10.0-exiv2-0.28.patch  | 147 -
 media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild|  73 --
 3 files changed, 221 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index cfb1fb42f59c..eb90501ca754 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B 
e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63
 SHA512 
6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc
 DIST kphotoalbum-5.11.0.tar.xz 12005836 BLAKE2B 
1a2872bc791cec6701a4bfe8b6ddac264731f7afdcb35d864bcd07cc0b5e5a4015184a071d9db9735d21b080c898d5ea598d0879bb979032abe464434f6fb821
 SHA512 
dd521b5e158a691da69e333fcefd3cf48135053c7510dbd7f22d94299059fe58037c56e70b92edfcd1d8d7a55b04f80278ff3bdde08dba16507dc43ca77af96e

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
deleted file mode 100644
index 2eea9495b735..
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/DB/FileInfo.cpp b/DB/FileInfo.cpp
-index 
dc4c9819b62706c9c7bbfa21f3da7ef7d3f8b6d3..8b4e275c1765e718ed917cb41e7b221ed8d484ef
 100644
 a/DB/FileInfo.cpp
-+++ b/DB/FileInfo.cpp
-@@ -1,5 +1,6 @@
- // SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen 
- // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl 
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold 
- //
- // SPDX-License-Identifier: GPL-2.0-or-later
- 
-@@ -13,6 +14,8 @@
- #include 
- #include 
- 
-+#include 
-+
- using namespace DB;
- 
- FileInfo FileInfo::read(const DB::FileName , DB::ExifMode mode)
-@@ -79,8 +82,14 @@ void DB::FileInfo::parseEXIV2(const DB::FileName )
- const Exiv2::Exifdatum  = m_exifMap["Exif.Image.Orientation"];
- 
- int orientation = 0;
--if (datum.count() > 0)
-+if (datum.count() > 0) {
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+orientation = datum.toInt64();
-+#else
- orientation = datum.toLong();
-+#endif
-+}
-+
- m_angle = orientationToAngle(orientation);
- }
- 
-diff --git a/lib/kpaexif/Database.cpp b/lib/kpaexif/Database.cpp
-index 
4d0e228c72f5747f9d5b2a4e15871e2a11de4ed9..985713ceb53e60c3c17de80632f902a07ba94b14
 100644
 a/lib/kpaexif/Database.cpp
-+++ b/lib/kpaexif/Database.cpp
-@@ -1,6 +1,6 @@
- // SPDX-FileCopyrightText: 2003-2020 The KPhotoAlbum Development Team
--// SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl 
--// SPDX-FileCopyrightText: 2022 Johannes Zarl-Zierl 
-+// SPDX-FileCopyrightText: 2021-2022 Johannes Zarl-Zierl 

-+// SPDX-FileCopyrightText: 2023 Tobias Leupold 
- //
- // SPDX-License-Identifier: GPL-2.0-or-later
- 
-@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName )
- return false;
- 
- try {
--Exiv2::Image::AutoPtr image = 
Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-+const auto image = 
Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
- Q_ASSERT(image.get() != nullptr);
- image->readMetadata();
- Exiv2::ExifData  = image->exifData();
-@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList )
- 
- for (const DB::FileName  : list) {
- try {
--Exiv2::Image::AutoPtr image = 
Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-+const auto image = 
Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
- Q_ASSERT(image.get() != nullptr);
- image->readMetadata();
- map << DBExifInfo(fileName, image->exifData());
-diff --git a/lib/kpaexif/DatabaseElement.cpp b/lib/kpaexif/DatabaseElement.cpp
-index 
4e7ba198e425e81c582c585bb184ec19c31d4985..3d5d56cfbe5028a8e148753979bdae3f0922008d
 100644
 a/lib/kpaexif/DatabaseElement.cpp
-+++ b/lib/kpaexif/DatabaseElement.cpp
-@@ -1,13 +1,15 @@
--/* SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen 
-+// SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen 
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold 
-+//
-+// SPDX-License-Identifier: GPL-2.0-or-later
- 
--   SPDX-License-Identifier: GPL-2.0-or-later
--*/
- #include "DatabaseElement.h"
- 
- #include 
- 
- #include 
- #include 
-+#include 
- 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-08-03 Thread Sam James
commit: ee6edf482efa9a9157b0913c9e53255d0148f768
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug  3 15:07:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug  3 15:07:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6edf48

media-gfx/kphotoalbum: Stabilize 5.11.0 amd64, #911209

Signed-off-by: Sam James  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
index 034a17725fb9..2e3824144d0f 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-07-31 Thread Sam James
commit: d6c5b90b9f51a2ca448d12fd84864783be305c62
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 31 22:38:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 31 22:38:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c5b90b

media-gfx/kphotoalbum: Stabilize 5.11.0 x86, #911209

Signed-off-by: Sam James  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
index 1d08c747ddc8..034a17725fb9 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-07-12 Thread Andreas Sturmlechner
commit: b3d0bd2830cb0fdcc5250651fee151a9d690aa35
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 12 17:59:38 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 12 20:29:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d0bd28

media-gfx/kphotoalbum: add 5.11.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest  |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index a65bbe0a9c12..cfb1fb42f59c 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B 
e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63
 SHA512 
6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc
+DIST kphotoalbum-5.11.0.tar.xz 12005836 BLAKE2B 
1a2872bc791cec6701a4bfe8b6ddac264731f7afdcb35d864bcd07cc0b5e5a4015184a071d9db9735d21b080c898d5ea598d0879bb979032abe464434f6fb821
 SHA512 
dd521b5e158a691da69e333fcefd3cf48135053c7510dbd7f22d94299059fe58037c56e70b92edfcd1d8d7a55b04f80278ff3bdde08dba16507dc43ca77af96e

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
new file mode 100644
index ..1d08c747ddc8
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
+SLOT="5"
+IUSE="map phonon +raw share +vlc"
+
+REQUIRED_USE="|| ( phonon vlc )"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5[jpeg]
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   media-libs/libjpeg-turbo:=
+   map? ( kde-apps/marble:5 )
+   phonon? ( >=media-libs/phonon-4.11.0 )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+   vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+"
+
+DOCS=( CHANGELOG.{md,old} README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited
+   $(cmake_use_find_package map Marble)
+   $(cmake_use_find_package phonon Phonon4Qt5)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package share KF5Purpose)
+   $(cmake_use_find_package vlc LIBVLC)
+   )
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/

2023-06-08 Thread Andreas Sturmlechner
commit: 5fcdd88ce2c60819bbd2fe42e11eeab640376d0a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  8 19:48:08 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  8 19:48:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fcdd88c

media-gfx/kphotoalbum: Fix build with >=exiv2-0.28

Thanks-to: Tobias Leupold  stonemx.de>
Closes: https://bugs.gentoo.org/906469
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kphotoalbum-5.10.0-exiv2-0.28.patch  | 147 +
 media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild|   2 +
 2 files changed, 149 insertions(+)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
new file mode 100644
index ..2eea9495b735
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
@@ -0,0 +1,147 @@
+diff --git a/DB/FileInfo.cpp b/DB/FileInfo.cpp
+index 
dc4c9819b62706c9c7bbfa21f3da7ef7d3f8b6d3..8b4e275c1765e718ed917cb41e7b221ed8d484ef
 100644
+--- a/DB/FileInfo.cpp
 b/DB/FileInfo.cpp
+@@ -1,5 +1,6 @@
+ // SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen 
+ // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl 
++// SPDX-FileCopyrightText: 2023 Tobias Leupold 
+ //
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+@@ -13,6 +14,8 @@
+ #include 
+ #include 
+ 
++#include 
++
+ using namespace DB;
+ 
+ FileInfo FileInfo::read(const DB::FileName , DB::ExifMode mode)
+@@ -79,8 +82,14 @@ void DB::FileInfo::parseEXIV2(const DB::FileName )
+ const Exiv2::Exifdatum  = m_exifMap["Exif.Image.Orientation"];
+ 
+ int orientation = 0;
+-if (datum.count() > 0)
++if (datum.count() > 0) {
++#if EXIV2_TEST_VERSION(0, 28, 0)
++orientation = datum.toInt64();
++#else
+ orientation = datum.toLong();
++#endif
++}
++
+ m_angle = orientationToAngle(orientation);
+ }
+ 
+diff --git a/lib/kpaexif/Database.cpp b/lib/kpaexif/Database.cpp
+index 
4d0e228c72f5747f9d5b2a4e15871e2a11de4ed9..985713ceb53e60c3c17de80632f902a07ba94b14
 100644
+--- a/lib/kpaexif/Database.cpp
 b/lib/kpaexif/Database.cpp
+@@ -1,6 +1,6 @@
+ // SPDX-FileCopyrightText: 2003-2020 The KPhotoAlbum Development Team
+-// SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl 
+-// SPDX-FileCopyrightText: 2022 Johannes Zarl-Zierl 
++// SPDX-FileCopyrightText: 2021-2022 Johannes Zarl-Zierl 

++// SPDX-FileCopyrightText: 2023 Tobias Leupold 
+ //
+ // SPDX-License-Identifier: GPL-2.0-or-later
+ 
+@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName )
+ return false;
+ 
+ try {
+-Exiv2::Image::AutoPtr image = 
Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
++const auto image = 
Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
+ Q_ASSERT(image.get() != nullptr);
+ image->readMetadata();
+ Exiv2::ExifData  = image->exifData();
+@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList )
+ 
+ for (const DB::FileName  : list) {
+ try {
+-Exiv2::Image::AutoPtr image = 
Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
++const auto image = 
Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
+ Q_ASSERT(image.get() != nullptr);
+ image->readMetadata();
+ map << DBExifInfo(fileName, image->exifData());
+diff --git a/lib/kpaexif/DatabaseElement.cpp b/lib/kpaexif/DatabaseElement.cpp
+index 
4e7ba198e425e81c582c585bb184ec19c31d4985..3d5d56cfbe5028a8e148753979bdae3f0922008d
 100644
+--- a/lib/kpaexif/DatabaseElement.cpp
 b/lib/kpaexif/DatabaseElement.cpp
+@@ -1,13 +1,15 @@
+-/* SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen 
++// SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen 
++// SPDX-FileCopyrightText: 2023 Tobias Leupold 
++//
++// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+-   SPDX-License-Identifier: GPL-2.0-or-later
+-*/
+ #include "DatabaseElement.h"
+ 
+ #include 
+ 
+ #include 
+ #include 
++#include 
+ 
+ static QString replaceDotWithUnderscore(const char *cstr)
+ {
+@@ -76,10 +78,15 @@ QString Exif::IntExifElement::queryString() const
+ 
+ QVariant Exif::IntExifElement::valueFromExif(Exiv2::ExifData ) const
+ {
+-if (data[m_tag].count() > 0)
+-return QVariant { (int)data[m_tag].toLong() };
+-else
+-return QVariant { (int)0 };
++if (data[m_tag].count() > 0) {
++#if EXIV2_TEST_VERSION(0, 28, 0)
++return QVariant((int) data[m_tag].toInt64());
++#else
++return QVariant((int) data[m_tag].toLong());
++#endif
++} else {
++return QVariant(0);
++}
+ }
+ 
+ Exif::RationalExifElement::RationalExifElement(const char *tag)
+diff --git a/lib/kpaexif/Info.cpp b/lib/kpaexif/Info.cpp
+index 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-05-31 Thread Andreas Sturmlechner
commit: e210fca6da8b6b90d55b60ff5607fcedd0ad7486
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 31 20:05:42 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 31 20:06:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e210fca6

media-gfx/kphotoalbum: drop 5.9.1-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest|  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild | 72 ---
 media-gfx/kphotoalbum/metadata.xml|  1 -
 3 files changed, 74 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 919e8102a3e9..a65bbe0a9c12 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
 DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B 
e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63
 SHA512 
6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc
-DIST kphotoalbum-5.9.1.tar.xz 11786912 BLAKE2B 
f772aebc84689cafa869ec368f0079884ea71d4e2dac61baedc50c3764489993992dde6a260daf328d4489645f87de403b47255a5e710a8c125dc621c5f8a623
 SHA512 
e273671bcb0501d62f911a127f63dbdbc94be2f9ef9073d769ecc97d737edf189a4c61c1216184a68528d0562e2287b23c8d6738bcafa3faf4cb724d57666476

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
deleted file mode 100644
index a722a776175c..
--- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="map phonon qtav +raw share +vlc"
-
-REQUIRED_USE="|| ( phonon qtav vlc )"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5[jpeg]
-   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   media-gfx/exiv2:=
-   media-libs/libjpeg-turbo:=
-   map? ( kde-apps/marble:5 )
-   phonon? ( >=media-libs/phonon-4.11.0 )
-   qtav? ( media-libs/qtav:= )
-   raw? ( kde-apps/libkdcraw:5 )
-   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-   vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}
-   media-video/ffmpeg
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package map Marble)
-   $(cmake_use_find_package phonon Phonon4Qt5)
-   $(cmake_use_find_package qtav QtAV)
-   $(cmake_use_find_package raw KF5KDcraw)
-   $(cmake_use_find_package share KF5Purpose)
-   $(cmake_use_find_package vlc LIBVLC)
-   )
-
-   ecm_src_configure
-}

diff --git a/media-gfx/kphotoalbum/metadata.xml 
b/media-gfx/kphotoalbum/metadata.xml
index e4b11a20d66a..0fd7db4de42d 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -11,7 +11,6 @@

Enable map display support using 
kde-apps/marble
Enable media-libs/phonon video 
backend (known to crash on some video formats)
-   Enable media-libs/qtav video 
backend (audio and video may get out of sync)
Enable support for a share menu using 
kde-frameworks/purpose
Enable media-video/vlc video 
backend (recommended for X11)




[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-05-31 Thread Arthur Zamarin
commit: 46b78e02f1f83f5c0ad38b5801e6c9f84a47e456
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed May 31 19:54:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed May 31 19:54:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b78e02

media-gfx/kphotoalbum: Stabilize 5.10.0 amd64, #904870

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
index a184d07be407..84e92e1afc9c 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-05-31 Thread Arthur Zamarin
commit: f954236cecfd87b221e98797a00bfb7b71d0d8d7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed May 31 19:45:10 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed May 31 19:45:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f954236c

media-gfx/kphotoalbum: Stabilize 5.10.0 x86, #904870

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
index 944340901949..a184d07be407 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-03-29 Thread Andreas Sturmlechner
commit: 5fc49e66a7d4c121b1e956e994c798fe01788b97
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 29 09:25:17 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 29 10:23:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc49e66

media-gfx/kphotoalbum: add 5.10.0

See also:
https://www.kphotoalbum.org/2023/03/28/kphotoalbum-5.10.0-released/

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest  |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild | 71 +
 2 files changed, 72 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index ca16381908bb..919e8102a3e9 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
+DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B 
e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63
 SHA512 
6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc
 DIST kphotoalbum-5.9.1.tar.xz 11786912 BLAKE2B 
f772aebc84689cafa869ec368f0079884ea71d4e2dac61baedc50c3764489993992dde6a260daf328d4489645f87de403b47255a5e710a8c125dc621c5f8a623
 SHA512 
e273671bcb0501d62f911a127f63dbdbc94be2f9ef9073d769ecc97d737edf189a4c61c1216184a68528d0562e2287b23c8d6738bcafa3faf4cb724d57666476

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
new file mode 100644
index ..944340901949
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
+SLOT="5"
+IUSE="map phonon +raw share +vlc"
+
+REQUIRED_USE="|| ( phonon vlc )"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5[jpeg]
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   media-libs/libjpeg-turbo:=
+   map? ( kde-apps/marble:5 )
+   phonon? ( >=media-libs/phonon-4.11.0 )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+   vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+"
+
+DOCS=( CHANGELOG.{md,old} README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited
+   $(cmake_use_find_package map Marble)
+   $(cmake_use_find_package phonon Phonon4Qt5)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package share KF5Purpose)
+   $(cmake_use_find_package vlc LIBVLC)
+   )
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2023-01-09 Thread Andreas Sturmlechner
commit: ab1fab50c70eb5aee7e8411b8082c6cc3ba6b514
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Nov 12 16:29:10 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan  9 19:47:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab1fab50

media-gfx/kphotoalbum: update HOMEPAGE

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
index 4f3157a6a7d6..a722a776175c 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://kphotoalbum.org/;
+HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2022-10-12 Thread Andreas Sturmlechner
commit: c971ea6605204d67d32d15a2cf1e0ccdb7187be1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct 12 19:40:33 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 12 19:41:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c971ea66

media-gfx/kphotoalbum: drop 5.8.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild | 65 --
 2 files changed, 66 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 47a26be0ef6b..ca16381908bb 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 
0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27
 SHA512 
3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c
 DIST kphotoalbum-5.9.1.tar.xz 11786912 BLAKE2B 
f772aebc84689cafa869ec368f0079884ea71d4e2dac61baedc50c3764489993992dde6a260daf328d4489645f87de403b47255a5e710a8c125dc621c5f8a623
 SHA512 
e273671bcb0501d62f911a127f63dbdbc94be2f9ef9073d769ecc97d737edf189a4c61c1216184a68528d0562e2287b23c8d6738bcafa3faf4cb724d57666476

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
deleted file mode 100644
index 495d19aff9cb..
--- a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://kphotoalbum.org/;
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="map +raw share"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   media-gfx/exiv2:=
-   >=media-libs/phonon-4.11.0
-   virtual/jpeg:0
-   map? ( kde-apps/marble:5 )
-   raw? ( kde-apps/libkdcraw:5 )
-   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-   media-video/ffmpeg
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package map Marble)
-   $(cmake_use_find_package raw KF5KDcraw)
-   $(cmake_use_find_package share KF5Purpose)
-   )
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2022-10-12 Thread Sam James
commit: 5b53174441fd0bd7a38803d7e280138cd998523d
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 12 19:21:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 12 19:21:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b531744

media-gfx/kphotoalbum: Stabilize 5.9.1-r1 amd64, #875608

Signed-off-by: Sam James  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
index 5113885d9a7e..4f3157a6a7d6 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2022-10-11 Thread Agostino Sarubbo
commit: 5280aaf366f5ce59bd910f3e3bb29c30dac6bb2f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 11 09:20:23 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 11 09:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5280aaf3

media-gfx/kphotoalbum: Stabilize 5.9.1-r1 x86, #875608

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
index 4733340cf07b..5113885d9a7e 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2022-09-16 Thread Andreas Sturmlechner
commit: f05d71585f0d63c9c67a6079d50f9dac74711042
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Sep 16 18:35:35 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep 16 18:45:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f05d7158

media-gfx/kphotoalbum: Add missing USEdep on dev-qt/qtgui[jpeg]

Closes: https://bugs.gentoo.org/870181
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{kphotoalbum-5.9.1.ebuild => kphotoalbum-5.9.1-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
similarity index 98%
rename from media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
rename to media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
index 0fb036a61360..4733340cf07b 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1-r1.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="|| ( phonon qtav vlc )"
 
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5[jpeg]
>=dev-qt/qtsql-${QTMIN}:5[sqlite]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2022-09-14 Thread Andreas Sturmlechner
commit: 1b02af55ef4f2b2f7c95bed154e3bb62b81b056e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 14 15:07:55 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 15:07:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b02af55

media-gfx/kphotoalbum: Set VIRTUALX_REQUIRED=test

Closes: https://bugs.gentoo.org/869797
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
index 2139581e1015..0fb036a61360 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
@@ -7,6 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.82.0
 QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2022-09-11 Thread Andreas Sturmlechner
commit: 265bfb015e056c8c2d09a61f735e67ac1bcee0f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 11 21:48:19 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 11 21:52:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265bfb01

media-gfx/kphotoalbum: add 5.9.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild | 71 ++
 media-gfx/kphotoalbum/metadata.xml |  3 ++
 3 files changed, 75 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 966bbd4edb03..47a26be0ef6b 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 
0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27
 SHA512 
3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c
+DIST kphotoalbum-5.9.1.tar.xz 11786912 BLAKE2B 
f772aebc84689cafa869ec368f0079884ea71d4e2dac61baedc50c3764489993992dde6a260daf328d4489645f87de403b47255a5e710a8c125dc621c5f8a623
 SHA512 
e273671bcb0501d62f911a127f63dbdbc94be2f9ef9073d769ecc97d737edf189a4c61c1216184a68528d0562e2287b23c8d6738bcafa3faf4cb724d57666476

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
new file mode 100644
index ..2139581e1015
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
+IUSE="map phonon qtav +raw share +vlc"
+
+REQUIRED_USE="|| ( phonon qtav vlc )"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   media-libs/libjpeg-turbo:=
+   map? ( kde-apps/marble:5 )
+   phonon? ( >=media-libs/phonon-4.11.0 )
+   qtav? ( media-libs/qtav:= )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+   vlc? ( media-video/vlc:= )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+"
+
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package map Marble)
+   $(cmake_use_find_package phonon Phonon4Qt5)
+   $(cmake_use_find_package qtav QtAV)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package share KF5Purpose)
+   $(cmake_use_find_package vlc LIBVLC)
+   )
+
+   ecm_src_configure
+}

diff --git a/media-gfx/kphotoalbum/metadata.xml 
b/media-gfx/kphotoalbum/metadata.xml
index f87d58df9dbe..e4b11a20d66a 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -10,6 +10,9 @@


Enable map display support using 
kde-apps/marble
+   Enable media-libs/phonon video 
backend (known to crash on some video formats)
+   Enable media-libs/qtav video 
backend (audio and video may get out of sync)
Enable support for a share menu using 
kde-frameworks/purpose
+   Enable media-video/vlc video 
backend (recommended for X11)

 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2021-09-30 Thread Andreas Sturmlechner
commit: 539a521a5eddec162338839548496cc86d017edc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 30 17:18:27 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 30 17:22:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=539a521a

media-gfx/kphotoalbum: Set VIRTUALX_REQUIRED=test

Closes: https://bugs.gentoo.org/814416
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
index 877ed523e72..495d19aff9c 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
@@ -7,6 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.74.0
 QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2021-09-22 Thread Andreas Sturmlechner
commit: fb857bb84c96f02a5bc9495c0b2ca952c9ce5dff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 22 23:29:07 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 22 23:29:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb857bb8

media-gfx/kphotoalbum: Drop 5.7.0

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild | 63 --
 2 files changed, 64 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 48ab1ce3a32..966bbd4edb0 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.7.0.tar.xz 11784500 BLAKE2B 
61b295178bac0724b1212c40ddb4178147183b7d982213077c82681e7480fc8344d5467851b839d06521f89bd8858a6c4727824e95ea712bb28c6e1bb2ce428d
 SHA512 
36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851
 DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 
0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27
 SHA512 
3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
deleted file mode 100644
index cac8efff8a7..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="map +raw share"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5(+)]
-   virtual/jpeg:0
-   map? ( kde-apps/marble:5 )
-   raw? ( kde-apps/libkdcraw:5 )
-   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-   media-video/ffmpeg
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package map Marble)
-   $(cmake_use_find_package raw KF5KDcraw)
-   $(cmake_use_find_package share KF5Purpose)
-   )
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2021-09-22 Thread Sam James
commit: 43cdfa6e446a092cc6444644a8f95e29b8de3eb8
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 22 23:27:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 22 23:27:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43cdfa6e

media-gfx/kphotoalbum: Stabilize 5.8.1 amd64, #805059

Signed-off-by: Sam James  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
index 6efb942b548..01b7c0f5653 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2021-09-22 Thread Sam James
commit: 30d33054718dcf95ad41d59e0d4152a50c8601b5
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 22 23:27:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 22 23:27:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d33054

media-gfx/kphotoalbum: Stabilize 5.8.1 x86, #805059

Signed-off-by: Sam James  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
index 01b7c0f5653..877ed523e72 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2021-06-28 Thread Andreas Sturmlechner
commit: e23d13fa6db8066e4c4cb77bb5078e6ecc4a8e6b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 28 11:05:13 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 28 12:32:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23d13fa

media-gfx/kphotoalbum: 5.8.1 version bump

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild | 64 ++
 2 files changed, 65 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 01bd2f8acb8..48ab1ce3a32 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.7.0.tar.xz 11784500 BLAKE2B 
61b295178bac0724b1212c40ddb4178147183b7d982213077c82681e7480fc8344d5467851b839d06521f89bd8858a6c4727824e95ea712bb28c6e1bb2ce428d
 SHA512 
36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851
+DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 
0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27
 SHA512 
3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
new file mode 100644
index 000..6efb942b548
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
+IUSE="map +raw share"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   >=media-libs/phonon-4.11.0
+   virtual/jpeg:0
+   map? ( kde-apps/marble:5 )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+"
+
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package map Marble)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package share KF5Purpose)
+   )
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-09-04 Thread Andreas Sturmlechner
commit: b6f48a8e3a5ecd0b4d92510d0fd96317d0c87368
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Sep  4 18:45:26 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep  4 19:02:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f48a8e

media-gfx/kphotoalbum: Drop 5.6.1

Bug: https://bugs.gentoo.org/737928
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild | 67 --
 media-gfx/kphotoalbum/metadata.xml |  1 -
 3 files changed, 69 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index a89246c6be9..01bd2f8acb8 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B 
c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77
 SHA512 
fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
 DIST kphotoalbum-5.7.0.tar.xz 11784500 BLAKE2B 
61b295178bac0724b1212c40ddb4178147183b7d982213077c82681e7480fc8344d5467851b839d06521f89bd8858a6c4727824e95ea712bb28c6e1bb2ce428d
 SHA512 
36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
deleted file mode 100644
index 61893466aef..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="+kipi map +raw share"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5(+)]
-   virtual/jpeg:0
-   kipi? ( kde-apps/libkipi:5= )
-   map? ( kde-apps/libkgeomap:5 )
-   raw? ( kde-apps/libkdcraw:5 )
-   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-   media-video/ffmpeg
-   kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package kipi KF5Kipi)
-   $(cmake_use_find_package map KF5KGeoMap)
-   $(cmake_use_find_package raw KF5KDcraw)
-   $(cmake_use_find_package share KF5Purpose)
-   )
-
-   ecm_src_configure
-}

diff --git a/media-gfx/kphotoalbum/metadata.xml 
b/media-gfx/kphotoalbum/metadata.xml
index f0dad21bde3..5b8b5f496a4 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -6,7 +6,6 @@
Gentoo KDE Project


-   Support for the KDE Image Plugin 
Interface
Enable map display support using 
kde-apps/marble
Enable support for a share menu using 
kde-frameworks/purpose




[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-09-04 Thread Sam James
commit: 14761598ca2047a8bf2cb5d5dcc59f1a335bcac3
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  4 18:41:20 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  4 18:41:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14761598

media-gfx/kphotoalbum: Stabilize 5.7.0 amd64, #737928

Signed-off-by: Sam James  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
index a96644318e3..cac8efff8a7 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-09-03 Thread Thomas Deutschmann
commit: a524fcb07cb8b97a7ecb5e5ffdb747980da537d5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Sep  3 14:37:52 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Sep  3 14:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a524fcb0

media-gfx/kphotoalbum: x86 stable (bug #737928)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
index dfafce49dc6..a96644318e3 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-08-09 Thread Andreas Sturmlechner
commit: 41d18442cc1ed6a31677df51b0b91c02ada4abce
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug  8 20:33:28 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug  9 08:31:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d18442

media-gfx/kphotoalbum: 5.7.0 version bump

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild | 63 ++
 media-gfx/kphotoalbum/metadata.xml |  2 +-
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 56e578e46df..a89246c6be9 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B 
c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77
 SHA512 
fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
+DIST kphotoalbum-5.7.0.tar.xz 11784500 BLAKE2B 
61b295178bac0724b1212c40ddb4178147183b7d982213077c82681e7480fc8344d5467851b839d06521f89bd8858a6c4727824e95ea712bb28c6e1bb2ce428d
 SHA512 
36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
new file mode 100644
index 000..dfafce49dc6
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
+IUSE="map +raw share"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5(+)]
+   virtual/jpeg:0
+   map? ( kde-apps/marble:5 )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+"
+
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package map Marble)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package share KF5Purpose)
+   )
+
+   ecm_src_configure
+}

diff --git a/media-gfx/kphotoalbum/metadata.xml 
b/media-gfx/kphotoalbum/metadata.xml
index ecd49551d43..f0dad21bde3 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -7,7 +7,7 @@


Support for the KDE Image Plugin 
Interface
-   Enable map display support using 
kde-apps/libkgeomap
+   Enable map display support using 
kde-apps/marble
Enable support for a share menu using 
kde-frameworks/purpose

 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-03-07 Thread Andreas Sturmlechner
commit: 2ad3b981a74572e81513445444750d75f2f4fe17
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar  7 11:05:07 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar  7 11:05:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad3b981

media-gfx/kphotoalbum: Drop 5.5

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest   |  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild | 62 
 2 files changed, 63 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 458385027f1..56e578e46df 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B 
a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723
 SHA512 
fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
 DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B 
c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77
 SHA512 
fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
deleted file mode 100644
index 752ae5dc435..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-IUSE="+kipi map +raw"
-
-DEPEND="
-   $(add_frameworks_dep karchive)
-   $(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 kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql 'sqlite')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5(+)]
-   virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
-   map? ( $(add_kdeapps_dep libkgeomap) )
-   raw? ( $(add_kdeapps_dep libkdcraw) )
-"
-RDEPEND="${DEPEND}
-   media-video/ffmpeg
-   kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package kipi KF5Kipi)
-   $(cmake_use_find_package map KF5KGeoMap)
-   $(cmake_use_find_package raw KF5KDcraw)
-   )
-
-   kde5_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-03-07 Thread Agostino Sarubbo
commit: 9f40e3499ffd32769b5d83bd85c374cba7e6935f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Mar  7 11:02:07 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Mar  7 11:02:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f40e349

media-gfx/kphotoalbum: x86 stable wrt bug #710902

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
index b4c7b5957ca..61893466aef 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-03-07 Thread Agostino Sarubbo
commit: f178a658c399e6545662c42185f89919438fbca9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Mar  7 09:41:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Mar  7 09:41:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f178a658

media-gfx/kphotoalbum: amd64 stable wrt bug #710902

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
index 2e4ae7efba7..b4c7b5957ca 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/

2020-02-12 Thread Andreas Sturmlechner
commit: 67e6c3ff3a8869355ab4ecb4e012031f193dd13e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 12 18:30:51 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb 12 21:30:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e6c3ff

media-gfx/kphotoalbum: Drop 5.6-r1

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 -
 .../files/kphotoalbum-5.6-crashfix.patch   | 41 -
 media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild| 69 --
 3 files changed, 111 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 6a2b5e30b97..458385027f1 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,2 @@
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B 
a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723
 SHA512 
fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
 DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B 
c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77
 SHA512 
fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
-DIST kphotoalbum-5.6.tar.xz 11773088 BLAKE2B 
933e29a71bbdb678936c1d466894468a62ee0a8903ebbe21d0d9ace619b8b2ceaeaec12bc955bf1513cb53eedc85faa6291549a5f87784323c9c5b556f76d3b3
 SHA512 
7e950494a9fe591062e488d08f9e675dd0aacacbea640619461cd3bb0ac2fe945f189fe1e30c69614e9ed3751ac3ddfe84d943a0aa2d2f35fc5cd733002938f5

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
deleted file mode 100644
index 96b752bf075..000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 583e10e8356d2ed64f0358ebf107bff35a98db31 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl 
-Date: Sun, 9 Feb 2020 22:51:15 +0100
-Subject: Fix crash when associating a tag with an area.
-
-If a tag is being associated with an area, the context menu has two
-levels: the direct "associate with " and the sub-menu
-"associate with..." followed by a list of tags.
-
-Each version uses a different function signature for
-ResizableFrame::associateTags. When refactoring connections to the "new"
-signal-slot syntax in commit c38f5136 (thus released in version 5.6), I
-applied the wrong signature to the connect statement.
-
-This resulted in a crash/failed assertion when selecting a tag in the
-described way.

- AnnotationDialog/ResizableFrame.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/AnnotationDialog/ResizableFrame.cpp 
b/AnnotationDialog/ResizableFrame.cpp
-index f2dba86..44175fb 100644
 a/AnnotationDialog/ResizableFrame.cpp
-+++ b/AnnotationDialog/ResizableFrame.cpp
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2014-2019 The KPhotoAlbum Development Team
-+/* Copyright (C) 2014-2020 The KPhotoAlbum Development Team
- 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public
-@@ -522,7 +522,7 @@ void AnnotationDialog::ResizableFrame::addTagActions(QMenu 
*menu)
- submenu->addAction(createAssociateTagAction(tag));
- }
- 
--connect(submenu, ::triggered, this, 
QOverload<>::of(::associateTag));
-+connect(submenu, ::triggered, this, QOverload::of(::associateTag));
- }
- }
- }
--- 
-cgit v1.1

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
deleted file mode 100644
index 5c27d00b9ab..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="+kipi map +raw share"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-02-12 Thread Andreas Sturmlechner
commit: 2381135b9c5314c8a9b333b92c5ff8c9a103d39b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 12 18:28:45 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb 12 21:30:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2381135b

media-gfx/kphotoalbum: 5.6.1 version bump

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild | 67 ++
 2 files changed, 68 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 312b9202d79..6a2b5e30b97 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1,3 @@
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B 
a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723
 SHA512 
fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
+DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B 
c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77
 SHA512 
fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
 DIST kphotoalbum-5.6.tar.xz 11773088 BLAKE2B 
933e29a71bbdb678936c1d466894468a62ee0a8903ebbe21d0d9ace619b8b2ceaeaec12bc955bf1513cb53eedc85faa6291549a5f87784323c9c5b556f76d3b3
 SHA512 
7e950494a9fe591062e488d08f9e675dd0aacacbea640619461cd3bb0ac2fe945f189fe1e30c69614e9ed3751ac3ddfe84d943a0aa2d2f35fc5cd733002938f5

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
new file mode 100644
index 000..2e4ae7efba7
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
+IUSE="+kipi map +raw share"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5(+)]
+   virtual/jpeg:0
+   kipi? ( kde-apps/libkipi:5= )
+   map? ( kde-apps/libkgeomap:5 )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+   kipi? ( kde-apps/kipi-plugins:5 )
+"
+
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package kipi KF5Kipi)
+   $(cmake_use_find_package map KF5KGeoMap)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package share KF5Purpose)
+   )
+
+   ecm_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-02-09 Thread Andreas Sturmlechner
commit: a8e4fb82227346910789e09217d2631b44516fd8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  9 22:09:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  9 22:27:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e4fb82

media-gfx/kphotoalbum: Drop 5.6 (r0)

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild | 67 
 1 file changed, 67 deletions(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild
deleted file mode 100644
index 2e4ae7efba7..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="5"
-IUSE="+kipi map +raw share"
-
-DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/ktextwidgets-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5(+)]
-   virtual/jpeg:0
-   kipi? ( kde-apps/libkipi:5= )
-   map? ( kde-apps/libkgeomap:5 )
-   raw? ( kde-apps/libkdcraw:5 )
-   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-   media-video/ffmpeg
-   kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package kipi KF5Kipi)
-   $(cmake_use_find_package map KF5KGeoMap)
-   $(cmake_use_find_package raw KF5KDcraw)
-   $(cmake_use_find_package share KF5Purpose)
-   )
-
-   ecm_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2020-02-09 Thread Andreas Sturmlechner
commit: 31d115347979a361eb9e0aa666c5333a9b9591b2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  9 22:08:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  9 22:27:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d11534

media-gfx/kphotoalbum: Fix crash when associating a tag with an area

Upstream commit 583e10e8356d2ed64f0358ebf107bff35a98db31

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kphotoalbum-5.6-crashfix.patch   | 41 +
 media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild| 69 ++
 2 files changed, 110 insertions(+)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
new file mode 100644
index 000..96b752bf075
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
@@ -0,0 +1,41 @@
+From 583e10e8356d2ed64f0358ebf107bff35a98db31 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl 
+Date: Sun, 9 Feb 2020 22:51:15 +0100
+Subject: Fix crash when associating a tag with an area.
+
+If a tag is being associated with an area, the context menu has two
+levels: the direct "associate with " and the sub-menu
+"associate with..." followed by a list of tags.
+
+Each version uses a different function signature for
+ResizableFrame::associateTags. When refactoring connections to the "new"
+signal-slot syntax in commit c38f5136 (thus released in version 5.6), I
+applied the wrong signature to the connect statement.
+
+This resulted in a crash/failed assertion when selecting a tag in the
+described way.
+---
+ AnnotationDialog/ResizableFrame.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/AnnotationDialog/ResizableFrame.cpp 
b/AnnotationDialog/ResizableFrame.cpp
+index f2dba86..44175fb 100644
+--- a/AnnotationDialog/ResizableFrame.cpp
 b/AnnotationDialog/ResizableFrame.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2014-2019 The KPhotoAlbum Development Team
++/* Copyright (C) 2014-2020 The KPhotoAlbum Development Team
+ 
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+@@ -522,7 +522,7 @@ void AnnotationDialog::ResizableFrame::addTagActions(QMenu 
*menu)
+ submenu->addAction(createAssociateTagAction(tag));
+ }
+ 
+-connect(submenu, ::triggered, this, 
QOverload<>::of(::associateTag));
++connect(submenu, ::triggered, this, QOverload::of(::associateTag));
+ }
+ }
+ }
+-- 
+cgit v1.1

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
new file mode 100644
index 000..5c27d00b9ab
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
+IUSE="+kipi map +raw share"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5(+)]
+   virtual/jpeg:0
+   kipi? ( kde-apps/libkipi:5= )
+   map? ( kde-apps/libkgeomap:5 )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+   kipi? ( kde-apps/kipi-plugins:5 )
+"
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package kipi KF5Kipi)
+   $(cmake_use_find_package map KF5KGeoMap)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2020-02-08 Thread Andreas Sturmlechner
commit: 53ae74eaff2c2c2661ed543042cd06b9d84b8311
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb  8 18:55:56 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  8 21:34:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ae74ea

media-gfx/kphotoalbum: 5.6 version bump

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest   |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild | 67 
 media-gfx/kphotoalbum/metadata.xml   |  1 +
 3 files changed, 69 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 273ba5a8864..312b9202d79 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B 
a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723
 SHA512 
fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
+DIST kphotoalbum-5.6.tar.xz 11773088 BLAKE2B 
933e29a71bbdb678936c1d466894468a62ee0a8903ebbe21d0d9ace619b8b2ceaeaec12bc955bf1513cb53eedc85faa6291549a5f87784323c9c5b556f76d3b3
 SHA512 
7e950494a9fe591062e488d08f9e675dd0aacacbea640619461cd3bb0ac2fe945f189fe1e30c69614e9ed3751ac3ddfe84d943a0aa2d2f35fc5cd733002938f5

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild
new file mode 100644
index 000..2e4ae7efba7
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
+IUSE="+kipi map +raw share"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtnetwork-${QTMIN}:5
+   >=dev-qt/qtsql-${QTMIN}:5[sqlite]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5(+)]
+   virtual/jpeg:0
+   kipi? ( kde-apps/libkipi:5= )
+   map? ( kde-apps/libkgeomap:5 )
+   raw? ( kde-apps/libkdcraw:5 )
+   share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+   kipi? ( kde-apps/kipi-plugins:5 )
+"
+
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package kipi KF5Kipi)
+   $(cmake_use_find_package map KF5KGeoMap)
+   $(cmake_use_find_package raw KF5KDcraw)
+   $(cmake_use_find_package share KF5Purpose)
+   )
+
+   ecm_src_configure
+}

diff --git a/media-gfx/kphotoalbum/metadata.xml 
b/media-gfx/kphotoalbum/metadata.xml
index 2a675ce364e..ecd49551d43 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -8,5 +8,6 @@

Support for the KDE Image Plugin 
Interface
Enable map display support using 
kde-apps/libkgeomap
+   Enable support for a share menu using 
kde-frameworks/purpose

 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/

2019-06-20 Thread Andreas Sturmlechner
commit: 49b039d469f5b3287163b508bfea1e63bdc6541e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 20 09:46:18 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 20 09:46:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b039d4

media-gfx/kphotoalbum: Drop 5.4.2

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 -
 .../files/kphotoalbum-5.4-exiv2-0.27.patch | 61 -
 media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild | 62 --
 3 files changed, 124 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 9d9358bb893..273ba5a8864 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 
45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f
 SHA512 
9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B 
a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723
 SHA512 
fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
deleted file mode 100644
index 7b7f612b94f..000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 41c7da0531c8a1eb7046345c2b991e7a5d1e6657 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl 
-Date: Sun, 30 Dec 2018 23:36:24 +0100
-Subject: Use Exiv2 0.27 if available.
-
-Beginning with version 0.27, Exiv2 ships with cmake package config
-files.

- CMakeLists.txt | 12 +++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3012f7a..5dcc29c 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,17 @@ if(JPEG_FOUND)
- include_directories(${JPEG_INCLUDE_DIR})
- endif()
- 
--find_package(Exiv2 REQUIRED)
-+### 2018-12-30 jzarl
-+# When Exiv2 0.26 can be deprecated, FindExiv2.cmake should be removed
-+# and only find_package(exiv2) should be used
-+find_package(exiv2 CONFIG QUIET)
-+if(exiv2_FOUND)
-+# search againg with REQUIRED, so that the feature summary correctly 
shows exiv as required dependency
-+find_package(exiv2 CONFIG REQUIRED)
-+set(EXIV2_LIBRARIES exiv2lib)
-+else()
-+find_package(Exiv2 REQUIRED)
-+endif()
- 
- find_package(KF5Kipi 5.1.0)
- set_package_properties(KF5Kipi
--- 
-cgit v1.1
-From cf4f7645b3c94246a1fcf664f1c865a93ae2b684 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl 
-Date: Sun, 30 Dec 2018 23:43:14 +0100
-Subject: Fix compilation with exiv2 0.27
-

- Exif/Info.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Exif/Info.cpp b/Exif/Info.cpp
-index be4c88f..9545360 100644
 a/Exif/Info.cpp
-+++ b/Exif/Info.cpp
-@@ -28,7 +28,8 @@
- #include 
- 
- #include 
--#include 
-+#include 
-+#include 
- 
- using namespace Exif;
- 
--- 
-cgit v1.1

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
deleted file mode 100644
index f2dda9ed28e..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="+kipi map +raw"
-
-DEPEND="
-   $(add_frameworks_dep karchive)
-   $(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 kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql 'sqlite')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5(+)]
-   virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
-   map? ( $(add_kdeapps_dep libkgeomap) )
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2019-06-20 Thread Mikle Kolyada
commit: 776f12247ca61068adf6689a4ea390f96b3ce7f0
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jun 20 09:24:34 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jun 20 09:24:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776f1224

media-gfx/kphotoalbum: amd64 stable wrt bug #688186

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
index 44f61afb603..c6580ef9807 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2019-06-18 Thread Thomas Deutschmann
commit: 4c224fb82128f937a87aa735b5089ac9b8c9293e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jun 18 18:10:55 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jun 18 18:24:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c224fb8

media-gfx/kphotoalbum: x86 stable (bug #688186)

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
index b062c1d1822..44f61afb603 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2019-04-28 Thread Andreas Sturmlechner
commit: 3443cd1f4c56c3c51edc05ea30daaf60f47cb8f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 27 10:52:46 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 28 15:26:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3443cd1f

media-gfx/kphotoalbum: 5.5 version bump

See also: https://www.kphotoalbum.org/news/?item=0098#item0098

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest   |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild | 62 
 2 files changed, 63 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 341e539083f..9d9358bb893 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 
45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f
 SHA512 
9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038
+DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B 
a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723
 SHA512 
fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
new file mode 100644
index 000..b062c1d1822
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+IUSE="+kipi map +raw"
+
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(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 kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql 'sqlite')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5(+)]
+   virtual/jpeg:0
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   map? ( $(add_kdeapps_dep libkgeomap) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+RDEPEND="${DEPEND}
+   media-video/ffmpeg
+   kipi? ( media-plugins/kipi-plugins:5 )
+"
+
+DOCS=( ChangeLog README.md )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package map KF5KGeoMap)
+   $(cmake-utils_use_find_package raw KF5KDcraw)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2019-02-11 Thread Andreas Sturmlechner
commit: 107206ac76beba5f7695a20cf3622c50ca3a8619
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 11 10:41:49 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb 11 12:42:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107206ac

media-gfx/kphotoalbum: Drop 5.4

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/kphotoalbum/Manifest   |  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild | 62 
 2 files changed, 63 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index b310f6a9087..341e539083f 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
 DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 
45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f
 SHA512 
9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038
-DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 
5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc
 SHA512 
d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
deleted file mode 100644
index 6aaff0db914..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="+kipi map +raw"
-
-DEPEND="
-   $(add_frameworks_dep karchive)
-   $(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 kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql 'sqlite')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5(+)]
-   virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
-   map? ( $(add_kdeapps_dep libkgeomap) )
-   raw? ( $(add_kdeapps_dep libkdcraw) )
-"
-RDEPEND="${DEPEND}
-   || ( media-video/ffmpeg media-video/mplayer )
-   kipi? ( media-plugins/kipi-plugins:5 )
-   !media-gfx/kphotoalbum:4
-"
-
-DOCS=( ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package kipi KF5Kipi)
-   $(cmake-utils_use_find_package map KF5KGeoMap)
-   $(cmake-utils_use_find_package raw KF5KDcraw)
-   )
-
-   kde5_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2019-02-11 Thread Andreas Sturmlechner
commit: 763bb7b3b96b023360d0a0a19ae34bd6361727c7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 11 10:41:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb 11 12:42:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763bb7b3

media-gfx/kphotoalbum: 5.4.2 emergency-stable

As requested per upstream.

Bug: https://bugs.gentoo.org/677296
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
index 4fe6263916b..f2dda9ed28e 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+kipi map +raw"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2019-02-07 Thread Andreas Sturmlechner
commit: 0f47213c8831d4f3e482a6380978824fe6c8f49e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb  7 14:46:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  7 14:47:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f47213c

media-gfx/kphotoalbum: EAPI-7 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
index 0266ae75caf..4fe6263916b 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2019-02-05 Thread Andreas Sturmlechner
commit: 8487b360db9fcf049fe9a5543469b8e6fee28e4d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  5 23:01:39 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb  5 23:26:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8487b360

media-gfx/kphotoalbum: 5.4.2 version bump

Closes: https://bugs.gentoo.org/677296
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild | 62 ++
 2 files changed, 63 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 94b929ebd44..b310f6a9087 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
+DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 
45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f
 SHA512 
9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038
 DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 
5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc
 SHA512 
d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
new file mode 100644
index 000..0266ae75caf
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+kipi map +raw"
+
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(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 kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql 'sqlite')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5(+)]
+   virtual/jpeg:0
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   map? ( $(add_kdeapps_dep libkgeomap) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+RDEPEND="${DEPEND}
+   || ( media-video/ffmpeg media-video/mplayer )
+   kipi? ( media-plugins/kipi-plugins:5 )
+   !media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+PATCHES=( "${FILESDIR}/${PN}-5.4-exiv2-0.27.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package map KF5KGeoMap)
+   $(cmake-utils_use_find_package raw KF5KDcraw)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2018-12-31 Thread Andreas Sturmlechner
commit: 4329dfc748a9f4a27af7fc8833592d7acbc0f85a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 31 17:30:04 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 31 21:13:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4329dfc7

media-gfx/kphotoalbum: Fix build with exiv2-0.27

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/kphotoalbum-5.4-exiv2-0.27.patch | 61 ++
 media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild   |  2 +
 2 files changed, 63 insertions(+)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
new file mode 100644
index 000..7b7f612b94f
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
@@ -0,0 +1,61 @@
+From 41c7da0531c8a1eb7046345c2b991e7a5d1e6657 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl 
+Date: Sun, 30 Dec 2018 23:36:24 +0100
+Subject: Use Exiv2 0.27 if available.
+
+Beginning with version 0.27, Exiv2 ships with cmake package config
+files.
+---
+ CMakeLists.txt | 12 +++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3012f7a..5dcc29c 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -44,7 +44,17 @@ if(JPEG_FOUND)
+ include_directories(${JPEG_INCLUDE_DIR})
+ endif()
+ 
+-find_package(Exiv2 REQUIRED)
++### 2018-12-30 jzarl
++# When Exiv2 0.26 can be deprecated, FindExiv2.cmake should be removed
++# and only find_package(exiv2) should be used
++find_package(exiv2 CONFIG QUIET)
++if(exiv2_FOUND)
++# search againg with REQUIRED, so that the feature summary correctly 
shows exiv as required dependency
++find_package(exiv2 CONFIG REQUIRED)
++set(EXIV2_LIBRARIES exiv2lib)
++else()
++find_package(Exiv2 REQUIRED)
++endif()
+ 
+ find_package(KF5Kipi 5.1.0)
+ set_package_properties(KF5Kipi
+-- 
+cgit v1.1
+From cf4f7645b3c94246a1fcf664f1c865a93ae2b684 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl 
+Date: Sun, 30 Dec 2018 23:43:14 +0100
+Subject: Fix compilation with exiv2 0.27
+
+---
+ Exif/Info.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Exif/Info.cpp b/Exif/Info.cpp
+index be4c88f..9545360 100644
+--- a/Exif/Info.cpp
 b/Exif/Info.cpp
+@@ -28,7 +28,8 @@
+ #include 
+ 
+ #include 
+-#include 
++#include 
++#include 
+ 
+ using namespace Exif;
+ 
+-- 
+cgit v1.1

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
index ce7c3284e2a..6aaff0db914 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -49,6 +49,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( ChangeLog README )
 
+PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2018-12-25 Thread Andreas Sturmlechner
commit: a3cddde618e1cd0eb6196a7a200b5f1096b251a4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 25 22:30:25 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 25 22:54:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cddde6

media-gfx/kphotoalbum: Drop USE map from defaults

kde-apps/libkgeomap depends on dev-qt/qtwebkit.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
index 5e0e4683ac6..ce7c3284e2a 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
 KEYWORDS="amd64 x86"
-IUSE="+kipi +map +raw"
+IUSE="+kipi map +raw"
 
 DEPEND="
$(add_frameworks_dep karchive)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2018-11-12 Thread Andreas Sturmlechner
commit: 12d78f8099c7e87660c384d5133f9be371308577
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 12 18:56:45 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 12 23:00:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d78f80

media-gfx/kphotoalbum: Drop 5.3

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/kphotoalbum/Manifest |  1 -
 .../kphotoalbum/files/kphotoalbum-5.3-gcc8.patch   | 29 --
 media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild   | 67 --
 3 files changed, 97 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 868408acaea..94b929ebd44 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B 
d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3
 SHA512 
8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f
 DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 
5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc
 SHA512 
d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
deleted file mode 100644
index ce52589b23c..000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 47f4c00adaa442cd03b02d44517b5503718f2813 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux 
-Date: Tue, 12 Jun 2018 22:52:06 +0200
-Subject: Fix build with Qt 5.11.
-
-Summary: 'id' is an int, it doesn't need qPrintable.
-
-Reviewers: johanneszarl
-
-Differential Revision: https://phabricator.kde.org/D13329

- RemoteControl/RemoteConnection.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/RemoteControl/RemoteConnection.cpp 
b/RemoteControl/RemoteConnection.cpp
-index 1dacb72..8bc18d0 100644
 a/RemoteControl/RemoteConnection.cpp
-+++ b/RemoteControl/RemoteConnection.cpp
-@@ -105,7 +105,7 @@ void RemoteConnection::dataReceived()
- std::unique_ptr command = 
RemoteCommand::create(static_cast(id));
- command->decode(stream);
- protocolDebug() << 
qPrintable(QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss.zzz")))
--   << ": Received " << qPrintable(id);
-+   << ": Received " << id;
- 
- emit gotCommand(*command);
- }
--- 
-cgit v0.11.2

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
deleted file mode 100644
index c5416d5f9a7..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="+kipi +map +raw"
-
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(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 kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql 'sqlite')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5(+)]
-   virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
-   map? ( $(add_kdeapps_dep libkgeomap) )
-   raw? ( $(add_kdeapps_dep libkdcraw) )
-"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   media-video/mplayer
-   kipi? ( media-plugins/kipi-plugins:5 )
-   !media-gfx/kphotoalbum:4
-"
-
-DOCS=( ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${P}-gcc8.patch" )
-
-src_configure() {
-   append-ldflags -fuse-ld=gold #bug #623566
-
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package kipi KF5Kipi)
-   $(cmake-utils_use_find_package map 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2018-11-11 Thread Thomas Deutschmann
commit: c308722f1a115f892d1f98c50b705b43d216505d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Nov 12 00:59:22 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Nov 12 01:13:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c308722f

media-gfx/kphotoalbum: x86 stable (bug #670708)

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
index c2275d2ae9a..5e0e4683ac6 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+kipi +map +raw"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2018-11-09 Thread Mikle Kolyada
commit: f8c188cd26d26776268323952440338cf7e4c964
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov  9 18:54:53 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov  9 18:55:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c188cd

media-gfx/kphotoalbum: amd64 stable wrt bug #670708

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
index ff37b76cc7c..c2275d2ae9a 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+kipi +map +raw"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2018-10-13 Thread Andreas Sturmlechner
commit: 60df5deeb08d8b22e35d0d018573bf094dea4441
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 13 18:45:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 13 18:52:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60df5dee

media-gfx/kphotoalbum: 5.4 version bump

- Drop bogus gettext DEPEND
- Accept media-video/ffmpeg alternative RDEPEND to mplayer

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/kphotoalbum/Manifest   |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild | 60 
 2 files changed, 61 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 0fd9b6e99f9..868408acaea 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B 
d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3
 SHA512 
8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f
+DIST kphotoalbum-5.4.tar.xz 11658792 BLAKE2B 
5f91dac910cc7022ca8a20f49f286a84586bf7adaed57448c1d811c370a9fb8661469d4e8e73809990e1e1800aaaff8f53c86446d93f99fd55cdddbece01eddc
 SHA512 
d528905f3af9d23c89c89f902abe8358f8e90c402e437bc7cdd67837649f5dcd7f7416c77cc824532f928f41e7590f6005f13c97be4d608e433aad285a6a8bba

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
new file mode 100644
index 000..ff37b76cc7c
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+kipi +map +raw"
+
+DEPEND="
+   $(add_frameworks_dep karchive)
+   $(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 kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql 'sqlite')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5(+)]
+   virtual/jpeg:0
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   map? ( $(add_kdeapps_dep libkgeomap) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+RDEPEND="${DEPEND}
+   || ( media-video/ffmpeg media-video/mplayer )
+   kipi? ( media-plugins/kipi-plugins:5 )
+   !media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package map KF5KGeoMap)
+   $(cmake-utils_use_find_package raw KF5KDcraw)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/

2018-08-19 Thread Andreas Sturmlechner
commit: a335e6425c364c07fafda12eea999ed1d30a3dbb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 19 08:20:47 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 19 08:26:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a335e642

media-gfx/kphotoalbum: Fix build with GCC-8

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 .../kphotoalbum/files/kphotoalbum-5.3-gcc8.patch   | 29 ++
 media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild   |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
new file mode 100644
index 000..ce52589b23c
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch
@@ -0,0 +1,29 @@
+From 47f4c00adaa442cd03b02d44517b5503718f2813 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux 
+Date: Tue, 12 Jun 2018 22:52:06 +0200
+Subject: Fix build with Qt 5.11.
+
+Summary: 'id' is an int, it doesn't need qPrintable.
+
+Reviewers: johanneszarl
+
+Differential Revision: https://phabricator.kde.org/D13329
+---
+ RemoteControl/RemoteConnection.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/RemoteControl/RemoteConnection.cpp 
b/RemoteControl/RemoteConnection.cpp
+index 1dacb72..8bc18d0 100644
+--- a/RemoteControl/RemoteConnection.cpp
 b/RemoteControl/RemoteConnection.cpp
+@@ -105,7 +105,7 @@ void RemoteConnection::dataReceived()
+ std::unique_ptr command = 
RemoteCommand::create(static_cast(id));
+ command->decode(stream);
+ protocolDebug() << 
qPrintable(QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss.zzz")))
+-   << ": Received " << qPrintable(id);
++   << ": Received " << id;
+ 
+ emit gotCommand(*command);
+ }
+-- 
+cgit v0.11.2

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
index ad95715accd..c5416d5f9a7 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
@@ -52,6 +52,8 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( ChangeLog README )
 
+PATCHES=( "${FILESDIR}/${P}-gcc8.patch" )
+
 src_configure() {
append-ldflags -fuse-ld=gold #bug #623566
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2018-03-18 Thread Andreas Sturmlechner
commit: 710005ab7ee05e782ea79d7b9d6c1a89d59df939
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 18 17:01:28 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 18 17:50:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710005ab

media-gfx/kphotoalbum: Drop 5.2

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/kphotoalbum/Manifest   |  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild | 67 
 2 files changed, 68 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index e17687ce619..0fd9b6e99f9 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.2.tar.xz 9549504 BLAKE2B 
134dd71ec784dd22fc9be6a143ee7b00aa55b2df19179dfd84eaec821ccb0168f3447df15ca36a14174fdb740401becb33698d9ac53392c11f4cf1de67867634
 SHA512 
a6a82966fadc66167d0e3877c10f46e5791b301eea3114883d879537eba472d418206da8cd0f7bd923f156d0a5c2f0e66bb2c21e39fef8fdf01841556c056548
 DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B 
d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3
 SHA512 
8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
deleted file mode 100644
index 61606a6793b..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="+kipi +map +raw"
-
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(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 kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql 'sqlite')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5(+)]
-   virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
-   map? ( $(add_kdeapps_dep libkgeomap) )
-   raw? ( $(add_kdeapps_dep libkdcraw) )
-"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   media-video/mplayer
-   kipi? ( media-plugins/kipi-plugins:5 )
-   !media-gfx/kphotoalbum:4
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-   append-ldflags -fuse-ld=gold #bug #623566
-
-   local mycmakeargs=(
-   -DENABLE_PLAYGROUND=ON
-   -DCMAKE_DISABLE_FIND_PACKAGE_KF5KFace=ON
-   $(cmake-utils_use_find_package kipi KF5Kipi)
-   $(cmake-utils_use_find_package map KF5KGeoMap)
-   $(cmake-utils_use_find_package raw KF5KDcraw)
-   )
-
-   kde5_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2018-03-18 Thread Mikle Kolyada
commit: 1f0c704d5ca380f22c70a0ae7213469c12230473
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 18 14:37:43 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 18 14:38:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0c704d

media-gfx/kphotoalbum: amd64 stable wrt bug #650674

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
index 723a434168f..ad95715accd 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+kipi +map +raw"
 
 COMMON_DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2018-03-17 Thread Thomas Deutschmann
commit: 9eaca27e21b546cc0e1a4daee5ef8ed624fabb9b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Mar 18 00:23:15 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Mar 18 00:39:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eaca27e

media-gfx/kphotoalbum: x86 stable (bug #650674)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
index b2a3e0b0788..723a434168f 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+kipi +map +raw"
 
 COMMON_DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2018-01-20 Thread Andreas Sturmlechner
commit: 10dddc2a9ad01a149c283b01172879f09805848f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 20 22:35:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 20 22:48:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10dddc2a

media-gfx/kphotoalbum: 5.3 version bump

Closes: https://bugs.gentoo.org/645184
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/kphotoalbum/Manifest   |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild | 65 
 2 files changed, 66 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index fdd0c31ca17..e17687ce619 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.2.tar.xz 9549504 BLAKE2B 
134dd71ec784dd22fc9be6a143ee7b00aa55b2df19179dfd84eaec821ccb0168f3447df15ca36a14174fdb740401becb33698d9ac53392c11f4cf1de67867634
 SHA512 
a6a82966fadc66167d0e3877c10f46e5791b301eea3114883d879537eba472d418206da8cd0f7bd923f156d0a5c2f0e66bb2c21e39fef8fdf01841556c056548
+DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B 
d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3
 SHA512 
8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
new file mode 100644
index 000..b2a3e0b0788
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit flag-o-matic kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+kipi +map +raw"
+
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(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 kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql 'sqlite')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5(+)]
+   virtual/jpeg:0
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   map? ( $(add_kdeapps_dep libkgeomap) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   media-video/mplayer
+   kipi? ( media-plugins/kipi-plugins:5 )
+   !media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+   append-ldflags -fuse-ld=gold #bug #623566
+
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package map KF5KGeoMap)
+   $(cmake-utils_use_find_package raw KF5KDcraw)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2017-12-09 Thread Michael Palimaka
commit: 08de8e36f50def97e798d6e548aa7e9c8565ec35
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Dec  9 22:53:45 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Dec  9 22:54:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08de8e36

media-gfx/kphotoalbum: force gold linker to work around binutils bug

Bug: https://bugs.gentoo.org/623566
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 media-gfx/kphotoalbum/Manifest   | 2 +-
 media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 89f40a055bd..fdd0c31ca17 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1 @@
-DIST kphotoalbum-5.2.tar.xz 9549504 SHA256 
9ad02080b21787d5824d0c4bb49be2a00822098adca7937e9c7497440d3b0b89 SHA512 
a6a82966fadc66167d0e3877c10f46e5791b301eea3114883d879537eba472d418206da8cd0f7bd923f156d0a5c2f0e66bb2c21e39fef8fdf01841556c056548
 WHIRLPOOL 
0747045ef07eb9afb540ea6978db15b783d4db21ba4a9c63d9a7b5e0a823aafe71bc2bcec9d7d6831df188a297083ed2a85c52c71d555f8ff8f2e144cca194a9
+DIST kphotoalbum-5.2.tar.xz 9549504 BLAKE2B 
134dd71ec784dd22fc9be6a143ee7b00aa55b2df19179dfd84eaec821ccb0168f3447df15ca36a14174fdb740401becb33698d9ac53392c11f4cf1de67867634
 SHA512 
a6a82966fadc66167d0e3877c10f46e5791b301eea3114883d879537eba472d418206da8cd0f7bd923f156d0a5c2f0e66bb2c21e39fef8fdf01841556c056548

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
index b251424a6ca..61606a6793b 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-inherit kde5
+inherit flag-o-matic kde5
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"
 HOMEPAGE="https://www.kphotoalbum.org/;
@@ -53,6 +53,8 @@ RDEPEND="${COMMON_DEPEND}
 DOCS=( ChangeLog README )
 
 src_configure() {
+   append-ldflags -fuse-ld=gold #bug #623566
+
local mycmakeargs=(
-DENABLE_PLAYGROUND=ON
-DCMAKE_DISABLE_FIND_PACKAGE_KF5KFace=ON



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2017-11-19 Thread Andreas Sturmlechner
commit: 06ec1a5b748a6ec707f0f02596496d330dd97d85
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 13 00:56:42 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 19 22:56:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06ec1a5b

media-gfx/kphotoalbum: Drop USE=face

Requires unmaintained kde-apps/libkface which is stuck with
=media-libs/opencv-3.1*.

See also:
https://mail.kde.org/pipermail/release-team/2017-November/010718.html

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild | 5 ++---
 media-gfx/kphotoalbum/metadata.xml   | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
index eee7ec2bb48..b251424a6ca 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
 KEYWORDS="amd64 x86"
-IUSE="face +kipi +map +raw"
+IUSE="+kipi +map +raw"
 
 COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -37,7 +37,6 @@ COMMON_DEPEND="
media-gfx/exiv2:=
media-libs/phonon[qt5(+)]
virtual/jpeg:0
-   face? ( $(add_kdeapps_dep libkface) )
kipi? ( $(add_kdeapps_dep libkipi) )
map? ( $(add_kdeapps_dep libkgeomap) )
raw? ( $(add_kdeapps_dep libkdcraw) )
@@ -56,7 +55,7 @@ DOCS=( ChangeLog README )
 src_configure() {
local mycmakeargs=(
-DENABLE_PLAYGROUND=ON
-   $(cmake-utils_use_find_package face KF5KFace)
+   -DCMAKE_DISABLE_FIND_PACKAGE_KF5KFace=ON
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package map KF5KGeoMap)
$(cmake-utils_use_find_package raw KF5KDcraw)

diff --git a/media-gfx/kphotoalbum/metadata.xml 
b/media-gfx/kphotoalbum/metadata.xml
index 22ab0f0e1ef..2a675ce364e 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -6,7 +6,6 @@
Gentoo KDE Project


-   Enable face detection and recognition using 
kde-apps/libkface
Support for the KDE Image Plugin 
Interface
Enable map display support using 
kde-apps/libkgeomap




[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2017-06-18 Thread Michael Palimaka
commit: f02176e659712127f2630cb2a793b670459e4a5a
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun 18 11:59:20 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun 18 12:08:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02176e6

media-gfx/kphotoalbum: use HTTPS

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
index 079e1b5e6a9..62864b176dd 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="http://www.kphotoalbum.org/;
+HOMEPAGE="https://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2017-04-27 Thread Michael Palimaka
commit: db33762741e015e8faa9f3bd8090553786a8a446
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Apr 27 12:07:18 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Apr 27 12:17:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db337627

media-gfx/kphotoalbum: remove 5.1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-gfx/kphotoalbum/Manifest   |  1 -
 media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild | 66 
 2 files changed, 67 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 2dc09a25796..89f40a055bd 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.1.tar.xz 9544460 SHA256 
9c6e175090fc6de1e7d0565a88e1715496e0b1cfbdfc7a11dd4818694b8504b7 SHA512 
fea7b30e164801d1de2622ad1fc1b0d13139646b1e78737b056dad3a1ee81cc401706d4fe1496980e56bb8679d5e2e5beb8c235a6e83649d86b15eebad08db5d
 WHIRLPOOL 
aba0637c25844d4818a835dfa504251f564b9caa2992eabad59269cff0bf2370bc92aad56f97020a4cd438016ceb8a9cd4a77266df8bc10940d586b2f978c23e
 DIST kphotoalbum-5.2.tar.xz 9549504 SHA256 
9ad02080b21787d5824d0c4bb49be2a00822098adca7937e9c7497440d3b0b89 SHA512 
a6a82966fadc66167d0e3877c10f46e5791b301eea3114883d879537eba472d418206da8cd0f7bd923f156d0a5c2f0e66bb2c21e39fef8fdf01841556c056548
 WHIRLPOOL 
0747045ef07eb9afb540ea6978db15b783d4db21ba4a9c63d9a7b5e0a823aafe71bc2bcec9d7d6831df188a297083ed2a85c52c71d555f8ff8f2e144cca194a9

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild
deleted file mode 100644
index 079e1b5e6a9..000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="http://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="face +kipi +map +raw"
-
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(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 kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtsql 'sqlite')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   media-gfx/exiv2:=
-   media-libs/phonon[qt5]
-   virtual/jpeg:0
-   face? ( $(add_kdeapps_dep libkface) )
-   kipi? ( $(add_kdeapps_dep libkipi) )
-   map? ( $(add_kdeapps_dep libkgeomap) )
-   raw? ( $(add_kdeapps_dep libkdcraw) )
-"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   media-video/mplayer
-   kipi? ( media-plugins/kipi-plugins:5 )
-   !media-gfx/kphotoalbum:4
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PLAYGROUND=ON
-   $(cmake-utils_use_find_package face KF5KFace)
-   $(cmake-utils_use_find_package kipi KF5Kipi)
-   $(cmake-utils_use_find_package map KF5KGeoMap)
-   $(cmake-utils_use_find_package raw KF5KDcraw)
-   )
-
-   kde5_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2017-04-27 Thread Agostino Sarubbo
commit: ff8f924c15da5203c1874a643b34c0ed089ab1e2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Apr 27 10:35:49 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Apr 27 10:35:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8f924c

media-gfx/kphotoalbum: x86 stable wrt bug #615610

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
index 8b2002de9e4..079e1b5e6a9 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="face +kipi +map +raw"
 
 COMMON_DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2017-04-23 Thread Agostino Sarubbo
commit: 2267f766b32c4f528ae628dfd5281097492f0869
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Apr 23 10:27:00 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Apr 23 10:27:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2267f766

media-gfx/kphotoalbum: amd64 stable wrt bug #615610

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
index ad398aef764..8b2002de9e4 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="face +kipi +map +raw"
 
 COMMON_DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2017-02-27 Thread Johannes Huber
commit: 2ecf08aa7883fd8c5feca2f429dbe550c3d72c02
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Feb 27 17:28:51 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Feb 27 17:29:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ecf08aa

media-gfx/kphotoalbum: Version bump 5.2

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/kphotoalbum/Manifest   |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index f9b716898f..2dc09a2579 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.1.tar.xz 9544460 SHA256 
9c6e175090fc6de1e7d0565a88e1715496e0b1cfbdfc7a11dd4818694b8504b7 SHA512 
fea7b30e164801d1de2622ad1fc1b0d13139646b1e78737b056dad3a1ee81cc401706d4fe1496980e56bb8679d5e2e5beb8c235a6e83649d86b15eebad08db5d
 WHIRLPOOL 
aba0637c25844d4818a835dfa504251f564b9caa2992eabad59269cff0bf2370bc92aad56f97020a4cd438016ceb8a9cd4a77266df8bc10940d586b2f978c23e
+DIST kphotoalbum-5.2.tar.xz 9549504 SHA256 
9ad02080b21787d5824d0c4bb49be2a00822098adca7937e9c7497440d3b0b89 SHA512 
a6a82966fadc66167d0e3877c10f46e5791b301eea3114883d879537eba472d418206da8cd0f7bd923f156d0a5c2f0e66bb2c21e39fef8fdf01841556c056548
 WHIRLPOOL 
0747045ef07eb9afb540ea6978db15b783d4db21ba4a9c63d9a7b5e0a823aafe71bc2bcec9d7d6831df188a297083ed2a85c52c71d555f8ff8f2e144cca194a9

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
new file mode 100644
index 00..e45229ba20
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="http://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="face +kipi +map +raw"
+
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(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 kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql 'sqlite')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5]
+   virtual/jpeg:0
+   face? ( $(add_kdeapps_dep libkface) )
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   map? ( $(add_kdeapps_dep libkgeomap) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   media-video/mplayer
+   kipi? ( media-plugins/kipi-plugins:5 )
+   !media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PLAYGROUND=ON
+   $(cmake-utils_use_find_package face KF5KFace)
+   $(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package map KF5KGeoMap)
+   $(cmake-utils_use_find_package raw KF5KDcraw)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/, media-gfx/kphotoalbum/

2017-02-27 Thread Johannes Huber
commit: 605212537b1d419072060bd649d818c479a750c5
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Feb 27 17:29:33 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Feb 27 17:29:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60521253

media-gfx/kphotoalbum: Remove 5.1-r1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/kphotoalbum-5.1-ecm531-1.patch   | 19 --
 .../files/kphotoalbum-5.1-ecm531-2.patch   | 39 ---
 .../files/kphotoalbum-5.1-ecm531-3.patch   | 56 
 .../files/kphotoalbum-5.1-ecm531-4.patch   | 19 --
 .../files/kphotoalbum-5.1-ecm531-5.patch   | 19 --
 media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild| 75 --
 6 files changed, 227 deletions(-)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch
deleted file mode 100644
index bf694951f9..00
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 8b54a592731e65dec02bbfc83c994fe373bc0dca
-Author: Raymond Wooninck 
-Date:   Tue Jan 24 20:55:28 2017 +0100
-
-Fix build with -fno-operator-names
-
-diff --git a/DB/ImageInfo.cpp b/DB/ImageInfo.cpp
-index 59c2c6f9..5eadbb10 100644
 a/DB/ImageInfo.cpp
-+++ b/DB/ImageInfo.cpp
-@@ -190,7 +190,7 @@ void ImageInfo::rotate( int degrees, RotationMode mode )
- m_dirty = true;
- m_angle = ( m_angle + degrees ) % 360;
- 
--if (degrees == 90 or degrees == 270) {
-+if (degrees == 90 || degrees == 270) {
- m_size.transpose();
- }
- 

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch
deleted file mode 100644
index 11cd87cebe..00
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 8cc8951ba21b1e54a7cd62e50075e09e8e2f9901
-Author: Raymond Wooninck 
-Date:   Tue Jan 24 21:06:31 2017 +0100
-
-Some more fixes for -fno-operator-names
-
-diff --git a/AnnotationDialog/Dialog.cpp b/AnnotationDialog/Dialog.cpp
-index 50e18e70..c44d88dc 100644
 a/AnnotationDialog/Dialog.cpp
-+++ b/AnnotationDialog/Dialog.cpp
-@@ -1504,7 +1504,7 @@ void 
AnnotationDialog::Dialog::addTagToCandidateList(QString category, QString t
- void AnnotationDialog::Dialog::removeTagFromCandidateList(QString category, 
QString tag)
- {
- // Is the deselected tag the last selected positionable tag?
--if (m_lastSelectedPositionableTag.first == category and 
m_lastSelectedPositionableTag.second == tag) {
-+if (m_lastSelectedPositionableTag.first == category && 
m_lastSelectedPositionableTag.second == tag) {
- m_lastSelectedPositionableTag = QPair();
- }
- 
-@@ -1534,7 +1534,7 @@ void AnnotationDialog::Dialog::slotShowAreas(bool 
showAreas)
- void AnnotationDialog::Dialog::positionableTagRenamed(QString category, 
QString oldTag, QString newTag)
- {
- // Is the renamed tag the last selected positionable tag?
--if (m_lastSelectedPositionableTag.first == category and 
m_lastSelectedPositionableTag.second == oldTag) {
-+if (m_lastSelectedPositionableTag.first == category && 
m_lastSelectedPositionableTag.second == oldTag) {
- m_lastSelectedPositionableTag.second = newTag;
- }
- 
-@@ -1576,8 +1576,8 @@ void AnnotationDialog::Dialog::checkProposedTagData(
- foreach (ResizableFrame *area, areas())
- {
- if (area != areaToExclude
--and area->proposedTagData() == tagData
--and area->tagData().first.isEmpty()) {
-+&& area->proposedTagData() == tagData
-+&& area->tagData().first.isEmpty()) {
- area->removeProposedTagData();
- }
- }

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch
deleted file mode 100644
index 8269676529..00
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 3e91323f1faea39a950b84b317a511df2f3b8875
-Author: Raymond Wooninck 
-Date:   Tue Jan 24 22:01:16 2017 +0100
-
-More fixes for -fno-operator-names
-
-diff --git a/AnnotationDialog/ImagePreview.cpp 
b/AnnotationDialog/ImagePreview.cpp
-index e83f03aa..34d90b62 100644
 a/AnnotationDialog/ImagePreview.cpp
-+++ b/AnnotationDialog/ImagePreview.cpp
-@@ -330,8 +330,8 @@ void ImagePreview::mousePressEvent(QMouseEvent *event)
- }
- 
- m_areaStart = event->pos();
--if (m_areaStart.x() < m_minX or m_areaStart.x() > m_maxX or
--m_areaStart.y() < m_minY or m_areaStart.y() > m_maxY) {
-+if (m_areaStart.x() < m_minX || m_areaStart.x() > m_maxX ||
-+m_areaStart.y() < m_minY || m_areaStart.y() > m_maxY) {
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2017-02-15 Thread Johannes Huber
commit: 75ae6be0e2590f6ac5e245fac6770ebb63b6a93e
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Feb 15 21:23:46 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Feb 15 21:24:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75ae6be0

media-gfx/kphotoalbum: Fix build w/ ecm 5.31

Revision bump adds upstream patches to fix build with next extra cmake modules
version. This version adds cflags -fno-operator-names by default, which breaks
the build here.

Gentoo-bug: 609470

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/kphotoalbum-5.1-ecm531-1.patch   | 19 ++
 .../files/kphotoalbum-5.1-ecm531-2.patch   | 39 +++
 .../files/kphotoalbum-5.1-ecm531-3.patch   | 56 
 .../files/kphotoalbum-5.1-ecm531-4.patch   | 19 ++
 .../files/kphotoalbum-5.1-ecm531-5.patch   | 19 ++
 media-gfx/kphotoalbum/kphotoalbum-5.1-r1.ebuild| 75 ++
 6 files changed, 227 insertions(+)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch
new file mode 100644
index 00..bf694951f9
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-1.patch
@@ -0,0 +1,19 @@
+commit 8b54a592731e65dec02bbfc83c994fe373bc0dca
+Author: Raymond Wooninck 
+Date:   Tue Jan 24 20:55:28 2017 +0100
+
+Fix build with -fno-operator-names
+
+diff --git a/DB/ImageInfo.cpp b/DB/ImageInfo.cpp
+index 59c2c6f9..5eadbb10 100644
+--- a/DB/ImageInfo.cpp
 b/DB/ImageInfo.cpp
+@@ -190,7 +190,7 @@ void ImageInfo::rotate( int degrees, RotationMode mode )
+ m_dirty = true;
+ m_angle = ( m_angle + degrees ) % 360;
+ 
+-if (degrees == 90 or degrees == 270) {
++if (degrees == 90 || degrees == 270) {
+ m_size.transpose();
+ }
+ 

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch
new file mode 100644
index 00..11cd87cebe
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-2.patch
@@ -0,0 +1,39 @@
+commit 8cc8951ba21b1e54a7cd62e50075e09e8e2f9901
+Author: Raymond Wooninck 
+Date:   Tue Jan 24 21:06:31 2017 +0100
+
+Some more fixes for -fno-operator-names
+
+diff --git a/AnnotationDialog/Dialog.cpp b/AnnotationDialog/Dialog.cpp
+index 50e18e70..c44d88dc 100644
+--- a/AnnotationDialog/Dialog.cpp
 b/AnnotationDialog/Dialog.cpp
+@@ -1504,7 +1504,7 @@ void 
AnnotationDialog::Dialog::addTagToCandidateList(QString category, QString t
+ void AnnotationDialog::Dialog::removeTagFromCandidateList(QString category, 
QString tag)
+ {
+ // Is the deselected tag the last selected positionable tag?
+-if (m_lastSelectedPositionableTag.first == category and 
m_lastSelectedPositionableTag.second == tag) {
++if (m_lastSelectedPositionableTag.first == category && 
m_lastSelectedPositionableTag.second == tag) {
+ m_lastSelectedPositionableTag = QPair();
+ }
+ 
+@@ -1534,7 +1534,7 @@ void AnnotationDialog::Dialog::slotShowAreas(bool 
showAreas)
+ void AnnotationDialog::Dialog::positionableTagRenamed(QString category, 
QString oldTag, QString newTag)
+ {
+ // Is the renamed tag the last selected positionable tag?
+-if (m_lastSelectedPositionableTag.first == category and 
m_lastSelectedPositionableTag.second == oldTag) {
++if (m_lastSelectedPositionableTag.first == category && 
m_lastSelectedPositionableTag.second == oldTag) {
+ m_lastSelectedPositionableTag.second = newTag;
+ }
+ 
+@@ -1576,8 +1576,8 @@ void AnnotationDialog::Dialog::checkProposedTagData(
+ foreach (ResizableFrame *area, areas())
+ {
+ if (area != areaToExclude
+-and area->proposedTagData() == tagData
+-and area->tagData().first.isEmpty()) {
++&& area->proposedTagData() == tagData
++&& area->tagData().first.isEmpty()) {
+ area->removeProposedTagData();
+ }
+ }

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch
new file mode 100644
index 00..8269676529
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.1-ecm531-3.patch
@@ -0,0 +1,56 @@
+commit 3e91323f1faea39a950b84b317a511df2f3b8875
+Author: Raymond Wooninck 
+Date:   Tue Jan 24 22:01:16 2017 +0100
+
+More fixes for -fno-operator-names
+
+diff --git a/AnnotationDialog/ImagePreview.cpp 
b/AnnotationDialog/ImagePreview.cpp
+index e83f03aa..34d90b62 100644
+--- a/AnnotationDialog/ImagePreview.cpp
 b/AnnotationDialog/ImagePreview.cpp
+@@ -330,8 +330,8 @@ void ImagePreview::mousePressEvent(QMouseEvent *event)
+ }
+ 
+ m_areaStart = event->pos();
+-if (m_areaStart.x() < m_minX or m_areaStart.x() > m_maxX or
+-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2017-01-19 Thread Johannes Huber
commit: a612fa7f82e35f124ed194c76e2ee3e3a1dc
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Jan 19 16:47:16 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Jan 19 16:47:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a612fa7f

media-gfx/kphotoalbum: Remove 5.0.1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/kphotoalbum/Manifest |   1 -
 .../files/kphotoalbum-5.0.1-buildbackports.patch   | 190 -
 media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild |  67 
 3 files changed, 258 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index b02378e..f9b7168 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1 @@
-DIST kphotoalbum-5.0.1.tar.xz 9539204 SHA256 
e43beb6cb93d749b30aa171ebce5ac5473b16704ea6d36bf6dcc2ce54328ce55 SHA512 
e182e0f594aa1ce2a53ee529990eba0e61b0d694d74a6e0c2bd37d57658c6e3173e9107f49f82afef85b8cb9a84af626d6e060e7f6d992c8606902b16abff848
 WHIRLPOOL 
4b235af854a5faba228d487498a06112ef138827e7abe14b73b04bc76cb9dabe02a623bf1e15597fcf6acdb79000942622de343fd57f8c02dad82fa1141535f3
 DIST kphotoalbum-5.1.tar.xz 9544460 SHA256 
9c6e175090fc6de1e7d0565a88e1715496e0b1cfbdfc7a11dd4818694b8504b7 SHA512 
fea7b30e164801d1de2622ad1fc1b0d13139646b1e78737b056dad3a1ee81cc401706d4fe1496980e56bb8679d5e2e5beb8c235a6e83649d86b15eebad08db5d
 WHIRLPOOL 
aba0637c25844d4818a835dfa504251f564b9caa2992eabad59269cff0bf2370bc92aad56f97020a4cd438016ceb8a9cd4a77266df8bc10940d586b2f978c23e

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch
deleted file mode 100644
index 26eac8d..
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 87d8f63d5966b36af60e9d4aac95196fcee30f91 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl 
-Date: Sun, 30 Oct 2016 21:52:03 +0100
-Subject: [PATCH] Review dependency list.
-
-Thanks to kensington for the suggestion!

- CMakeLists.txt | 23 ++-
- 1 file changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 120a703..95f46c9 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ include(FeatureSummary)
- 
- find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network)
- find_package(Phonon4Qt5 REQUIRED)
--find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO DocTools 
WidgetsAddons Config IconThemes Archive Parts JobWidgets)
-+find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons 
DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons)
- 
- # enable exceptions:
- kde_enable_exceptions()
-@@ -445,10 +445,23 @@ set(kphotoalbum_SRCS
- add_executable(kphotoalbum ${kphotoalbum_SRCS})
- 
- # External components
--target_link_libraries(kphotoalbum ${JPEG_LIBRARY})
--target_link_libraries(kphotoalbum Qt5::Network)
--target_link_libraries(kphotoalbum KF5::KIOCore KF5::CoreAddons KF5::I18n 
KF5::ConfigCore KF5::ConfigGui KF5::IconThemes KF5::Archive KF5::Parts 
KF5::JobWidgets KF5::WidgetsAddons)
--target_link_libraries(kphotoalbum Phonon::phonon4qt5)
-+target_link_libraries(kphotoalbum
-+${JPEG_LIBRARY}
-+KF5::Archive
-+KF5::Completion
-+KF5::ConfigCore
-+KF5::ConfigGui
-+KF5::CoreAddons
-+KF5::I18n
-+KF5::IconThemes
-+KF5::JobWidgets
-+KF5::KIOCore
-+KF5::KIOWidgets
-+KF5::TextWidgets
-+KF5::WidgetsAddons
-+Phonon::phonon4qt5
-+Qt5::Network
-+)
- 
- if(KF5Kipi_FOUND)
- target_link_libraries(kphotoalbum KF5::Kipi)
--- 
-2.7.3
-
-From e07a6ffd6a96a527e0ac26e9f12eb1bcd7767830 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl 
-Date: Thu, 8 Dec 2016 22:02:13 +0100
-Subject: [PATCH] Remove bogus dependency on KF5KExiv2
-

- CMakeLists.txt | 28 +++-
- 1 file changed, 11 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1594af0..36228b8 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,15 +92,13 @@ set_package_properties(KF5KDcraw
- )
- set(HAVE_KDCRAW ${KF5KDcraw_FOUND} )
- 
--find_package(KF5KExiv2)
--# FIXME: most of KPhotoAlbum uses plain libexiv:
- find_package(Exiv2)
--set_package_properties(KF5KExiv2
-+set_package_properties(Exiv2
- PROPERTIES
- TYPE RECOMMENDED
- PURPOSE "Enables image metadata (exiv) support (strongly advised!)"
- )
--set(HAVE_EXIV2 ${KF5KExiv2_FOUND})
-+set(HAVE_EXIV2 ${Exiv2_FOUND})
- 
- if(ENABLE_PLAYGROUND)
- find_package(KF5KFace 5.0.0 CONFIG)
-@@ -112,16 +110,12 @@ if(ENABLE_PLAYGROUND)
- set(HAVE_KFACE ${KF5KFace_FOUND})
- endif()
- 
--if(KF5KExiv2_FOUND)
--find_package(KF5KGeoMap)
--set_package_properties(KF5KGeoMap
--PROPERTIES
--TYPE OPTIONAL
--PURPOSE 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2017-01-18 Thread Agostino Sarubbo
commit: 976a255290f4f8ddaee48e290276e108ac39f685
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan 18 16:49:54 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan 18 16:52:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=976a2552

media-gfx/kphotoalbum: amd64 stable wrt bug #606262

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild
index 8a91e39..f4b4288 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="face +kipi +map +raw"
 
 COMMON_DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-12-17 Thread Johannes Huber
commit: f31d980532b25d14dc93216caf137603f15cc0d6
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Dec 17 22:17:25 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Dec 17 22:18:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31d9805

media-gfx/kphotoalbum: Version bump 5.1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/kphotoalbum/Manifest   |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild | 67 
 2 files changed, 68 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index b4dab77..b02378e 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1 +1,2 @@
 DIST kphotoalbum-5.0.1.tar.xz 9539204 SHA256 
e43beb6cb93d749b30aa171ebce5ac5473b16704ea6d36bf6dcc2ce54328ce55 SHA512 
e182e0f594aa1ce2a53ee529990eba0e61b0d694d74a6e0c2bd37d57658c6e3173e9107f49f82afef85b8cb9a84af626d6e060e7f6d992c8606902b16abff848
 WHIRLPOOL 
4b235af854a5faba228d487498a06112ef138827e7abe14b73b04bc76cb9dabe02a623bf1e15597fcf6acdb79000942622de343fd57f8c02dad82fa1141535f3
+DIST kphotoalbum-5.1.tar.xz 9544460 SHA256 
9c6e175090fc6de1e7d0565a88e1715496e0b1cfbdfc7a11dd4818694b8504b7 SHA512 
fea7b30e164801d1de2622ad1fc1b0d13139646b1e78737b056dad3a1ee81cc401706d4fe1496980e56bb8679d5e2e5beb8c235a6e83649d86b15eebad08db5d
 WHIRLPOOL 
aba0637c25844d4818a835dfa504251f564b9caa2992eabad59269cff0bf2370bc92aad56f97020a4cd438016ceb8a9cd4a77266df8bc10940d586b2f978c23e

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild
new file mode 100644
index ..8a91e39
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="http://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="face +kipi +map +raw"
+
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(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 kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql 'sqlite')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   media-gfx/exiv2:=
+   media-libs/phonon[qt5]
+   virtual/jpeg:0
+   face? ( $(add_kdeapps_dep libkface) )
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   map? ( $(add_kdeapps_dep libkgeomap) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   media-video/mplayer
+   kipi? ( media-plugins/kipi-plugins:5 )
+   !media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PLAYGROUND=ON
+   $(cmake-utils_use_find_package face KF5KFace)
+   $(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package map KF5KGeoMap)
+   $(cmake-utils_use_find_package raw KF5KDcraw)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2016-12-11 Thread Johannes Huber
commit: 938e22b00a7f0a114b225ee7e5f3429d27d3bc08
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Dec 11 19:32:03 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Dec 11 19:33:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=938e22b0

media-gfx/kphotoalbum: Drop slot 4

Package-Manager: portage-2.3.3

 media-gfx/kphotoalbum/Manifest |  2 -
 .../files/kphotoalbum-4.7.1-nokipi.patch   | 24 --
 media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild   | 46 --
 media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild | 54 --
 media-gfx/kphotoalbum/metadata.xml |  1 -
 5 files changed, 127 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 1296e6b..b4dab77 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1 @@
-DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 
0cdd4e02e9e4f840550a20cc8dca8a01e4a55db19f0f8b15e903d2c342cd SHA512 
57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d
 WHIRLPOOL 
77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
-DIST kphotoalbum-4.7.2.tar.xz 9519864 SHA256 
313214df2b1dad2c9beb3e56051622155b142fcf67bdbaa65c3fff26790a SHA512 
30cb229a4c090981aec474ee9c45f257fe0b2a070ab788712962114868bdcb84e8d2b7f77c4186a30e4654e4196892cd243e7cc5579262d895e5ea2df0213195
 WHIRLPOOL 
88fb71ecf2925fa1ba43f833e6e47c43b3f38731cfc922027597d34fbd009e7850024a6b45c163f412a36908def97fddae12430bc96a36faa267c8dbaada634b
 DIST kphotoalbum-5.0.1.tar.xz 9539204 SHA256 
e43beb6cb93d749b30aa171ebce5ac5473b16704ea6d36bf6dcc2ce54328ce55 SHA512 
e182e0f594aa1ce2a53ee529990eba0e61b0d694d74a6e0c2bd37d57658c6e3173e9107f49f82afef85b8cb9a84af626d6e060e7f6d992c8606902b16abff848
 WHIRLPOOL 
4b235af854a5faba228d487498a06112ef138827e7abe14b73b04bc76cb9dabe02a623bf1e15597fcf6acdb79000942622de343fd57f8c02dad82fa1141535f3

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch
deleted file mode 100644
index fbaa5b5..
--- a/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6455e21ee1e1d52e9bd35e61f776031d37ca1b6c Mon Sep 17 00:00:00 2001
-From: Tobias Leupold 
-Date: Wed, 20 Jul 2016 22:53:06 +0200
-Subject: [PATCH] Fix building without KIPI.
-

- Viewer/InfoBox.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Viewer/InfoBox.cpp b/Viewer/InfoBox.cpp
-index 5c619c5..b37c0de 100644
 a/Viewer/InfoBox.cpp
-+++ b/Viewer/InfoBox.cpp
-@@ -34,6 +34,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- // Local includes
- #include "Browser/BrowserWidget.h"
--- 
-2.7.3
-

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild
deleted file mode 100644
index 7a17a16..
--- a/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
-gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se sk
-sv tr ug uk vi zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing 
images"
-HOMEPAGE="http://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug +exif +geolocation +kipi +raw"
-
-DEPEND="
-   >=dev-qt/qtsql-4.4:4[sqlite]
-   media-libs/phonon[qt4]
-   virtual/jpeg:0
-   exif? ( >=media-gfx/exiv2-0.17:= )
-   geolocation? ( $(add_kdeapps_dep marble) )
-   kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
-   raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
-"
-RDEPEND="${DEPEND}
-   media-video/mplayer
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with exif Exiv2)
-   $(cmake-utils_use_with geolocation Marble)
-   $(cmake-utils_use_with kipi)
-   $(cmake-utils_use_with raw Kdcraw)
-   )
-
-   kde4-base_src_configure
-}

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
deleted file mode 100644
index 23cd6c3..
--- a/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr
-ga gl hi hne hr hu is it ja 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-12-11 Thread Michael Palimaka
commit: 4b066fa925554245d2e4ead5eb5db7d20ea7f722
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Dec 11 18:41:30 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Dec 11 18:46:04 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b066fa9

media-gfx/kphotoalbum: stabilise 5.0.1 on amd64/x86

Package-Manager: portage-2.3.3

 media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
index 7f8ee13..3db7338 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kphotoalbum.org/;
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+face +kipi +map +raw"
 
 COMMON_DEPEND="



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2016-12-11 Thread Michael Palimaka
commit: 809669c7d78c443c904d0fdc9531edf0ac5ae112
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Dec 11 17:42:35 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Dec 11 17:43:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809669c7

media-gfx/kphotoalbum: backport misc build fixes from upstream

Package-Manager: portage-2.3.3

 .../files/kphotoalbum-5.0.1-buildbackports.patch   | 190 +
 media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild |  12 +-
 2 files changed, 193 insertions(+), 9 deletions(-)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch
new file mode 100644
index ..26eac8d
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.0.1-buildbackports.patch
@@ -0,0 +1,190 @@
+From 87d8f63d5966b36af60e9d4aac95196fcee30f91 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl 
+Date: Sun, 30 Oct 2016 21:52:03 +0100
+Subject: [PATCH] Review dependency list.
+
+Thanks to kensington for the suggestion!
+---
+ CMakeLists.txt | 23 ++-
+ 1 file changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 120a703..95f46c9 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -20,7 +20,7 @@ include(FeatureSummary)
+ 
+ find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network)
+ find_package(Phonon4Qt5 REQUIRED)
+-find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n KIO DocTools 
WidgetsAddons Config IconThemes Archive Parts JobWidgets)
++find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons 
DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons)
+ 
+ # enable exceptions:
+ kde_enable_exceptions()
+@@ -445,10 +445,23 @@ set(kphotoalbum_SRCS
+ add_executable(kphotoalbum ${kphotoalbum_SRCS})
+ 
+ # External components
+-target_link_libraries(kphotoalbum ${JPEG_LIBRARY})
+-target_link_libraries(kphotoalbum Qt5::Network)
+-target_link_libraries(kphotoalbum KF5::KIOCore KF5::CoreAddons KF5::I18n 
KF5::ConfigCore KF5::ConfigGui KF5::IconThemes KF5::Archive KF5::Parts 
KF5::JobWidgets KF5::WidgetsAddons)
+-target_link_libraries(kphotoalbum Phonon::phonon4qt5)
++target_link_libraries(kphotoalbum
++${JPEG_LIBRARY}
++KF5::Archive
++KF5::Completion
++KF5::ConfigCore
++KF5::ConfigGui
++KF5::CoreAddons
++KF5::I18n
++KF5::IconThemes
++KF5::JobWidgets
++KF5::KIOCore
++KF5::KIOWidgets
++KF5::TextWidgets
++KF5::WidgetsAddons
++Phonon::phonon4qt5
++Qt5::Network
++)
+ 
+ if(KF5Kipi_FOUND)
+ target_link_libraries(kphotoalbum KF5::Kipi)
+-- 
+2.7.3
+
+From e07a6ffd6a96a527e0ac26e9f12eb1bcd7767830 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl 
+Date: Thu, 8 Dec 2016 22:02:13 +0100
+Subject: [PATCH] Remove bogus dependency on KF5KExiv2
+
+---
+ CMakeLists.txt | 28 +++-
+ 1 file changed, 11 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1594af0..36228b8 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -92,15 +92,13 @@ set_package_properties(KF5KDcraw
+ )
+ set(HAVE_KDCRAW ${KF5KDcraw_FOUND} )
+ 
+-find_package(KF5KExiv2)
+-# FIXME: most of KPhotoAlbum uses plain libexiv:
+ find_package(Exiv2)
+-set_package_properties(KF5KExiv2
++set_package_properties(Exiv2
+ PROPERTIES
+ TYPE RECOMMENDED
+ PURPOSE "Enables image metadata (exiv) support (strongly advised!)"
+ )
+-set(HAVE_EXIV2 ${KF5KExiv2_FOUND})
++set(HAVE_EXIV2 ${Exiv2_FOUND})
+ 
+ if(ENABLE_PLAYGROUND)
+ find_package(KF5KFace 5.0.0 CONFIG)
+@@ -112,16 +110,12 @@ if(ENABLE_PLAYGROUND)
+ set(HAVE_KFACE ${KF5KFace_FOUND})
+ endif()
+ 
+-if(KF5KExiv2_FOUND)
+-find_package(KF5KGeoMap)
+-set_package_properties(KF5KGeoMap
+-PROPERTIES
+-TYPE OPTIONAL
+-PURPOSE "Enables support for geographic map location using embedded 
GPS information."
+-)
+-else()
+-message(STATUS "Not searching KF5KGeoMap because of missing dependency 
KF5KExiv2...")
+-endif()
++find_package(KF5KGeoMap)
++set_package_properties(KF5KGeoMap
++PROPERTIES
++TYPE OPTIONAL
++PURPOSE "Enables support for geographic map location using embedded GPS 
information."
++)
+ set(HAVE_KGEOMAP ${KF5KGeoMap_FOUND})
+ 
+ add_custom_target(
+@@ -433,7 +427,7 @@ add_subdirectory(script)
+ add_subdirectory(doc)
+ 
+ set(EXIV2_SRCS)
+-if(KF5KExiv2_FOUND AND Qt5Sql_FOUND)
++if(Exiv2_FOUND AND Qt5Sql_FOUND)
+ set(EXIV2_SRCS
+ #${CMAKE_CURRENT_SOURCE_DIR}/Browser/ExifFolder.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/Settings/ExifPage.cpp
+@@ -499,8 +493,8 @@ if(KF5KDcraw_FOUND)
+ target_link_libraries(kphotoalbum KF5::KDcraw)
+ endif()
+ 
+-if(KF5KExiv2_FOUND)
+-target_link_libraries(kphotoalbum KF5::KExiv2 ${EXIV2_LIBRARIES} Qt5::Sql)
++if(Exiv2_FOUND)
++

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-10-30 Thread Johannes Huber
commit: 1849ec78ab58210d9fa71e8bc160ab8462e0659e
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Oct 30 10:43:48 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Oct 30 10:44:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1849ec78

media-gfx/kphotoalbum: Version bump 5.0.1

Package-Manager: portage-2.3.2

 media-gfx/kphotoalbum/Manifest |  1 +
 media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild | 73 ++
 2 files changed, 74 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index b0b0593..1296e6b 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1,3 @@
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 
0cdd4e02e9e4f840550a20cc8dca8a01e4a55db19f0f8b15e903d2c342cd SHA512 
57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d
 WHIRLPOOL 
77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
 DIST kphotoalbum-4.7.2.tar.xz 9519864 SHA256 
313214df2b1dad2c9beb3e56051622155b142fcf67bdbaa65c3fff26790a SHA512 
30cb229a4c090981aec474ee9c45f257fe0b2a070ab788712962114868bdcb84e8d2b7f77c4186a30e4654e4196892cd243e7cc5579262d895e5ea2df0213195
 WHIRLPOOL 
88fb71ecf2925fa1ba43f833e6e47c43b3f38731cfc922027597d34fbd009e7850024a6b45c163f412a36908def97fddae12430bc96a36faa267c8dbaada634b
+DIST kphotoalbum-5.0.1.tar.xz 9539204 SHA256 
e43beb6cb93d749b30aa171ebce5ac5473b16704ea6d36bf6dcc2ce54328ce55 SHA512 
e182e0f594aa1ce2a53ee529990eba0e61b0d694d74a6e0c2bd37d57658c6e3173e9107f49f82afef85b8cb9a84af626d6e060e7f6d992c8606902b16abff848
 WHIRLPOOL 
4b235af854a5faba228d487498a06112ef138827e7abe14b73b04bc76cb9dabe02a623bf1e15597fcf6acdb79000942622de343fd57f8c02dad82fa1141535f3

diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
new file mode 100644
index ..85cfa21
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="http://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+exif +face +kipi +map +raw"
+
+REQUIRED_USE="map? ( exif )"
+
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(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 kwidgetsaddons)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtsql 'sqlite')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   media-libs/phonon[qt5]
+   virtual/jpeg:0
+   exif? (
+   $(add_kdeapps_dep libkexiv2)
+   >=media-gfx/exiv2-0.17:=
+   )
+   face? ( $(add_kdeapps_dep libkface) )
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   map? ( $(add_kdeapps_dep libkgeomap) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   media-video/mplayer
+   kipi? ( media-plugins/kipi-plugins:5 )
+   !media-gfx/kphotoalbum:4
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package exif Exiv2)
+   $(cmake-utils_use_find_package exif KF5KExiv2)
+   $(cmake-utils_use_find_package face KF5KFace)
+   $(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package map KF5KGeoMap)
+   $(cmake-utils_use_find_package raw KF5KDcraw)
+   )
+
+   kde5_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-08-11 Thread Michael Palimaka
commit: 434440044a2c8907fd86c7d5fc9c4b64134f7221
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Aug 11 20:31:46 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug 11 20:32:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43444004

media-gfx/kphotoalbum: remove redundant geolocation USE flag

Gentoo-bug: 591060

Package-Manager: portage-2.3.0

 media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
index c579b34..23cd6c3 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 LICENSE="GPL-2+ FDL-1.2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug +exif +face +geolocation +kipi +map +raw"
+IUSE="debug +exif +face +kipi +map +raw"
 
 REQUIRED_USE="map? ( exif )"
 
@@ -27,7 +27,6 @@ COMMON_DEPEND="
virtual/jpeg:0
exif? ( >=media-gfx/exiv2-0.17:= )
face? ( >=kde-apps/libkface-15.08.3:4 )
-   geolocation? ( $(add_kdeapps_dep marble) )
kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
map? ( >=kde-apps/libkgeomap-15.08.3:4 )
raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
@@ -46,7 +45,6 @@ src_configure() {
local mycmakeargs=(
-DWITH_Exiv2=$(usex exif)
-DWITH_Kface=$(usex face)
-   -DWITH_Marble=$(usex geolocation)
-DWITH_Kipi=$(usex kipi)
-DWITH_KGeoMap=$(usex map)
-DWITH_Kdcraw=$(usex raw)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-08-11 Thread Michael Palimaka
commit: 0cbd9863232f2e5adfd4bc7ccab71bb281ca7385
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Aug 11 20:32:02 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug 11 20:32:12 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cbd9863

media-gfx/kphotoalbum: remove old

Package-Manager: portage-2.3.0

 media-gfx/kphotoalbum/Manifest |  1 -
 media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild | 56 --
 2 files changed, 57 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index a9d01eb..b0b0593 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,2 @@
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 
0cdd4e02e9e4f840550a20cc8dca8a01e4a55db19f0f8b15e903d2c342cd SHA512 
57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d
 WHIRLPOOL 
77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
-DIST kphotoalbum-4.7.1.tar.xz 9515956 SHA256 
cc6ad5b63e9f724b58a7e0ad27714f0e0331a922ccd2acf91b4f33fe11ee7526 SHA512 
8b6eaebe1887dd720fcdce3afa49a71a3352b70dee1f9dc1d0218945c69d855c49b4ab46f38fe0a0fef131641da63f4948b088174012940042c7a71ca8a153c9
 WHIRLPOOL 
046d77d28856d39c96ac4c7e4cbe4d18d5ca4d7b14f5bde86c2e8890b6f4edfc827e524b8006641088af8a24b2b6fad3c57828848069d5b044a164dd85f83dc8
 DIST kphotoalbum-4.7.2.tar.xz 9519864 SHA256 
313214df2b1dad2c9beb3e56051622155b142fcf67bdbaa65c3fff26790a SHA512 
30cb229a4c090981aec474ee9c45f257fe0b2a070ab788712962114868bdcb84e8d2b7f77c4186a30e4654e4196892cd243e7cc5579262d895e5ea2df0213195
 WHIRLPOOL 
88fb71ecf2925fa1ba43f833e6e47c43b3f38731cfc922027597d34fbd009e7850024a6b45c163f412a36908def97fddae12430bc96a36faa267c8dbaada634b

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
deleted file mode 100644
index 397e100..000
--- a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr
-ga gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se 
sk
-sv tr ug uk vi zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing 
images"
-HOMEPAGE="http://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +exif +face +geolocation +kipi +map +raw"
-
-REQUIRED_USE="map? ( exif )"
-
-COMMON_DEPEND="
-   >=dev-qt/qtsql-4.4:4[sqlite]
-   media-libs/phonon[qt4]
-   virtual/jpeg:0
-   exif? ( >=media-gfx/exiv2-0.17:= )
-   face? ( >=kde-apps/libkface-15.08.3:4 )
-   geolocation? ( $(add_kdeapps_dep marble) )
-   kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
-   map? ( >=kde-apps/libkgeomap-15.08.3:4 )
-   raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
-"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   media-video/mplayer
-   kipi? ( >=media-plugins/kipi-plugins-4.7.0:4 )
-"
-
-DOCS=( ChangeLog README )
-PATCHES=( "${FILESDIR}/${P}-nokipi.patch" )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with exif Exiv2)
-   $(cmake-utils_use_with face Kface)
-   $(cmake-utils_use_with geolocation Marble)
-   $(cmake-utils_use_with kipi)
-   $(cmake-utils_use_with map KGeoMap)
-   $(cmake-utils_use_with raw Kdcraw)
-   )
-
-   kde4-base_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-07-31 Thread Michael Palimaka
commit: baae1dbdb6a32a255b891762c32327f1b0d13a48
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 31 19:11:57 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 31 19:12:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baae1dbd

media-gfx/kphotoalbum: version bump

Gentoo-bug: 590060

Package-Manager: portage-2.3.0

 media-gfx/kphotoalbum/Manifest |  1 +
 media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 2006cba..a9d01eb 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1,3 @@
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 
0cdd4e02e9e4f840550a20cc8dca8a01e4a55db19f0f8b15e903d2c342cd SHA512 
57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d
 WHIRLPOOL 
77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
 DIST kphotoalbum-4.7.1.tar.xz 9515956 SHA256 
cc6ad5b63e9f724b58a7e0ad27714f0e0331a922ccd2acf91b4f33fe11ee7526 SHA512 
8b6eaebe1887dd720fcdce3afa49a71a3352b70dee1f9dc1d0218945c69d855c49b4ab46f38fe0a0fef131641da63f4948b088174012940042c7a71ca8a153c9
 WHIRLPOOL 
046d77d28856d39c96ac4c7e4cbe4d18d5ca4d7b14f5bde86c2e8890b6f4edfc827e524b8006641088af8a24b2b6fad3c57828848069d5b044a164dd85f83dc8
+DIST kphotoalbum-4.7.2.tar.xz 9519864 SHA256 
313214df2b1dad2c9beb3e56051622155b142fcf67bdbaa65c3fff26790a SHA512 
30cb229a4c090981aec474ee9c45f257fe0b2a070ab788712962114868bdcb84e8d2b7f77c4186a30e4654e4196892cd243e7cc5579262d895e5ea2df0213195
 WHIRLPOOL 
88fb71ecf2925fa1ba43f833e6e47c43b3f38731cfc922027597d34fbd009e7850024a6b45c163f412a36908def97fddae12430bc96a36faa267c8dbaada634b

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
new file mode 100644
index 000..c579b34
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.7.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr
+ga gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se 
sk
+sv tr ug uk vi zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing 
images"
+HOMEPAGE="http://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +exif +face +geolocation +kipi +map +raw"
+
+REQUIRED_USE="map? ( exif )"
+
+COMMON_DEPEND="
+   >=dev-qt/qtsql-4.4:4[sqlite]
+   media-libs/phonon[qt4]
+   virtual/jpeg:0
+   exif? ( >=media-gfx/exiv2-0.17:= )
+   face? ( >=kde-apps/libkface-15.08.3:4 )
+   geolocation? ( $(add_kdeapps_dep marble) )
+   kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
+   map? ( >=kde-apps/libkgeomap-15.08.3:4 )
+   raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   media-video/mplayer
+   kipi? ( >=media-plugins/kipi-plugins-4.7.0:4 )
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_Exiv2=$(usex exif)
+   -DWITH_Kface=$(usex face)
+   -DWITH_Marble=$(usex geolocation)
+   -DWITH_Kipi=$(usex kipi)
+   -DWITH_KGeoMap=$(usex map)
+   -DWITH_Kdcraw=$(usex raw)
+   )
+
+   kde4-base_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2016-07-21 Thread Michael Palimaka
commit: a824a71f8ca4e27178fdc1282895bb56cabd56a5
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Jul 21 11:48:37 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Jul 21 11:48:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a824a71f

media-gfx/kphotoalbum: backport patch from upstream fixing build failure with 
USE="-kipi"

Gentoo-bug: 589282

Package-Manager: portage-2.3.0

 .../files/kphotoalbum-4.7.1-nokipi.patch   | 24 ++
 media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild |  1 +
 2 files changed, 25 insertions(+)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch
new file mode 100644
index 000..fbaa5b5
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.7.1-nokipi.patch
@@ -0,0 +1,24 @@
+From 6455e21ee1e1d52e9bd35e61f776031d37ca1b6c Mon Sep 17 00:00:00 2001
+From: Tobias Leupold 
+Date: Wed, 20 Jul 2016 22:53:06 +0200
+Subject: [PATCH] Fix building without KIPI.
+
+---
+ Viewer/InfoBox.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Viewer/InfoBox.cpp b/Viewer/InfoBox.cpp
+index 5c619c5..b37c0de 100644
+--- a/Viewer/InfoBox.cpp
 b/Viewer/InfoBox.cpp
+@@ -34,6 +34,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ // Local includes
+ #include "Browser/BrowserWidget.h"
+-- 
+2.7.3
+

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
index f51aea7..397e100 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
@@ -40,6 +40,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 DOCS=( ChangeLog README )
+PATCHES=( "${FILESDIR}/${P}-nokipi.patch" )
 
 src_configure() {
local mycmakeargs=(



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-07-10 Thread Johannes Huber
commit: af1ec8fcebfb70ec25ee1a638b60e4edc88754cc
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jul 10 10:25:16 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jul 10 10:25:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1ec8fc

media-gfx/kphotoalbum: Pin slot on media-plugins/kipi-plugins

Package-Manager: portage-2.3.0

 media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
index c4aa950..f51aea7 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
@@ -36,7 +36,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
media-video/mplayer
-   kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
+   kipi? ( >=media-plugins/kipi-plugins-4.7.0:4 )
 "
 
 DOCS=( ChangeLog README )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-03-09 Thread Michael Palimaka
commit: 33fff5a3335cecb36cefa25ef088e023af3544e7
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Mar  9 11:54:45 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar  9 11:54:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33fff5a3

media-gfx/kphotoalbum: remove old

Package-Manager: portage-2.2.27

 media-gfx/kphotoalbum/Manifest   |  1 -
 media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild | 56 
 2 files changed, 57 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index c509762..2006cba 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,2 @@
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 
0cdd4e02e9e4f840550a20cc8dca8a01e4a55db19f0f8b15e903d2c342cd SHA512 
57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d
 WHIRLPOOL 
77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
 DIST kphotoalbum-4.7.1.tar.xz 9515956 SHA256 
cc6ad5b63e9f724b58a7e0ad27714f0e0331a922ccd2acf91b4f33fe11ee7526 SHA512 
8b6eaebe1887dd720fcdce3afa49a71a3352b70dee1f9dc1d0218945c69d855c49b4ab46f38fe0a0fef131641da63f4948b088174012940042c7a71ca8a153c9
 WHIRLPOOL 
046d77d28856d39c96ac4c7e4cbe4d18d5ca4d7b14f5bde86c2e8890b6f4edfc827e524b8006641088af8a24b2b6fad3c57828848069d5b044a164dd85f83dc8
-DIST kphotoalbum-4.7.tar.xz 9514404 SHA256 
8b33cbe995b652740ee965b907abb96689588c1eac36340d9ace646d3018735d SHA512 
b441c5ebad3821dc72601e50bddcb7fe49c1f8cfd08ddc763692b69e3eb8affd2f5146d2cd9eb48d272d1f600ea40ee1d2a5bb7a14b6eaade558852154485100
 WHIRLPOOL 
037f04dfa31aba059ef76bf45b67d4268c81bd025b2c6e8bfb092aad2e30f7a829522624fb24a1163864c9e63a91f1bfa970a2f5465530c9577c46ae979c14c2

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild
deleted file mode 100644
index 13c0478..000
--- a/media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
-gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se sk
-sv tr ug uk vi zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing 
images"
-HOMEPAGE="http://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +exif +face +geolocation +kipi +map +raw"
-
-REQUIRED_USE="map? ( exif )"
-
-COMMON_DEPEND="
-   >=dev-qt/qtsql-4.4:4[sqlite]
-   media-libs/phonon[qt4]
-   virtual/jpeg:0
-   exif? ( >=media-gfx/exiv2-0.17:= )
-   face? ( >=kde-apps/libkface-4.7.0:4 )
-   geolocation? ( $(add_kdeapps_dep marble) )
-   kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
-   map? ( >=kde-apps/libkgeomap-4.7.0:4 )
-   raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
-"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   media-video/mplayer
-   kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
-"
-
-DOCS=( ChangeLog README )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with exif Exiv2)
-   $(cmake-utils_use_with face Kface)
-   $(cmake-utils_use_with geolocation Marble)
-   $(cmake-utils_use_with kipi)
-   $(cmake-utils_use_with map KGeoMap)
-   $(cmake-utils_use_with raw Kdcraw)
-   )
-
-   kde4-base_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-03-09 Thread Michael Palimaka
commit: 6781c99fffd5c6c8bdc538d6c01c219b5aa2a700
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Mar  9 11:54:30 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar  9 11:54:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6781c99f

media-gfx/kphotoalbum: version bump

Package-Manager: portage-2.2.27

 media-gfx/kphotoalbum/Manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 9a2e90e..c509762 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1,3 @@
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 
0cdd4e02e9e4f840550a20cc8dca8a01e4a55db19f0f8b15e903d2c342cd SHA512 
57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d
 WHIRLPOOL 
77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
+DIST kphotoalbum-4.7.1.tar.xz 9515956 SHA256 
cc6ad5b63e9f724b58a7e0ad27714f0e0331a922ccd2acf91b4f33fe11ee7526 SHA512 
8b6eaebe1887dd720fcdce3afa49a71a3352b70dee1f9dc1d0218945c69d855c49b4ab46f38fe0a0fef131641da63f4948b088174012940042c7a71ca8a153c9
 WHIRLPOOL 
046d77d28856d39c96ac4c7e4cbe4d18d5ca4d7b14f5bde86c2e8890b6f4edfc827e524b8006641088af8a24b2b6fad3c57828848069d5b044a164dd85f83dc8
 DIST kphotoalbum-4.7.tar.xz 9514404 SHA256 
8b33cbe995b652740ee965b907abb96689588c1eac36340d9ace646d3018735d SHA512 
b441c5ebad3821dc72601e50bddcb7fe49c1f8cfd08ddc763692b69e3eb8affd2f5146d2cd9eb48d272d1f600ea40ee1d2a5bb7a14b6eaade558852154485100
 WHIRLPOOL 
037f04dfa31aba059ef76bf45b67d4268c81bd025b2c6e8bfb092aad2e30f7a829522624fb24a1163864c9e63a91f1bfa970a2f5465530c9577c46ae979c14c2



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, profiles/

2016-03-09 Thread Michael Palimaka
commit: a8a9d3859a9a33fbc5096e2113aec2fb3d69ebce
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Mar  9 11:31:54 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar  9 11:44:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8a9d385

profiles: mask lxqt-base/liblxqt-mount & lxqt-base/lxqt-config-randr for removal

 media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild | 55 ++
 profiles/package.mask  |  5 +++
 2 files changed, 60 insertions(+)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
new file mode 100644
index 000..c4aa950
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.7.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr
+ga gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se 
sk
+sv tr ug uk vi zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing 
images"
+HOMEPAGE="http://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +exif +face +geolocation +kipi +map +raw"
+
+REQUIRED_USE="map? ( exif )"
+
+COMMON_DEPEND="
+   >=dev-qt/qtsql-4.4:4[sqlite]
+   media-libs/phonon[qt4]
+   virtual/jpeg:0
+   exif? ( >=media-gfx/exiv2-0.17:= )
+   face? ( >=kde-apps/libkface-15.08.3:4 )
+   geolocation? ( $(add_kdeapps_dep marble) )
+   kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
+   map? ( >=kde-apps/libkgeomap-15.08.3:4 )
+   raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   media-video/mplayer
+   kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_with exif Exiv2)
+   $(cmake-utils_use_with face Kface)
+   $(cmake-utils_use_with geolocation Marble)
+   $(cmake-utils_use_with kipi)
+   $(cmake-utils_use_with map KGeoMap)
+   $(cmake-utils_use_with raw Kdcraw)
+   )
+
+   kde4-base_src_configure
+}

diff --git a/profiles/package.mask b/profiles/package.mask
index 1b867da..d904f0b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -31,6 +31,11 @@
 #--- END OF EXAMPLES ---
 
 # Michael Palimaka  (09 Mar 2016)
+# Deprecated by upstream. No further releases. Unused.
+lxqt-base/liblxqt-mount
+lxqt-base/lxqt-config-randr
+
+# Michael Palimaka  (09 Mar 2016)
 # Dead upstream. Doesn't work with new Twitter API.
 # Masked for removal in 30 days. Bug 575156
 net-im/qwit



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/files/

2016-03-09 Thread Michael Palimaka
commit: edb240059ca249281205f11c03dd6b20c426cab2
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Mar  9 06:00:51 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar  9 10:44:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edb24005

media-gfx/kphotoalbum: remove unused patch

Package-Manager: portage-2.2.27

 .../files/kphotoalbum-4.6.2-bump-min-cmake.patch   | 31 --
 1 file changed, 31 deletions(-)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch
deleted file mode 100644
index f23a8f8..000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: David Faure 
-Date: Sun, 26 Jul 2015 16:12:24 +
-Subject: set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build 
accordingly
-X-Git-Url: 
http://quickgit.kde.org/?p=kphotoalbum.git=commitdiff=f785317ba88528760886b592aa9604b0c4ba62dd

-set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly
-
-(working around the lack of ${KDE4_KMEDIAPLAYER_LIBS})
-
-CCMAIL: kde-buildsys...@kde.org

-
-
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
-+cmake_minimum_required(VERSION 2.8.9)
- project(kphotoalbum)
- 
- if(POLICY CMP0017)
-@@ -456,7 +456,7 @@
- target_link_libraries(kphotoalbum Utilities)
- 
- # External components
--target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} 
kmediaplayer ${KDE4_PHONON_LIBS})
-+target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} 
${KDE4_TARGET_PREFIX}kmediaplayer ${KDE4_PHONON_LIBS})
- 
- if(KIPI_FOUND)
- target_link_libraries(kphotoalbum ${KIPI_LIBRARIES})
-



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-01-22 Thread Michael Palimaka
commit: 5e0dabb435337913ced9d92b3f9ff5ee0fff9967
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 22 10:36:01 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 22 10:36:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e0dabb4

media-gfx/kphotoalbum: remove old

As requested by upstream.

Gentoo-bug: 572376

Package-Manager: portage-2.2.27

 media-gfx/kphotoalbum/Manifest |  1 -
 media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild | 57 --
 2 files changed, 58 deletions(-)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index b80ca52..9a2e90e 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,2 @@
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 
0cdd4e02e9e4f840550a20cc8dca8a01e4a55db19f0f8b15e903d2c342cd SHA512 
57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d
 WHIRLPOOL 
77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
-DIST kphotoalbum-4.6.2.tar.xz 9503920 SHA256 
54c256a1943a632f7ff68126dc985e7f434e7b18c762ae40a49181b9d85f34fb SHA512 
437fb05a3e2f9f6f2ca97ba3ee17a125185ffe1603f3a37ad1b1bf837c49ee983e7ccf6858ad7243a7cae00eb2175f5a280bfd31cd5ed109ca46fa1ae8170a57
 WHIRLPOOL 
aaab45d3d5f2115206d98cd7db4953df21c3189ffc8f57f3291321f744cdf69fb138ec08f4af0b6b3f2db2b2281e8f468259cf0846784528e6fba64906b93459
 DIST kphotoalbum-4.7.tar.xz 9514404 SHA256 
8b33cbe995b652740ee965b907abb96689588c1eac36340d9ace646d3018735d SHA512 
b441c5ebad3821dc72601e50bddcb7fe49c1f8cfd08ddc763692b69e3eb8affd2f5146d2cd9eb48d272d1f600ea40ee1d2a5bb7a14b6eaade558852154485100
 WHIRLPOOL 
037f04dfa31aba059ef76bf45b67d4268c81bd025b2c6e8bfb092aad2e30f7a829522624fb24a1163864c9e63a91f1bfa970a2f5465530c9577c46ae979c14c2

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
deleted file mode 100644
index c94fc27..000
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
-gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se sk
-sv tr ug uk vi zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing 
images"
-HOMEPAGE="http://www.kphotoalbum.org/;
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +exif +face +geolocation +kipi +map +raw"
-
-REQUIRED_USE="map? ( exif )"
-
-COMMON_DEPEND="
-   >=dev-qt/qtsql-4.4:4[sqlite]
-   media-libs/phonon[qt4]
-   virtual/jpeg:0
-   exif? ( >=media-gfx/exiv2-0.17:= )
-   face? ( >=kde-apps/libkface-4.7.0 )
-   geolocation? ( $(add_kdeapps_dep marble) )
-   kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
-   map? ( >=kde-apps/libkgeomap-4.7.0:4 )
-   raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
-"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-   media-video/mplayer
-   kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-bump-min-cmake.patch" )
-DOCS=( ChangeLog README )
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with exif Exiv2)
-   $(cmake-utils_use_with face Kface)
-   $(cmake-utils_use_with geolocation Marble)
-   $(cmake-utils_use_with kipi)
-   $(cmake-utils_use_with map KGeoMap)
-   $(cmake-utils_use_with raw Kdcraw)
-   )
-
-   kde4-base_src_configure
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2016-01-22 Thread Michael Palimaka
commit: 36eed9bcc47a1a68a0c7f7603727be0da7ec4c75
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 22 10:34:23 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 22 10:36:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36eed9bc

media-gfx/kphotoalbum: version bump

Gentoo-bug: 572376

Package-Manager: portage-2.2.27

 media-gfx/kphotoalbum/Manifest   |  1 +
 media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild | 56 
 2 files changed, 57 insertions(+)

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index d2209e1..b80ca52 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,2 +1,3 @@
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 
0cdd4e02e9e4f840550a20cc8dca8a01e4a55db19f0f8b15e903d2c342cd SHA512 
57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d
 WHIRLPOOL 
77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
 DIST kphotoalbum-4.6.2.tar.xz 9503920 SHA256 
54c256a1943a632f7ff68126dc985e7f434e7b18c762ae40a49181b9d85f34fb SHA512 
437fb05a3e2f9f6f2ca97ba3ee17a125185ffe1603f3a37ad1b1bf837c49ee983e7ccf6858ad7243a7cae00eb2175f5a280bfd31cd5ed109ca46fa1ae8170a57
 WHIRLPOOL 
aaab45d3d5f2115206d98cd7db4953df21c3189ffc8f57f3291321f744cdf69fb138ec08f4af0b6b3f2db2b2281e8f468259cf0846784528e6fba64906b93459
+DIST kphotoalbum-4.7.tar.xz 9514404 SHA256 
8b33cbe995b652740ee965b907abb96689588c1eac36340d9ace646d3018735d SHA512 
b441c5ebad3821dc72601e50bddcb7fe49c1f8cfd08ddc763692b69e3eb8affd2f5146d2cd9eb48d272d1f600ea40ee1d2a5bb7a14b6eaade558852154485100
 WHIRLPOOL 
037f04dfa31aba059ef76bf45b67d4268c81bd025b2c6e8bfb092aad2e30f7a829522624fb24a1163864c9e63a91f1bfa970a2f5465530c9577c46ae979c14c2

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild
new file mode 100644
index 000..13c0478
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
+gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se sk
+sv tr ug uk vi zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing 
images"
+HOMEPAGE="http://www.kphotoalbum.org/;
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +exif +face +geolocation +kipi +map +raw"
+
+REQUIRED_USE="map? ( exif )"
+
+COMMON_DEPEND="
+   >=dev-qt/qtsql-4.4:4[sqlite]
+   media-libs/phonon[qt4]
+   virtual/jpeg:0
+   exif? ( >=media-gfx/exiv2-0.17:= )
+   face? ( >=kde-apps/libkface-4.7.0:4 )
+   geolocation? ( $(add_kdeapps_dep marble) )
+   kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
+   map? ( >=kde-apps/libkgeomap-4.7.0:4 )
+   raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
+"
+DEPEND="${COMMON_DEPEND}
+   sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+   media-video/mplayer
+   kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
+"
+
+DOCS=( ChangeLog README )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_with exif Exiv2)
+   $(cmake-utils_use_with face Kface)
+   $(cmake-utils_use_with geolocation Marble)
+   $(cmake-utils_use_with kipi)
+   $(cmake-utils_use_with map KGeoMap)
+   $(cmake-utils_use_with raw Kdcraw)
+   )
+
+   kde4-base_src_configure
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2015-12-31 Thread Michael Palimaka
commit: d93e0a203c50cc7f8e89797cadf2179ecee57649
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Dec 31 09:40:09 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Dec 31 09:41:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d93e0a20

media-gfx/kphotoalbum: add subslot operator for media-gfx/exiv2

Package-Manager: portage-2.2.26

 media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild   | 2 +-
 media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild
index d0b7ba0..7a17a16 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.5.ebuild
@@ -23,7 +23,7 @@ DEPEND="
>=dev-qt/qtsql-4.4:4[sqlite]
media-libs/phonon[qt4]
virtual/jpeg:0
-   exif? ( >=media-gfx/exiv2-0.17 )
+   exif? ( >=media-gfx/exiv2-0.17:= )
geolocation? ( $(add_kdeapps_dep marble) )
kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
index ad86cca..c94fc27 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
>=dev-qt/qtsql-4.4:4[sqlite]
media-libs/phonon[qt4]
virtual/jpeg:0
-   exif? ( >=media-gfx/exiv2-0.17 )
+   exif? ( >=media-gfx/exiv2-0.17:= )
face? ( >=kde-apps/libkface-4.7.0 )
geolocation? ( $(add_kdeapps_dep marble) )
kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, kde-apps/libkgeomap/, media-plugins/kipi-plugins/, ...

2015-10-22 Thread Michael Palimaka
commit: 3b732165b696e211f2cd088affc5a3c533d78c8b
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct 22 12:17:49 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct 22 12:17:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b732165

media-libs/libkgeomap: move to kde-apps/libkgeomap

 {media-libs => kde-apps}/libkgeomap/Manifest | 0
 {media-libs => kde-apps}/libkgeomap/libkgeomap-4.12.0.ebuild | 0
 {media-libs => kde-apps}/libkgeomap/libkgeomap-4.4.0.ebuild  | 0
 {media-libs => kde-apps}/libkgeomap/metadata.xml | 0
 media-gfx/digikam/digikam-4.10.0.ebuild  | 2 +-
 media-gfx/digikam/digikam-4.4.0-r1.ebuild| 2 +-
 media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild   | 2 +-
 media-gfx/kphotoalbum/metadata.xml   | 2 +-
 media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild| 2 +-
 media-plugins/kipi-plugins/kipi-plugins-4.4.0.ebuild | 2 +-
 media-plugins/kipi-plugins/metadata.xml  | 2 +-
 profiles/updates/4Q-2015 | 1 +
 12 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/media-libs/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
similarity index 100%
rename from media-libs/libkgeomap/Manifest
rename to kde-apps/libkgeomap/Manifest

diff --git a/media-libs/libkgeomap/libkgeomap-4.12.0.ebuild 
b/kde-apps/libkgeomap/libkgeomap-4.12.0.ebuild
similarity index 100%
rename from media-libs/libkgeomap/libkgeomap-4.12.0.ebuild
rename to kde-apps/libkgeomap/libkgeomap-4.12.0.ebuild

diff --git a/media-libs/libkgeomap/libkgeomap-4.4.0.ebuild 
b/kde-apps/libkgeomap/libkgeomap-4.4.0.ebuild
similarity index 100%
rename from media-libs/libkgeomap/libkgeomap-4.4.0.ebuild
rename to kde-apps/libkgeomap/libkgeomap-4.4.0.ebuild

diff --git a/media-libs/libkgeomap/metadata.xml 
b/kde-apps/libkgeomap/metadata.xml
similarity index 100%
rename from media-libs/libkgeomap/metadata.xml
rename to kde-apps/libkgeomap/metadata.xml

diff --git a/media-gfx/digikam/digikam-4.10.0.ebuild 
b/media-gfx/digikam/digikam-4.10.0.ebuild
index f10dd1a..adee011 100644
--- a/media-gfx/digikam/digikam-4.10.0.ebuild
+++ b/media-gfx/digikam/digikam-4.10.0.ebuild
@@ -33,6 +33,7 @@ CDEPEND="
kde-apps/libkdcraw:4=
kde-apps/libkexiv2:4=
>=kde-apps/libkface-4.6.0:4
+   >=kde-apps/libkgeomap-4.6.0:4=
kde-apps/libkipi:4
kde-apps/marble:4=[plasma]
kde-apps/kcmshell:4
@@ -40,7 +41,6 @@ CDEPEND="
media-libs/jasper
media-libs/lcms:2
>=media-libs/lensfun-0.2.6
-   >=media-libs/libkgeomap-4.6.0:=
media-libs/liblqr
>=media-libs/libpgf-6.12.27
media-libs/libpng:0=

diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild 
b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index 89d72ad..57376c3 100644
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -34,12 +34,12 @@ CDEPEND="
kde-apps/libkdcraw:4=
kde-apps/libkexiv2:4=
<=kde-apps/libkface-4.4.0
+   kde-apps/libkgeomap:4
kde-apps/libkipi:4
kde-apps/marble:4=[plasma]
media-libs/jasper
media-libs/lcms:2
media-libs/lensfun
-   media-libs/libkgeomap
media-libs/liblqr
>=media-libs/libpgf-6.12.27
media-libs/libpng:0=

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
index e6148bd..d83e74c 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@@ -29,7 +29,7 @@ COMMON_DEPEND="
face? ( >=kde-apps/libkface-4.7.0 )
geolocation? ( $(add_kdeapps_dep marble) )
kipi? ( $(add_kdeapps_dep libkipi '' 4.9.58) )
-   map? ( >=media-libs/libkgeomap-4.7.0 )
+   map? ( >=kde-apps/libkgeomap-4.7.0:4 )
raw? ( $(add_kdeapps_dep libkdcraw '' 4.9.58) )
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/media-gfx/kphotoalbum/metadata.xml 
b/media-gfx/kphotoalbum/metadata.xml
index 9c48c8d..01cc855 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -6,6 +6,6 @@
Enable face detection and recognition using 
media-libs/libkface
Add support for 
kde-apps/marble
Support for the KDE Image Plugin 
Interface
-   Enable map display support using 
media-libs/libkgeomap
+   Enable map display support using 
kde-apps/libkgeomap

 

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 c079988..5998747 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-4.12.0.ebuild
@@ -40,7 +40,7 @@ COMMONDEPEND="
dev-libs/libxslt
dev-libs/qjson
dev-qt/qtxmlpatterns:4
- 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/

2015-10-22 Thread Michael Palimaka
commit: af6b2d10371684182f5d83c47ab0eefa78ac29d1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct 22 12:18:54 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct 22 12:18:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6b2d10

media-gfx/kphotoalbum: update package category in local USE description

Package-Manager: portage-2.2.20.1

 media-gfx/kphotoalbum/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/kphotoalbum/metadata.xml 
b/media-gfx/kphotoalbum/metadata.xml
index 01cc855..eed8e30 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -3,7 +3,7 @@
 
kde

-   Enable face detection and recognition using 
media-libs/libkface
+   Enable face detection and recognition using 
kde-apps/libkface
Add support for 
kde-apps/marble
Support for the KDE Image Plugin 
Interface
Enable map display support using 
kde-apps/libkgeomap



[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/

2015-10-22 Thread Michael Palimaka
commit: 3df6fb500cb1b6120065db4a7a972ba84ef49dc1
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 17 10:02:19 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct 22 13:18:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df6fb50

media-gfx/kphotoalbum: Add upstream patch to match updated kdelibs4 policy

Package-Manager: portage-2.2.20.1

 .../files/kphotoalbum-4.6.2-bump-min-cmake.patch   | 31 ++
 media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild |  1 +
 2 files changed, 32 insertions(+)

diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch 
b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch
new file mode 100644
index 000..f23a8f8
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.2-bump-min-cmake.patch
@@ -0,0 +1,31 @@
+From: David Faure 
+Date: Sun, 26 Jul 2015 16:12:24 +
+Subject: set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build 
accordingly
+X-Git-Url: 
http://quickgit.kde.org/?p=kphotoalbum.git=commitdiff=f785317ba88528760886b592aa9604b0c4ba62dd
+---
+set cmake_min_req to 2.8.9 to match kdelibs4 policy; fix build accordingly
+
+(working around the lack of ${KDE4_KMEDIAPLAYER_LIBS})
+
+CCMAIL: kde-buildsys...@kde.org
+---
+
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
++cmake_minimum_required(VERSION 2.8.9)
+ project(kphotoalbum)
+ 
+ if(POLICY CMP0017)
+@@ -456,7 +456,7 @@
+ target_link_libraries(kphotoalbum Utilities)
+ 
+ # External components
+-target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} 
kmediaplayer ${KDE4_PHONON_LIBS})
++target_link_libraries(kphotoalbum ${KDE4_KIO_LIBS} ${JPEG_LIBRARY} 
${KDE4_TARGET_PREFIX}kmediaplayer ${KDE4_PHONON_LIBS})
+ 
+ if(KIPI_FOUND)
+ target_link_libraries(kphotoalbum ${KIPI_LIBRARIES})
+

diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
index d83e74c..ad86cca 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.2.ebuild
@@ -40,6 +40,7 @@ RDEPEND="${COMMON_DEPEND}
kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-bump-min-cmake.patch" )
 DOCS=( ChangeLog README )
 
 src_configure() {