1 |
commit: 7562815cf329f4f3dea152e55bdad21ad6bd37ce |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 1 15:36:35 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 1 16:15:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7562815c |
7 |
|
8 |
media-gfx/wally: Drop USE=kde, ebuild makeover, bug #629032 |
9 |
|
10 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
11 |
|
12 |
.../wally/files/wally-2.2.0-disable-kde4.patch | 14 -------- |
13 |
media-gfx/wally/wally-2.4.5.ebuild | 40 +++++++++------------- |
14 |
2 files changed, 16 insertions(+), 38 deletions(-) |
15 |
|
16 |
diff --git a/media-gfx/wally/files/wally-2.2.0-disable-kde4.patch b/media-gfx/wally/files/wally-2.2.0-disable-kde4.patch |
17 |
deleted file mode 100644 |
18 |
index 95f471ce1cd..00000000000 |
19 |
--- a/media-gfx/wally/files/wally-2.2.0-disable-kde4.patch |
20 |
+++ /dev/null |
21 |
@@ -1,14 +0,0 @@ |
22 |
---- a/CMakeLists.txt |
23 |
-+++ b/CMakeLists.txt |
24 |
-@@ -238,11 +238,6 @@ else( APPLE ) |
25 |
- add_custom_command( TARGET ${PROGNAME} POST_BUILD COMMAND strip ARGS ${WALLY_PATH} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) |
26 |
- endif( CMAKE_BUILD_TYPE STREQUAL Release ) |
27 |
- |
28 |
-- find_package( KDE4 ) |
29 |
-- if ( KDE4_FOUND ) |
30 |
-- add_subdirectory( ${CMAKE_SOURCE_DIR}/wallyplugin ) |
31 |
-- endif( KDE4_FOUND ) |
32 |
-- |
33 |
- endif( APPLE ) |
34 |
- |
35 |
- file( GLOB TS_FILES ${CMAKE_SOURCE_DIR}/res/lang/*.ts ) |
36 |
|
37 |
diff --git a/media-gfx/wally/wally-2.4.5.ebuild b/media-gfx/wally/wally-2.4.5.ebuild |
38 |
index 26ef94ccc9d..e22dcfe2f18 100644 |
39 |
--- a/media-gfx/wally/wally-2.4.5.ebuild |
40 |
+++ b/media-gfx/wally/wally-2.4.5.ebuild |
41 |
@@ -1,20 +1,18 @@ |
42 |
# Copyright 1999-2017 Gentoo Foundation |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
-EAPI=5 |
46 |
+EAPI=6 |
47 |
|
48 |
-KDE_REQUIRED="optional" |
49 |
-SQL_REQUIRED="always" |
50 |
-inherit eutils kde4-base readme.gentoo |
51 |
+inherit cmake-utils eutils xdg-utils |
52 |
|
53 |
-DESCRIPTION="A Qt4/KDE4 wallpaper changer" |
54 |
+DESCRIPTION="Qt4 wallpaper changer" |
55 |
HOMEPAGE="http://www.becrux.com/index.php?page=projects&name=wally" |
56 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
57 |
|
58 |
LICENSE="GPL-2" |
59 |
SLOT="4" |
60 |
KEYWORDS="amd64 x86" |
61 |
-IUSE="debug kde" |
62 |
+IUSE="debug" |
63 |
|
64 |
DEPEND=" |
65 |
dev-qt/qtcore:4 |
66 |
@@ -24,28 +22,17 @@ DEPEND=" |
67 |
dev-qt/qtsvg:4 |
68 |
media-libs/libexif |
69 |
x11-libs/libX11 |
70 |
- kde? ( kde-frameworks/kdelibs:4[plasma(+)] ) |
71 |
" |
72 |
RDEPEND="${DEPEND}" |
73 |
|
74 |
-DOCS=( |
75 |
- "AUTHORS" "ChangeLog" "README" "README.XFCE4" |
76 |
- "README.shortcuts" "TODO" |
77 |
-) |
78 |
-PATCHES=( |
79 |
- "${FILESDIR}"/${PN}-2.2.0-disable_popup.patch |
80 |
-) |
81 |
- |
82 |
-src_prepare() { |
83 |
- DOC_CONTENTS="In order to use wallyplugin you need to |
84 |
- restart plasma in your KDE4 enviroment." |
85 |
- kde4-base_src_prepare |
86 |
- use kde || epatch "${FILESDIR}"/${PN}-2.2.0-disable-kde4.patch |
87 |
-} |
88 |
+DOCS=( AUTHORS ChangeLog README README.XFCE4 README.shortcuts TODO ) |
89 |
+ |
90 |
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable_popup.patch ) |
91 |
|
92 |
src_configure() { |
93 |
- mycmakeargs=( |
94 |
+ local mycmakeargs=( |
95 |
-DSTATIC=FALSE |
96 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_KDE4=ON |
97 |
) |
98 |
cmake-utils_src_configure |
99 |
} |
100 |
@@ -54,9 +41,14 @@ src_install() { |
101 |
cmake-utils_src_install |
102 |
newicon "${S}"/res/images/idle.png wally.png |
103 |
make_desktop_entry wally Wally wally "Graphics;Qt" |
104 |
- use kde && readme.gentoo_create_doc |
105 |
} |
106 |
|
107 |
pkg_postinst() { |
108 |
- use kde && readme.gentoo_print_elog |
109 |
+ xdg_mimeinfo_database_update |
110 |
+ xdg_desktop_database_update |
111 |
+} |
112 |
+ |
113 |
+pkg_postrm() { |
114 |
+ xdg_mimeinfo_database_update |
115 |
+ xdg_desktop_database_update |
116 |
} |