Install icon files now that we have them (bug #344399).

(Portage version: 2.2.0_alpha29/cvs/Linux i686)

3 files changed, 21 insertions, 45 deletions

diff --git a/sys-boot/unetbootin/ChangeLog b/sys-boot/unetbootin/ChangeLog
index 32348d6fccac..b16f92d973ed 100644
--- a/sys-boot/unetbootin/ChangeLog
+++ b/sys-boot/unetbootin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/unetbootin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/ChangeLog,v 1.57 2011/03/28 13:27:20 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/ChangeLog,v 1.58 2011/04/04 04:27:07 jer Exp $
+
+*unetbootin-527-r1 (04 Apr 2011)
+
+  04 Apr 2011; Jeroen Roovers <jer@gentoo.org> -unetbootin-494.ebuild,
+  -unetbootin-506.ebuild, +unetbootin-527-r1.ebuild:
+  Install icon files now that we have them (bug #344399).
 
   28 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   unetbootin-502.ebuild:
diff --git a/sys-boot/unetbootin/unetbootin-494.ebuild b/sys-boot/unetbootin/unetbootin-494.ebuild
deleted file mode 100644
index a699e67444e1..000000000000
--- a/sys-boot/unetbootin/unetbootin-494.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-494.ebuild,v 1.3 2010/11/17 10:58:47 maekke Exp $
-
-EAPI="3"
-
-inherit qt4-r2
-
-DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS
-distributions."
-HOMEPAGE="http://unetbootin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/unetbootin/${PN}-source-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-DEPEND="x11-libs/qt-gui"
-RDEPEND="${DEPEND}
-		 sys-fs/mtools
-		 sys-boot/syslinux
-		 app-arch/p7zip"
-
-src_configure() {
-	lupdate unetbootin.pro || die "lupdate failed"
-	lrelease unetbootin.pro || die "lrelease failed"
-	eqmake4 unetbootin.pro || die "eqmake4 failed"
-}
-
-src_install() {
-	dobin unetbootin || die "dobin failed"
-	insinto /usr/share/applications
-	doins unetbootin.desktop || die "doins failed"
-}
diff --git a/sys-boot/unetbootin/unetbootin-506.ebuild b/sys-boot/unetbootin/unetbootin-527-r1.ebuild
index 15d5635348e0..bd8fbce49e72 100644
--- a/sys-boot/unetbootin/unetbootin-506.ebuild
+++ b/sys-boot/unetbootin/unetbootin-527-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-506.ebuild,v 1.1 2011/03/23 16:47:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/unetbootin/unetbootin-527-r1.ebuild,v 1.1 2011/04/04 04:27:07 jer Exp $
 
 EAPI="3"
 
@@ -9,7 +9,7 @@ inherit qt4-r2
 DESCRIPTION="Universal Netboot Installer creates Live USB systems for various OS
 distributions."
 HOMEPAGE="http://unetbootin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/unetbootin/${PN}-source-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -25,13 +25,20 @@ RDEPEND="${DEPEND}
 		 app-arch/p7zip"
 
 src_configure() {
-	lupdate unetbootin.pro || die "lupdate failed"
-	lrelease unetbootin.pro || die "lrelease failed"
-	eqmake4 unetbootin.pro || die "eqmake4 failed"
+	lupdate ${PN}.pro || die
+	lrelease ${PN}.pro || die
+	eqmake4 ${PN}.pro || die
 }
 
 src_install() {
-	dobin unetbootin || die "dobin failed"
+	dobin ${PN} || die
 	insinto /usr/share/applications
-	doins unetbootin.desktop || die "doins failed"
+	doins ${PN}.desktop || die
+	for file in ${PN}*.png; do
+		size="${file/unetbootin_}"
+		size="${size/.png}x${size/.png}"
+		echo $file $size
+		insinto /usr/share/icons/hicolor/${size}
+		newins ${file} ${PN}.png
+	done
 }