Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/, kde-misc/basket/files/
Date: Wed, 30 Jan 2019 23:56:46
Message-Id: 1548892590.6784986b6ef90624a8cf0f1b7008d2aabebc885b.asturm@gentoo
1 commit: 6784986b6ef90624a8cf0f1b7008d2aabebc885b
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 30 23:34:23 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 30 23:56:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6784986b
7
8 kde-misc/basket: Drop 2.49a_p20170225-r1 snapshot
9
10 Package-Manager: Portage-2.3.59, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-misc/basket/Manifest | 1 -
14 kde-misc/basket/basket-2.49a_p20170225-r1.ebuild | 72 ----------------------
15 .../files/basket-2.49a_p20170225-fixes.patch | 61 ------------------
16 3 files changed, 134 deletions(-)
17
18 diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
19 index 28ae7fcf2d9..643127e6269 100644
20 --- a/kde-misc/basket/Manifest
21 +++ b/kde-misc/basket/Manifest
22 @@ -1,2 +1 @@
23 -DIST basket-2.49a_p20170225.tar.gz 4680129 BLAKE2B f6a7acc8b83596815a79f9dd73879f9471d2a9ae9096d521ef98faeaaa2f3f2c6dc46c05ed0097fa1b20cf66479b5127b625eb60b0257fb1579bfc1d73f2e989 SHA512 87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c
24 DIST basket-2.49a_p20181205.tar.gz 4689215 BLAKE2B dce87001622aac8e50957d87d36c9094a807765d96bc60fe450fed0f293e0e21ead7529c57eaecc97c4f56d5bce7fabd34a564f632fc56f0c83621fac4092dee SHA512 62c6a337f634be374ee8631c8b88a78097ae4badd905e6be556f11fa841cc03ab32ab563f59a865d1bc85f105ec273472734c42f1bff834e4d7219c258d82281
25
26 diff --git a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
27 deleted file mode 100644
28 index 8cc9279a602..00000000000
29 --- a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
30 +++ /dev/null
31 @@ -1,72 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -COMMIT="8de0345d99f3eb08d9406bd07e88b31afe46f315"
38 -KDE_TEST="true"
39 -KDE_HANDBOOK="forceoptional"
40 -VIRTUALX_REQUIRED="test"
41 -inherit kde5 vcs-snapshot
42 -
43 -DESCRIPTION="A DropDrawers clone. Multiple information organizer"
44 -HOMEPAGE="https://github.com/basket-notepads/basket"
45 -SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
46 -
47 -LICENSE="GPL-2"
48 -KEYWORDS="amd64 x86"
49 -IUSE="crypt git"
50 -
51 -RDEPEND="
52 - $(add_frameworks_dep karchive)
53 - $(add_frameworks_dep kcmutils)
54 - $(add_frameworks_dep kcodecs)
55 - $(add_frameworks_dep kcompletion)
56 - $(add_frameworks_dep kconfig)
57 - $(add_frameworks_dep kconfigwidgets)
58 - $(add_frameworks_dep kcoreaddons)
59 - $(add_frameworks_dep kcrash)
60 - $(add_frameworks_dep kdbusaddons)
61 - $(add_frameworks_dep kfilemetadata)
62 - $(add_frameworks_dep kglobalaccel)
63 - $(add_frameworks_dep kguiaddons)
64 - $(add_frameworks_dep ki18n)
65 - $(add_frameworks_dep kiconthemes)
66 - $(add_frameworks_dep kio)
67 - $(add_frameworks_dep knotifications)
68 - $(add_frameworks_dep kparts)
69 - $(add_frameworks_dep kservice)
70 - $(add_frameworks_dep ktextwidgets)
71 - $(add_frameworks_dep kwidgetsaddons)
72 - $(add_frameworks_dep kwindowsystem)
73 - $(add_frameworks_dep kxmlgui)
74 - $(add_qt_dep qtdbus)
75 - $(add_qt_dep qtgui)
76 - $(add_qt_dep qtnetwork)
77 - $(add_qt_dep qtwidgets)
78 - $(add_qt_dep qtxml)
79 - media-libs/phonon[qt5(+)]
80 - x11-libs/libX11
81 - crypt? ( app-crypt/gpgme:= )
82 - git? ( dev-libs/libgit2:= )
83 -"
84 -DEPEND="${RDEPEND}
85 - $(add_qt_dep qtconcurrent)
86 -"
87 -
88 -PATCHES=( "${FILESDIR}/${P}-fixes.patch" )
89 -
90 -src_prepare() {
91 - kde5_src_prepare
92 - if ! use test; then
93 - sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die
94 - fi
95 -}
96 -
97 -src_configure() {
98 - local mycmakeargs=(
99 - $(cmake-utils_use_find_package crypt Gpgme)
100 - $(cmake-utils_use_find_package git Libgit2)
101 - )
102 - kde5_src_configure
103 -}
104
105 diff --git a/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch b/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch
106 deleted file mode 100644
107 index 82ca2e8e26e..00000000000
108 --- a/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch
109 +++ /dev/null
110 @@ -1,61 +0,0 @@
111 -From 26e8fe568123cc957ea500c4b747f44fa8193edc Mon Sep 17 00:00:00 2001
112 -From: Gleb Baryshev <gleb.baryshev@×××××.com>
113 -Date: Sun, 13 Aug 2017 21:37:52 +0300
114 -Subject: [PATCH] Fix KF5 issues
115 -
116 -#33 Library has wrong versioning (libbasketcommon.so.SOVERSION)
117 -#34 Translations are not properly used
118 -#35 Documentation still requires kdelibs4support for dtd/ktex.dtd
119 ----
120 - CMakeLists.txt | 3 +++
121 - doc/en/index.docbook | 4 ++--
122 - src/CMakeLists.txt | 4 ++--
123 - 3 files changed, 7 insertions(+), 4 deletions(-)
124 -
125 -diff --git a/CMakeLists.txt b/CMakeLists.txt
126 -index 2997365e..7b54ace3 100644
127 ---- a/CMakeLists.txt
128 -+++ b/CMakeLists.txt
129 -@@ -92,6 +92,9 @@ ENDIF(GPGME_FOUND)
130 -
131 - #TODO: find meinproc
132 -
133 -+#Make libbasketcommon search for translations in basket.mo
134 -+ADD_DEFINITIONS(-DTRANSLATION_DOMAIN=\"basket\")
135 -+
136 - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
137 - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
138 -
139 -diff --git a/doc/en/index.docbook b/doc/en/index.docbook
140 -index ddef489a..586014e8 100644
141 ---- a/doc/en/index.docbook
142 -+++ b/doc/en/index.docbook
143 -@@ -1,5 +1,5 @@
144 - <?xml version="1.0" encoding="UTF-8" ?>
145 --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
146 -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
147 - <!ENTITY basket "<application>BasKet</application>">
148 - <!ENTITY % addindex "IGNORE">
149 - <!ENTITY % English "INCLUDE" > <!-- change language only here -->
150 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
151 -index 9ea886d5..f4cf523f 100644
152 ---- a/src/CMakeLists.txt
153 -+++ b/src/CMakeLists.txt
154 -@@ -59,7 +59,7 @@ IF(HAVE_BALOO)
155 - list(INSERT basketcommon_LIB_SRCS 10 nepomukintegration.cpp)
156 - ENDIF(HAVE_BALOO)
157 -
158 --qt5_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
159 -+ki18n_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
160 -
161 - QT5_ADD_DBUS_ADAPTOR(basketcommon_LIB_SRCS org.basket.BNPView.xml bnpview.h BNPView)
162 -
163 -@@ -93,7 +93,7 @@ IF(HAVE_BALOO)
164 - target_link_libraries(basketcommon KF5::BalooFiles)
165 - ENDIF(HAVE_BALOO)
166 -
167 --set_target_properties(basketcommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
168 -+set_target_properties(basketcommon PROPERTIES VERSION ${Qt5Core_VERSION} SOVERSION ${Qt5Core_VERSION_MAJOR})
169 -
170 - install(TARGETS basketcommon DESTINATION ${LIB_INSTALL_DIR})
171 -