sci-libs/candystore: Migrate to qt4-r2 eclass

svn path=/sunrise/; revision=9862

diff --git a/sci-libs/candystore/ChangeLog b/sci-libs/candystore/ChangeLog
index 0dcc8eaf7807d39dd8f36e061ab15a02c020d7e0..ecbbc8fa891c068b6b4875ec6f4ff3d21f1bf958 100644 (file)
--- a/sci-libs/candystore/ChangeLog
+++ b/sci-libs/candystore/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/candystore
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jan 2010; Markos Chandras <hwoarang@gentoo.org>
+  candystore-0.0.5.ebuild:
+  Migrate to qt4-r2 eclass
+
   13 Feb 2009; Oliver Borm (boroli) <oli.borm@web.de>
   -candystore-0.0.3.ebuild, +candystore-0.0.5.ebuild:
   Version bump

diff --git a/sci-libs/candystore/Manifest b/sci-libs/candystore/Manifest
index 30efcf471c567db8cecadba84a2f186289eaee8b..3badb2671f25932eab63a98f3ecefe61e09e2533 100644 (file)
--- a/sci-libs/candystore/Manifest
+++ b/sci-libs/candystore/Manifest
@@ -1,4 +1,4 @@
 DIST candystore-0.0.5.zip 674942 RMD160 eba28317a78f93a0b53d2cddba8a1695956764ca SHA1 f9c469d57b5ec2261d9cbcce00e828ba9942268a SHA256 e84b83d2bd9b34f889b84f8274624fb8ac4e9c9503e5275c9a6f22d6ab285065
-EBUILD candystore-0.0.5.ebuild 747 RMD160 5f85b05e1e7210978eee493e944613ad9271cc17 SHA1 1a4128fcb1513a1dcb4ed8d008b197b0cedf4f8e SHA256 b1a95638aacd2bd5265631581eef8f74685685b9341f8fbe6536b73f5174fab9
-MISC ChangeLog 742 RMD160 5e4eb444c962bb99da653360ed56931fe78df8d7 SHA1 36e21c749ff99b32a665365a15a8ba2043c71b78 SHA256 4dcc84e874f73a4fd4ac90cead86d3d3b2b98732d2cff4c4418f7f3876967b95
+EBUILD candystore-0.0.5.ebuild 710 RMD160 192bed860fa64f4c167cd3c1013b9f7df0c11ddc SHA1 5fe9cf5a547fe6281ebd4a74cd5362ef2652824f SHA256 79ee2c115401d7397b4fe649c10ec7afb4950fe24c57d84c63098e08021cb706
+MISC ChangeLog 850 RMD160 73bd9de5306462da9a4e8d982f172593102201fe SHA1 fe08e1a663a1eb538f3ff82257bee6764358a006 SHA256 ee6efe9f5629c53ec1e057eed6a2a650d65fd379337e243a341f336abd802619
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/sci-libs/candystore/candystore-0.0.5.ebuild b/sci-libs/candystore/candystore-0.0.5.ebuild
index fb22bf839a428f369b694ac9bb2e5fc6102018db..ca9fb1ab21c047e26eedd386ddbf3004468d4524 100644 (file)
--- a/sci-libs/candystore/candystore-0.0.5.ebuild
+++ b/sci-libs/candystore/candystore-0.0.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt4
+EAPI="2"
+
+inherit qt4-r2
 
 MY_PN="CandyStore"
 
@@ -15,14 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND="|| ( x11-libs/qt-gui >=x11-libs/qt-4.3 )"
+DEPEND="x11-libs/qt-gui:4"
 RDEPEND=${DEPEND}
 
 S=${WORKDIR}/${MY_PN}
 
-src_compile() {
+src_configure() {
        eqmake4 ${MY_PN}.pro -o Makefile PREFIX=/usr
-       emake || die "emake failed"
 }
 
 src_install() {