media-gfx/kphotoalbum: Drop 5.4.2
authorAndreas Sturmlechner <asturm@gentoo.org>
Thu, 20 Jun 2019 09:46:18 +0000 (11:46 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Thu, 20 Jun 2019 09:46:18 +0000 (11:46 +0200)
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
media-gfx/kphotoalbum/Manifest
media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch [deleted file]
media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild [deleted file]

index 9d9358bb8939b83dac91e6e8aa6dcb4d6468bb4a..273ba5a88643437db435e06bf0f566255cf78450 100644 (file)
@@ -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 (file)
index 7b7f612..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 41c7da0531c8a1eb7046345c2b991e7a5d1e6657 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-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 <johannes@zarl-zierl.at>
-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 <QFile>
- #include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exv_conf.h>
-+#include <exiv2/version.hpp>
- 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 (file)
index f2dda9e..0000000
+++ /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) )
-       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
-}