Version bump. Remove old patch

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

6 files changed, 87 insertions, 22 deletions

diff --git a/media-gfx/wally/ChangeLog b/media-gfx/wally/ChangeLog
index 08521b0931d8..8c0087aaf13e 100644
--- a/media-gfx/wally/ChangeLog
+++ b/media-gfx/wally/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/wally
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/ChangeLog,v 1.17 2009/10/05 15:46:16 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/ChangeLog,v 1.18 2009/10/17 22:47:21 hwoarang Exp $
+
+*wally-2.2.0 (17 Oct 2009)
+
+  17 Oct 2009; Markos Chandras <hwoarang@gentoo.org> +wally-2.2.0.ebuild,
+  +files/wally-2.2.0-disable-kde4.patch,
+  +files/wally-2.2.0-disable_popup.patch, -files/disable_popup.patch:
+  Version bump. Remove old patch
 
   05 Oct 2009; Theo Chatzimichos <tampakrap@gentoo.org> wally-2.0.3.ebuild:
   Use kde4-base eclass in order to have better KDE intergration, also add
diff --git a/media-gfx/wally/Manifest b/media-gfx/wally/Manifest
index 3a4cdf9d0f81..740343248748 100644
--- a/media-gfx/wally/Manifest
+++ b/media-gfx/wally/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX disable_popup.patch 586 RMD160 0cb29c31a0c6533cce50ed5fce2bb008fb330936 SHA1 89afb0b380a74a467fafe3e988e842130da99a6a SHA256 6faee25c30bf75b51fbbc3b04fab4da6050830148120095b0065827b317244ff
+AUX wally-2.2.0-disable-kde4.patch 590 RMD160 eaf5b5a13824fabf57d858458bb9bb73182cf355 SHA1 327978c475a82f90577935e5a263a2a7661b87fa SHA256 240e98a4ac8bebaeb482606fd8fd9c491d7a24365afec81bceae193b890234ab
+AUX wally-2.2.0-disable_popup.patch 665 RMD160 7d4f3c522f5d4cbc517a7f5797df409f2c63b804 SHA1 b2307573e7f8f5be0eda142c46dff08a1a20d0ff SHA256 0371330a3caea92ef7ce024648ee865bae9167126d75a2ca1c43648c99ef9422
 DIST wally-2.0.1.tar.gz 591973 RMD160 a70537e4b7ed8fbb2e7ca6ef6b402504d912e502 SHA1 56014784c14c3464ef32a60ffa8193696b6502db SHA256 14885d50f46eb07f9d232b4065bb8618274c24fd0d9ebcaec541f9a5f55e4bc5
 DIST wally-2.0.3.tar.gz 639339 RMD160 03c1424181849e125500cae90a76aef323906300 SHA1 2a1132d79b11541d682bbec88eb68f3ef1fc129e SHA256 00fc3ea2afc0dd791d5b0260225e53e47a3491e4c6fe9a91a954e11ffd9dac79
+DIST wally-2.2.0.tar.gz 1301906 RMD160 71cc4df8c106edaf61c1e77ccc86c0493616cd9e SHA1 0868b37bb6469448ea7f46b43498f31d6a8fab50 SHA256 7e912abd08f7f97d81fcb4234b71c16af1280de6e2e195f6b1405ab85b6e2ab5
 EBUILD wally-2.0.1.ebuild 720 RMD160 c99de7d3a6996c17585441fab5ba2cee3a329dd4 SHA1 3606ae3411599795fd94c662d38cbf0f8f1ef3fd SHA256 31d818b76c68fe52ff065c8bb7763a58d7be00350a76748067bba0429c7c443f
 EBUILD wally-2.0.3.ebuild 1190 RMD160 6c1f2fa5b25f49604ac461ec32ce421038804ca4 SHA1 3775448648bc03252454eb153803294cc5c502ed SHA256 ae30ecf73d0f59efdaeaf1481beb7904aafc64b49c1f656a6753daef31bdc838
