Dropping old ebuilds, using proper cmake-utils eclass. Fixes bug #267776

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 16 insertions, 120 deletions

diff --git a/media-gfx/wally/ChangeLog b/media-gfx/wally/ChangeLog
index 63ffdc90e8fd..e6bd0f9cd0bd 100644
--- a/media-gfx/wally/ChangeLog
+++ b/media-gfx/wally/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2009/04/30 18:53:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/ChangeLog,v 1.15 2009/05/08 11:29:32 hwoarang Exp $
+
+  08 May 2009; Markos Chandras <hwoarang@gentoo.org> -wally-2.0.1-r1.ebuild,
+  -wally-2.0.2.ebuild, wally-2.0.3.ebuild:
+  Dropping old ebuilds, using proper cmake-utils eclass. Fixes bug #267776
 
 *wally-2.0.3 (30 Apr 2009)
 
diff --git a/media-gfx/wally/wally-2.0.1-r1.ebuild b/media-gfx/wally/wally-2.0.1-r1.ebuild
deleted file mode 100644
index e24e2b48b05e..000000000000
--- a/media-gfx/wally/wally-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.0.1-r1.ebuild,v 1.2 2009/03/12 09:51:15 hwoarang Exp $
-
-EAPI="2"
-inherit eutils qt4
-
-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 kde"
-
-DEPEND="app-crypt/qca:2
-	media-libs/libexif
-	x11-libs/qt-gui:4
-	kde? (	>=kde-base/kdelibs-4.2.0 )"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	eqmake4
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use kde;then
-		cd "${S}"/wallyplugin/build
-		cmake .. || die "cmake wallyplugin failed"
-		emake || die "emake wallyplugin failed"
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	if use kde;then
-		cd "${S}"/wallyplugin/build
-		emake DESTDIR="${D}" install || die "emake install wallyplugin failed"
-	fi
-	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 "logout and login again on your KDE4 enviroment."
-		elog
-	fi
-}
diff --git a/media-gfx/wally/wally-2.0.2.ebuild b/media-gfx/wally/wally-2.0.2.ebuild
deleted file mode 100644
index fc5ce04b7c9c..000000000000
--- a/media-gfx/wally/wally-2.0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.0.2.ebuild,v 1.2 2009/03/29 21:28:32 hwoarang Exp $
-
-EAPI="2"
-inherit eutils qt4
-
-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 kde"
-
-DEPEND="media-libs/libexif
-	x11-libs/qt-svg:4
-	kde? (	>=kde-base/kdelibs-4.2.0 )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/disable_popup.patch
-)
-
-src_configure() {
-	eqmake4
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use kde;then
-		cd "${S}"/wallyplugin/build
-		cmake .. || die "cmake wallyplugin failed"
-		emake || die "emake wallyplugin failed"
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	if use kde;then
-		cd "${S}"/wallyplugin/build
-		emake DESTDIR="${D}" install || die "emake install wallyplugin failed"
-	fi
-	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
-}
diff --git a/media-gfx/wally/wally-2.0.3.ebuild b/media-gfx/wally/wally-2.0.3.ebuild
index 8210380d6a32..e519ae607429 100644
--- a/media-gfx/wally/wally-2.0.3.ebuild
+++ b/media-gfx/wally/wally-2.0.3.ebuild
@@ -1,9 +1,9 @@
 # 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.0.3.ebuild,v 1.1 2009/04/30 18:53:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/wally/wally-2.0.3.ebuild,v 1.2 2009/05/08 11:29:32 hwoarang Exp $
 
 EAPI="2"
-inherit eutils qt4
+inherit eutils cmake-utils qt4
 
 DESCRIPTION="A Qt4 wallpaper changer"
 HOMEPAGE="http://wally.sourceforge.net/"
@@ -20,24 +20,27 @@ DEPEND="media-libs/libexif
 
 RDEPEND="${DEPEND}"
 
+CMAKE_USE_DIR="${S}/wallyplugin/"
+CMAKE_IN_SOURCE_BUILD="1"
+
 src_configure() {
 	eqmake4
+	if use kde; then
+		cmake-utils_src_configure
+	fi
 }
 
 src_compile() {
 	emake || die "emake failed"
-	if use kde;then
-		cd "${S}"/wallyplugin/build
-		cmake .. || die "cmake wallyplugin failed"
-		emake || die "emake wallyplugin failed"
+	if use kde; then
+		cmake-utils_src_compile
 	fi
 }
 
 src_install() {
 	emake INSTALL_ROOT="${D}" install || die "emake install failed"
 	if use kde;then
-		cd "${S}"/wallyplugin/build
-		emake DESTDIR="${D}" install || die "emake install wallyplugin failed"
+		cmake-utils_src_install
 	fi
 	newicon "${S}"/res/images/idle.png wally.png
 	make_desktop_entry wally Wally wally "Graphics;Qt"