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

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

5 files changed, 18 insertions, 125 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/Manifest b/media-gfx/wally/Manifest
index 565befde2097..1bca6f295d72 100644
--- a/media-gfx/wally/Manifest
+++ b/media-gfx/wally/Manifest
@@ -1,12 +1,9 @@
 AUX disable_popup.patch 586 RMD160 0cb29c31a0c6533cce50ed5fce2bb008fb330936 SHA1 89afb0b380a74a467fafe3e988e842130da99a6a SHA256 6faee25c30bf75b51fbbc3b04fab4da6050830148120095b0065827b317244ff
 DIST wally-2.0.0.tar.gz 591510 RMD160 168000460fb28ade305ef2f4b06c0ff5db99b026 SHA1 d1abfcc2e0fa008f3a430c690e50ba8c195a5ccc SHA256 b5a0a2015403c63d4c83482c6325939b468d2acfdddea52f03c527422ce0be7b
 DIST wally-2.0.1.tar.gz 591973 RMD160 a70537e4b7ed8fbb2e7ca6ef6b402504d912e502 SHA1 56014784c14c3464ef32a60ffa8193696b6502db SHA256 14885d50f46eb07f9d232b4065bb8618274c24fd0d9ebcaec541f9a5f55e4bc5
-DIST wally-2.0.2.tar.gz 645280 RMD160 05d086c405a737896da7e33dca06c07cfcbdb027 SHA1 d526452121b2e2b1531280a488975b71db7d0464 SHA256 d01bbf9a04f10625e45d44f47c5a03cbdc0220caf556cd90a5cb451abe0b69e5
 DIST wally-2.0.3.tar.gz 639339 RMD160 03c1424181849e125500cae90a76aef323906300 SHA1 2a1132d79b11541d682bbec88eb68f3ef1fc129e SHA256 00fc3ea2afc0dd791d5b0260225e53e47a3491e4c6fe9a91a954e11ffd9dac79
 EBUILD wally-2.0.0.ebuild 721 RMD160 be30be3921e8cab7c75a06ca63e9e8cb83681e88 SHA1 bf027eea98f9f76d5786b7088bf12f03df7fa4b2 SHA256 67b1f04f5e77d02b1bbf6007986127e0aa84f9c0fdfa3a04b20717ac41e87f14
-EBUILD wally-2.0.1-r1.ebuild 1249 RMD160 14fe8b410d4a04f4d394c56a1904fd639158a60e SHA1 792383b42664adb7033a5170d86b42c704ce4072 SHA256 2bf449b98a9b98b350384ef0a50802abd8aeaf1e6a3c3c2b86c12b6ab9351ab1
 EBUILD wally-2.0.1.ebuild 720 RMD160 c99de7d3a6996c17585441fab5ba2cee3a329dd4 SHA1 3606ae3411599795fd94c662d38cbf0f8f1ef3fd SHA256 31d818b76c68fe52ff065c8bb7763a58d7be00350a76748067bba0429c7c443f
-EBUILD wally-2.0.2.ebuild 1269 RMD160 c2b467135f8969048eca36cec27b4729548d6191 SHA1 c0c74621de4837733cbfcf923494c3bba8600fd6 SHA256 c22ed20f1b28ed5aba3cb9e1abc270642e80899fb797737673676ee67bc2aa7d
-EBUILD wally-2.0.3.ebuild 1221 RMD160 8161e0cab67b126f2be888618acab86aaf6bb212 SHA1 3aa6d6b49c5e982f9c724de0ad297ebd620637ad SHA256 20b1bcd84dda28d8a346de02f11364078fce9031ccfc2fb6c81f3271590ce604
-MISC ChangeLog 2167 RMD160 f1c8ac45f22c54d5842267447a2b402caa94b041 SHA1 4054b48435b49c144dfb068b72798fdceac163e8 SHA256 3de5e9a981f3c89d0b59979c0874256b1c0779f4f34ff88567a98a8244134910
+EBUILD wally-2.0.3.ebuild 1177 RMD160 bebaebb0f8ebc11c80828b2209147db10121170c SHA1 4876ea2d86d5599301c1be21a9d0fd82ecbdbc03 SHA256 94c6c864211f950a66c0ecdc3506da05212256944764fc40fe1c0e4f44c67c14
+MISC ChangeLog 2363 RMD160 e09c8d34bc4243675b3baa6e12c6d2f4137e6087 SHA1 73ffc845c94a32537cae7610006ec9eaa1133fd4 SHA256 48ca549e9f052f73690af50cb12c9b4344889e976be290b0ec1514c7245c00e8
 MISC metadata.xml 260 RMD160 c11322cb6bc216e2428f91054488c358f04cc829 SHA1 b1c62bc34df6401eb72e9fceb10e5210e0399bbf SHA256 6bee883bb3b105ca14d1affe8ec193d911ebe1b78c341cf7a2aacec75955b5bb
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"