commit: a612fa7f82e35f124ed194c76ecccc2ee3e3a1dc
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 16:47:16 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 16:47:16 2017 +0000
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..00000000
--- 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 <johan...@zarl-zierl.at>
-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 <johan...@zarl-zierl.at>
-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)
-+ target_link_libraries(kphotoalbum ${EXIV2_LIBRARIES} Qt5::Sql)
- endif()
-
- if(KF5KFace_FOUND)
---
-2.7.3
-
-From b17b99d25645b62838f7731b66d60a7efbbb5385 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <p...@kde.org>
-Date: Sat, 26 Nov 2016 17:06:35 +0100
-Subject: [PATCH] cmake: require KF5::XmlGui
-
-It is used explicitly (see KXmlGuiWindow), so it is needed to look for
-it and link to it.
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5fef0df..b24ab3b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -69,7 +69,7 @@ endforeach()
-
- find_package(Qt5 REQUIRED COMPONENTS Sql Xml Widgets Network)
- find_package(Phonon4Qt5 REQUIRED)
--find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons
DocTools I18n IconThemes JobWidgets KIO TextWidgets WidgetsAddons)
-+find_package(KF5 REQUIRED COMPONENTS Archive Completion Config CoreAddons
DocTools I18n IconThemes JobWidgets KIO TextWidgets XmlGui WidgetsAddons)
-
- find_package(JPEG REQUIRED)
- if(JPEG_FOUND)
-@@ -484,6 +484,7 @@ target_link_libraries(kphotoalbum
- KF5::KIOCore
- KF5::KIOWidgets
- KF5::TextWidgets
-+ KF5::XmlGui
- KF5::WidgetsAddons
- Phonon::phonon4qt5
- Qt5::Network
---
-2.7.3
-
-From e3c1911d5ad54f672cf086b041376f11ad4f446e Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johan...@zarl-zierl.at>
-Date: Thu, 27 Oct 2016 18:12:11 +0200
-Subject: [PATCH] Fix compilation with Qt 5.6.1
-
----
- HTMLGenerator/HTMLDialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/HTMLGenerator/HTMLDialog.cpp b/HTMLGenerator/HTMLDialog.cpp
-index 9aa619d..3e53c58 100644
---- a/HTMLGenerator/HTMLDialog.cpp
-+++ b/HTMLGenerator/HTMLDialog.cpp
-@@ -20,6 +20,7 @@
-
- #include <QCheckBox>
- #include <QComboBox>
-+#include <QDebug>
- #include <QDialogButtonBox>
- #include <QFileDialog>
- #include <QGroupBox>
---
-2.7.3
-
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
b/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
deleted file mode 100644
index 3db7338..00000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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-0.17:=
- 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 )
-PATCHES=( "${FILESDIR}/${P}-buildbackports.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(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
-}
