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

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

4 files changed, 32 insertions, 73 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/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
-}