From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-976061-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 858B71396D0
for <garchives@archives.gentoo.org>; Sun, 1 Oct 2017 16:25:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 953AE2BC002;
Sun, 1 Oct 2017 16:25:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 631032BC002
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Oct 2017 16:25:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CB73633BDE1
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Oct 2017 16:25:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DB7373E3
for <gentoo-commits@lists.gentoo.org>; Sun, 1 Oct 2017 16:25:33 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1506874546.7562815cf329f4f3dea152e55bdad21ad6bd37ce.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/wally/, media-gfx/wally/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/wally/files/wally-2.2.0-disable-kde4.patch media-gfx/wally/wally-2.4.5.ebuild
X-VCS-Directories: media-gfx/wally/files/ media-gfx/wally/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 7562815cf329f4f3dea152e55bdad21ad6bd37ce
X-VCS-Branch: master
Date: Sun, 1 Oct 2017 16:25:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 9c3673b5-c46a-4457-8e2b-e05244c792b0
X-Archives-Hash: d95159ed6376f6bd0e4506a0dfaa3494
commit: 7562815cf329f4f3dea152e55bdad21ad6bd37ce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 1 15:36:35 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 1 16:15:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7562815c
media-gfx/wally: Drop USE=kde, ebuild makeover, bug #629032
Package-Manager: Portage-2.3.10, Repoman-2.3.3
.../wally/files/wally-2.2.0-disable-kde4.patch | 14 --------
media-gfx/wally/wally-2.4.5.ebuild | 40 +++++++++-------------
2 files changed, 16 insertions(+), 38 deletions(-)
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
deleted file mode 100644
index 95f471ce1cd..00000000000
--- a/media-gfx/wally/files/wally-2.2.0-disable-kde4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -238,11 +238,6 @@ else( APPLE )
- add_custom_command( TARGET ${PROGNAME} POST_BUILD COMMAND strip ARGS ${WALLY_PATH} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
- endif( CMAKE_BUILD_TYPE STREQUAL Release )
-
-- find_package( KDE4 )
-- if ( KDE4_FOUND )
-- add_subdirectory( ${CMAKE_SOURCE_DIR}/wallyplugin )
-- endif( KDE4_FOUND )
--
- endif( APPLE )
-
- file( GLOB TS_FILES ${CMAKE_SOURCE_DIR}/res/lang/*.ts )
diff --git a/media-gfx/wally/wally-2.4.5.ebuild b/media-gfx/wally/wally-2.4.5.ebuild
index 26ef94ccc9d..e22dcfe2f18 100644
--- a/media-gfx/wally/wally-2.4.5.ebuild
+++ b/media-gfx/wally/wally-2.4.5.ebuild
@@ -1,20 +1,18 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-KDE_REQUIRED="optional"
-SQL_REQUIRED="always"
-inherit eutils kde4-base readme.gentoo
+inherit cmake-utils eutils xdg-utils
-DESCRIPTION="A Qt4/KDE4 wallpaper changer"
+DESCRIPTION="Qt4 wallpaper changer"
HOMEPAGE="http://www.becrux.com/index.php?page=projects&name=wally"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="amd64 x86"
-IUSE="debug kde"
+IUSE="debug"
DEPEND="
dev-qt/qtcore:4
@@ -24,28 +22,17 @@ DEPEND="
dev-qt/qtsvg:4
media-libs/libexif
x11-libs/libX11
- kde? ( kde-frameworks/kdelibs:4[plasma(+)] )
"
RDEPEND="${DEPEND}"
-DOCS=(
- "AUTHORS" "ChangeLog" "README" "README.XFCE4"
- "README.shortcuts" "TODO"
-)
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2.0-disable_popup.patch
-)
-
-src_prepare() {
- DOC_CONTENTS="In order to use wallyplugin you need to
- restart plasma in your KDE4 enviroment."
- kde4-base_src_prepare
- use kde || epatch "${FILESDIR}"/${PN}-2.2.0-disable-kde4.patch
-}
+DOCS=( AUTHORS ChangeLog README README.XFCE4 README.shortcuts TODO )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable_popup.patch )
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DSTATIC=FALSE
+ -DCMAKE_DISABLE_FIND_PACKAGE_KDE4=ON
)
cmake-utils_src_configure
}
@@ -54,9 +41,14 @@ src_install() {
cmake-utils_src_install
newicon "${S}"/res/images/idle.png wally.png
make_desktop_entry wally Wally wally "Graphics;Qt"
- use kde && readme.gentoo_create_doc
}
pkg_postinst() {
- use kde && readme.gentoo_print_elog
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
}