-MISC ChangeLog 2636 RMD160 b51dbae8d8e29317a3ad855f161a3f05b3b79abf SHA1 aaf13e8a5ef2f2f7642334793df50f35e3a6902c SHA256 b15c3e0dfb0163b9e572c36523ef326bfdf4c1cdcd3d161fc38dc42548a497c8
+EBUILD wally-2.2.0.ebuild 1016 RMD160 8f02b434c8a43845d1b46c78269785f8f2ad5240 SHA1 0e252a2fc8dc6d5b011cdae64e8ccfee7062ca99 SHA256 064eedc96ff7b1476528b076665a010073e449aedbe48c81535647779999a777
+MISC ChangeLog 2882 RMD160 b828e05519450c4a7832835010c89e8375de7d01 SHA1 61308abcd85ec3035c4f0b7764bf9ead1aa51be6 SHA256 96e9e375b84546d1c41ab5845638708c4713807fc280b458d3faeea24841f601
 MISC metadata.xml 260 RMD160 c11322cb6bc216e2428f91054488c358f04cc829 SHA1 b1c62bc34df6401eb72e9fceb10e5210e0399bbf SHA256 6bee883bb3b105ca14d1affe8ec193d911ebe1b78c341cf7a2aacec75955b5bb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrKFNMACgkQjDdoMVfcAHgQIwCgzSlgsF0ax1mFkoGd8ZNC+Het
-WugAn3S7SaQ2QkeG40mIZBG7/H4dRqGp
-=br8/
------END PGP SIGNATURE-----
diff --git a/media-gfx/wally/files/disable_popup.patch b/media-gfx/wally/files/disable_popup.patch
deleted file mode 100644
index 35b78cd97cfb..000000000000
--- a/media-gfx/wally/files/disable_popup.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: wally-2.0.2/wallyplugin/CMakeLists.txt
-===================================================================
---- wally-2.0.2.orig/wallyplugin/CMakeLists.txt
-+++ wally-2.0.2/wallyplugin/CMakeLists.txt
-@@ -22,4 +22,3 @@ install(TARGETS plasma_wallpaper_wallypl
- 
- install(FILES plasma-wallpaper-wallyplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- install(FILES wallyplugin.png DESTINATION ${ICON_INSTALL_DIR}/oxygen/16x16/apps)
--install(CODE "execute_process(COMMAND \"kdialog\" \"--title\" \"WallyPlugin\" \"--msgbox\" \"Please restart Plasma in order to use WallyPlugin\")")
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
new file mode 100644
index 000000000000..4639535a98fe
--- /dev/null
+++ b/media-gfx/wally/files/wally-2.2.0-disable-kde4.patch
@@ -0,0 +1,16 @@
+Index: wally-2.2.0/CMakeLists.txt
+===================================================================
+--- wally-2.2.0.orig/CMakeLists.txt
++++ wally-2.2.0/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/files/wally-2.2.0-disable_popup.patch b/media-gfx/wally/files/wally-2.2.0-disable_popup.patch
new file mode 100644
index 000000000000..24e91d9b152e
--- /dev/null
+++ b/media-gfx/wally/files/wally-2.2.0-disable_popup.patch
@@ -0,0 +1,11 @@
+Index: wallyplugin/CMakeLists.txt
+===================================================================
+--- wallyplugin.orig/CMakeLists.txt
++++ wallyplugin/CMakeLists.txt
+@@ -26,6 +26,3 @@ install(TARGETS plasma_wallpaper_wallypl
+ 
+ install(FILES plasma-wallpaper-wallyplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ install(FILES wallyplugin.png DESTINATION ${ICON_INSTALL_DIR}/oxygen/16x16/apps)
+-
+-install(CODE "execute_process(COMMAND kbuildsycoca4 OUTPUT_QUIET ERROR_QUIET)")
+-install(CODE "execute_process(COMMAND kdialog --title \"WallyPlugin\" --msgbox \"WallyPlugin will be loaded next time KDE is started. Please select it in Appearance Settings.\")")
diff --git a/media-gfx/wally/wally-2.2.0.ebuild b/media-gfx/wally/wally-2.2.0.ebuild
new file mode 100644
index 000000000000..323d5378a450
--- /dev/null
+++ b/media-gfx/wally/wally-2.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.2.0.ebuild,v 1.1 2009/10/17 22:47:21 hwoarang Exp $
+
+EAPI="2"
+
+KDE_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="A Qt4 wallpaper changer"
+HOMEPAGE="http://wally.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="media-libs/libexif
+	x11-libs/qt-svg:4
+	kde? (	>=kde-base/kdelibs-4.2.0 )"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable_popup.patch"
+	)
+
+src_prepare() {
+	kde4-base_src_prepare
+	! use kde && epatch "${FILESDIR}/${P}-disable-kde4.patch"
+}
+
+src_install() {
+	cmake-utils_src_install
+	newicon "${S}"/res/images/idle.png wally.png
+	make_desktop_entry wally Wally wally "Graphics;Qt"
+}
+
+pkg_postinst() {
+	if use kde;then
+		elog
+		elog "In order to use wallyplugin you need to"
+		elog "restart plasma on your KDE4 enviroment."
+		elog
+	fi
+}