EAPI3, slotmove to 4, use array for makeargs, remove old

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 35 insertions, 88 deletions

diff --git a/media-gfx/wally/ChangeLog b/media-gfx/wally/ChangeLog
index 51c83d176b7e..ce5c61e59820 100644
--- a/media-gfx/wally/ChangeLog
+++ b/media-gfx/wally/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/wally
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/ChangeLog,v 1.31 2011/01/18 13:54:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/ChangeLog,v 1.32 2011/02/02 11:31:18 tampakrap Exp $
+
+  02 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> wally-2.3.2.ebuild,
+  -wally-2.4.ebuild, wally-2.4.1.ebuild:
+  EAPI3, slotmove to 4, use array for makeargs, remove old
 
   18 Jan 2011; Markos Chandras <hwoarang@gentoo.org> wally-2.4.1.ebuild:
   Adjust kdelibs dependency
diff --git a/media-gfx/wally/Manifest b/media-gfx/wally/Manifest
index b49bfa7cca10..7f6eca58dc2e 100644
--- a/media-gfx/wally/Manifest
+++ b/media-gfx/wally/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 AUX wally-2.3.2-disable-plugins.patch 582 RMD160 ac221d74cd5839ca024985a02108f409c36c5f27 SHA1 eba77db0e19c8d8a247583a29abac3d5ae04a862 SHA256 1283fb1a2cdcdced82b603502ce951943cab94f9245212b65269ab7a221d2d72
 DIST wally-2.3.2.tar.gz 1377912 RMD160 eccd7ca2b8268b185679d083ccd2ad935466396a SHA1 a41e157ff059178b6db3b9b1e2292680d6b6d9dc SHA256 cb30b0e1beb00b944dd293166a31ae88603167a4f9c9ac3a5ea5d0b669a2905d
 DIST wally-2.4.1.tar.gz 1546372 RMD160 837b5a4f69e316b205d9bb9c854a8462ea9a1990 SHA1 9d55219e48b5b87170b3dc3220eb9d3fb639408f SHA256 9e2f80aa84212546ea755900460be12aa6036c969bfa457ed3340d878ce44e57
-DIST wally-2.4.tar.gz 1544854 RMD160 5ad6a1b4a21f9b1e6a0991f084336c7b95e04eed SHA1 b29fde85c0f6485d6fa58b1334882ce4d8ae91b3 SHA256 657f032b54e7e2b1c7863543dfc1b014ac689c5b4bad25c44420641df822807f
-EBUILD wally-2.3.2.ebuild 1202 RMD160 a89b31f8f58c9553fee49152eaa8bd95111b94bd SHA1 d6098db37da610191988c5721a62524b375d4a56 SHA256 75d965b60d8e022d347c5ee37e28991a220bdb402c4576dd059b47b7398e1533
-EBUILD wally-2.4.1.ebuild 1165 RMD160 722de131e9664a33cbe3ac994562e80db4e2669e SHA1 dced39600af7a25b496430ab9ecb3c1a5e0b813d SHA256 46725e17397c30d428f017119c2251a24d7190cf342852b67e829c82e5f4671c
-EBUILD wally-2.4.ebuild 1266 RMD160 5709c736f33550fe43397d2a79f2831f92419e16 SHA1 52c95ab3f29cb019b2ed7247368935fddaa82ada SHA256 55e82dfca010d5715777b10f3070b05c4dd92233305b971933517827b4ee908b
-MISC ChangeLog 4369 RMD160 e0a23968ea9da1df4a95fe1a23a42cc2c6ceb82e SHA1 ef30133c3ad5ebad869c922612b84fa31935825f SHA256 8f4b316fb1bd1296e36e4c225eea91d9aaadcfcde6bf9fc40cd798fa2361b391
+EBUILD wally-2.3.2.ebuild 1196 RMD160 d9208fc59e811da6e22d92f8af5dfbf1855573d1 SHA1 b999dcc97cfec6d5bf57f5a36ae6b7492574bec5 SHA256 42508ce2fa450f6855379bb9f820e56563071ca50741b14fea9c3ec6de4fc003
+EBUILD wally-2.4.1.ebuild 1156 RMD160 58b5774403240824e9a3ad09e244cc4baa1a1c7a SHA1 6684cb8305c50a5ad1143213f11514c02ac3b507 SHA256 ec28a12bd54ca06f26f12f3d8405d6e9068574cc034270f0cd144620d45508bf
+MISC ChangeLog 4547 RMD160 5ec8f840c2ea6bfc69919e3e1f6c4ff4b0529507 SHA1 2b83760781d5e9553b1a199910b78b68d5468c26 SHA256 079313dc1d2cda04bfa83cad691257d111f0d83af34271dcecabb1a6c1b9bc2d
 MISC metadata.xml 276 RMD160 2f8c5d19292f59d08b397664c291a31066e3a95f SHA1 ad5320be3daeac9428333e9f26d381ac1be35595 SHA256 7711ca05305ebb1418d3e1ccad7ddf39f92f94a982c8f72dcd6bb424032c2e08
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk01m58ACgkQ9/cejkQaxBBzLQCdFpGNEzSqsUOIpyToL0OS1VE2
-2HcAn1yzYvOzntYiFPnLxYbcKk65tFaJ
-=hFmf
------END PGP SIGNATURE-----
diff --git a/media-gfx/wally/wally-2.3.2.ebuild b/media-gfx/wally/wally-2.3.2.ebuild
index d0f24f7d7981..0aee22e75f48 100644
--- a/media-gfx/wally/wally-2.3.2.ebuild
+++ b/media-gfx/wally/wally-2.3.2.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.3.2.ebuild,v 1.6 2010/07/14 13:29:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.3.2.ebuild,v 1.7 2011/02/02 11:31:18 tampakrap Exp $
 
