From b18d9804ff0dfaa63f3ef922482625ceea4b8799 Mon Sep 17 00:00:00 2001
From: Leonardo Valeri Manera <lvalerimanera@gmail.com>
Date: Wed, 7 May 2008 08:37:31 +0200
Subject: [PATCH] app-pda/rbutil: -9999, add proper qt4.4 depblock.

---
 app-pda/rbutil/Manifest           |  2 +-
 app-pda/rbutil/rbutil-9999.ebuild | 29 ++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app-pda/rbutil/Manifest b/app-pda/rbutil/Manifest
index 0fd8663..e466007 100644
--- a/app-pda/rbutil/Manifest
+++ b/app-pda/rbutil/Manifest
@@ -1 +1 @@
-EBUILD rbutil-9999.ebuild 1022 RMD160 abcab244e74f0c9141ca10bd2ab175cce093f5dc SHA1 8794e7128f74710699c13b6342ea0f1009e67577 SHA256 8b42a1fe0b79261b5ab9bc608f314b5fced11b5783f6a25bad881d755eb7ba44
+EBUILD rbutil-9999.ebuild 1104 RMD160 c716cecb45e961435037d97f9acfef4ac6f1b392 SHA1 d5b6f811890e8a06981646db4fce544479e226b7 SHA256 3a6b4d4fe9229112a8caf2cc8c5bfb846e7087d2dbeb0153f6b77fc850c89b52
diff --git a/app-pda/rbutil/rbutil-9999.ebuild b/app-pda/rbutil/rbutil-9999.ebuild
index c74f5dc..0a56427 100644
--- a/app-pda/rbutil/rbutil-9999.ebuild
+++ b/app-pda/rbutil/rbutil-9999.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 inherit subversion
 
 ESVN_REPO_URI="svn://svn.rockbox.org/rockbox/trunk"
@@ -16,14 +18,19 @@ IUSE=""
 KEYWORDS="~x86 ~amd64"
 
 DEPEND="${RDEPEND}"
-RDEPEND=">=x11-libs/qt-4.3"
-
-src_unpack()
-{
-	mkdir -p ${S}/rbutil ${S}/tools ${S}/apps/codecs/libspeex
+RDEPEND="|| (
+			  (
+				x11-libs/qt-core:4
+				x11-libs/qt-gui:4
+			  )
+			  =x11-libs/qt-4.3*:4
+			)"
+
+src_unpack() {
+	mkdir -p "${S}"/rbutil "${S}"/tools "${S}"/apps/codecs/libspeex
 	subversion_fetch ${ESVN_REPO_URI}/rbutil rbutil
-        subversion_fetch ${ESVN_REPO_URI}/tools tools
-        subversion_fetch ${ESVN_REPO_URI}/apps/codecs/libspeex apps/codecs/libspeex
+	subversion_fetch ${ESVN_REPO_URI}/tools tools
+	subversion_fetch ${ESVN_REPO_URI}/apps/codecs/libspeex apps/codecs/libspeex
 }
 
 src_compile() {
@@ -33,9 +40,9 @@ src_compile() {
 }
 
 src_install() {
-	dobin ${S}/rbutil/rbutilqt/rbutilqt
-	insinto "/etc"
-	doins ${S}/rbutil/rbutilqt/rbutil.ini
-	newicon ${S}/rbutil/rbutilqt/icons/rockbox.ico ${PN}.ico
+	dobin "${S}"/rbutil/rbutilqt/rbutilqt
+	insinto /etc
+	doins "${S}"/rbutil/rbutilqt/rbutil.ini
+	newicon "${S}"/rbutil/rbutilqt/icons/rockbox.ico ${PN}.ico
 	make_desktop_entry rbutilqt "Rockbox Utility" /usr/share/pixmaps/${PN}.ico
 }
-- 
2.11.4.GIT