app-misc/qbrew: Migrate to qt4-r2 eclass

svn path=/sunrise/; revision=9853

diff --git a/app-misc/qbrew/ChangeLog b/app-misc/qbrew/ChangeLog
index c7f8312a0b56bf957906628785abccb697b436f9..032053fcf560284d4cd486c20b09cda15c4d890c 100644 (file)
--- a/app-misc/qbrew/ChangeLog
+++ b/app-misc/qbrew/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-misc/qbrew
-# Copyright 1999-2008 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> qbrew-0.4.1.ebuild:
+  Migrate to qt4-r2 eclass
+
   04 Aug 2008; Tiago Cunha (tcunha) <me@tiagocunha.org> qbrew-0.4.1.ebuild:
   eqmake4 dies on its own
 

diff --git a/app-misc/qbrew/Manifest b/app-misc/qbrew/Manifest
index 687679bcfa0f44d13aa31326ded088140ba4bf65..2e3baaba9ae371725c0fd7122594687f0e018203 100644 (file)
--- a/app-misc/qbrew/Manifest
+++ b/app-misc/qbrew/Manifest
@@ -1,4 +1,4 @@
 DIST qbrew-0.4.1.tar.gz 291237 RMD160 47a87ae2600e16290526d0eaddf401e8edade285 SHA1 44c82fee8ec93f8c274c87b1b673cd0c44503dea SHA256 045747a8d3454caad416d2f1a26b8cce3c9c9984c62b928fa7366b3090576995
-EBUILD qbrew-0.4.1.ebuild 961 RMD160 2e14dc4c3d5408686f523a7628f8cac51b4d0440 SHA1 ff3dbe92bfc9f271fa23ef6f54ccd26fd68058ec SHA256 07634098ba80cacdd462103eb292d2c8da0eda076e326eafc98336d5e8fbb055
-MISC ChangeLog 1206 RMD160 10039f1ca8ac3261f72397ed74e12b94a7e4e83e SHA1 a7769b915741f908a04c5c9805aca14a8426159c SHA256 457fc50de39f402f7a7771363070e38ae88aa2d10e2be11e6da3a67d6c5bbcaa
+EBUILD qbrew-0.4.1.ebuild 887 RMD160 a1c5c61a190153af7278316f93c877e179de821a SHA1 99e357abc3938991c84af0b9b1a8d0e7345ca4a9 SHA256 947eecc2686141cdbc3288d566aca0e7c80ceca5931109d35d3b55b157606b51
+MISC ChangeLog 1307 RMD160 7fa68c987a3eb2b09ea69f868c9bef9f0a00e8c4 SHA1 76499e37b5951cf8637070e59239ebb122b8892c SHA256 95de369d64e8cc4841d548a33fa5fce93021e03d495635ac1ea7f5d6ea8dcb05
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/app-misc/qbrew/qbrew-0.4.1.ebuild b/app-misc/qbrew/qbrew-0.4.1.ebuild
index 6158f451ab15325f8837e4fc301f80fc3c94618a..7160f25e850d132a86a35b3ef92411be7b6f9956 100644 (file)
--- a/app-misc/qbrew/qbrew-0.4.1.ebuild
+++ b/app-misc/qbrew/qbrew-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
-inherit qt4 multilib
+EAPI="2"
+inherit qt4-r2 multilib
 
 DESCRIPTION="Homebrewer's recipe calculator"
 HOMEPAGE="http://www.usermode.org/code.html"
@@ -14,15 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="|| ( ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) >=x11-libs/qt-4.3:4 )"
+DEPEND="x11-libs/qt-gui:4"
 RDEPEND="${DEPEND}"
 
-src_compile() {
+src_configure() {
        export BINDIR="/usr/bin" DATADIR="/usr/share/${PN}" DOCDIR="/usr/share/doc/${P}"
        ./configure --qtdir="/usr/$(get_libdir)/qt4" || die "configure failed"
        echo "QT += xml" >> qbrew.pro
        eqmake4
-       emake || die "emake failed"
 }
 
 src_install() {