-EAPI="2"
+EAPI=3
 KDE_REQUIRED="optional"
-inherit cmake-utils kde4-base
+inherit kde4-base
 
-DESCRIPTION="A Qt4 wallpaper changer"
+DESCRIPTION="A Qt4/KDE4 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="0"
+SLOT="4"
 KEYWORDS="amd64 x86"
-IUSE="debug"
+IUSE="debug kde"
 
-DEPEND="media-libs/libexif
+DEPEND="
+	media-libs/libexif
 	x11-libs/qt-svg:4
-	kde? (	>=kde-base/kdelibs-4.2.0 )"
+	kde? ( $(add_kdebase_dep kdelibs) )
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -31,7 +33,9 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs="${mycmakeargs} -DSTATIC=FALSE"
+	mycmakeargs=(
+		-DSTATIC=FALSE
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/media-gfx/wally/wally-2.4.1.ebuild b/media-gfx/wally/wally-2.4.1.ebuild
index 5e8d40e524bf..55276ae7dbfa 100644
--- a/media-gfx/wally/wally-2.4.1.ebuild
+++ b/media-gfx/wally/wally-2.4.1.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.4.1.ebuild,v 1.2 2011/01/18 13:54:50 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.4.1.ebuild,v 1.3 2011/02/02 11:31:18 tampakrap Exp $
 
-EAPI="2"
+EAPI=3
 KDE_REQUIRED="optional"
-inherit cmake-utils kde4-base
+inherit kde4-base
 
-DESCRIPTION="A Qt4 wallpaper changer"
+DESCRIPTION="A Qt4/KDE4 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="0"
+SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug kde"
 
-DEPEND="media-libs/libexif
+DEPEND="
+	media-libs/libexif
 	x11-libs/qt-svg:4
-	kde? (	>=kde-base/kdelibs-4.5.5 )"
+	kde? ( $(add_kdebase_dep kdelibs) )
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -30,7 +32,9 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs="${mycmakeargs} -DSTATIC=FALSE"
+	mycmakeargs=(
+		-DSTATIC=FALSE
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/media-gfx/wally/wally-2.4.ebuild b/media-gfx/wally/wally-2.4.ebuild
deleted file mode 100644
index 5e9e25a68fce..000000000000
--- a/media-gfx/wally/wally-2.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.4.ebuild,v 1.1 2010/08/24 06:53:49 wired Exp $
-
-EAPI="2"
-KDE_REQUIRED="optional"
-inherit cmake-utils kde4-base
-
-DESCRIPTION="A 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="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}/${PN}-2.2.0-disable_popup.patch"
-)
-
-src_prepare() {
-	# fix path or compile fails
-	sed "s:../build/:../../${P}_build/:g" -i res/wally.qrc || die "sed failed"
-
-	kde4-base_src_prepare
-	use kde || epatch "${FILESDIR}/${PN}-2.2.0-disable-kde4.patch"
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs} -DSTATIC=FALSE"
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon "${S}"/res/images/idle.png wally.png || die
-	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 in your KDE4 enviroment."
-		elog
-	fi
-}