app-misc/rbutil: Bump, fix qt deps, EAPI bump

[~andy/sunrise] / app-misc / rbutil / rbutil-1.2.14.ebuild

diff --git a/app-misc/rbutil/rbutil-1.2.8.ebuild b/app-misc/rbutil/rbutil-1.2.14.ebuild
similarity index 75%
rename from app-misc/rbutil/rbutil-1.2.8.ebuild
rename to app-misc/rbutil/rbutil-1.2.14.ebuild
index 104aa46e04d73f561894f6429a35c26a63c6654b..e6b51a43f3f45a4b4978c55e33666de5e36903aa 100644 (file)
--- a/app-misc/rbutil/rbutil-1.2.8.ebuild
+++ b/app-misc/rbutil/rbutil-1.2.14.ebuild
@@ -2,16 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI="5"
 LANGS="cs de fi fr he it ja nl pl pt pt_BR ru tr zh_CN zh_TW"
 
 inherit eutils qt4-r2
 
-MY_P=${PN}_${PV}
-
 DESCRIPTION="Rockbox opensource firmware manager for mp3 players"
 HOMEPAGE="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility"
-SRC_URI="http://download.rockbox.org/${PN}/source/${MY_P}-src.tar.bz2"
+SRC_URI="http://download.rockbox.org/${PN}/source/RockboxUtility-v${PV}-src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,11 +22,7 @@ RDEPEND="media-libs/speex
        virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}/${PN}/${PN}qt
-
-src_prepare() {
-       epatch "${FILESDIR}/${PV}"-fix-parallel-make.patch
-}
+S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
 
 src_configure() {
        # generate binary translations
@@ -40,6 +34,7 @@ src_configure() {
 
 src_install() {
        newbin RockboxUtility ${PN} || die
-       newicon icons/rockbox-5.png ${PN}.png || die
+       # FIXME: is this the right icon?
+       newicon icons/rockbox.ico ${PN}.png || die
        make_desktop_entry ${PN} "Rockbox Utility"
 }