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

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

4 files changed, 26 insertions, 53 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/Manifest b/sys-boot/unetbootin/Manifest
index 1b7bc9d68987..65c7e4f4fa79 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST unetbootin-source-494.tar.gz 608396 RMD160 6b091e28974ac68d42b0a583c920bac9847eb8e6 SHA1 2d288095b3eb011f767f27182a74ec43659f6002 SHA256 b37991fbfdbad0d669853dd2950ad8d27cbd96b83183ec5ba3c03c3c356468b1
 DIST unetbootin-source-502.tar.gz 564410 RMD160 f2284affd065dd0e2f56710afc396a0e9a99e89f SHA1 e4134ce4f329e879ffbb1f9b20a60b09f131b087 SHA256 6a59c101951895201e0a4bc6c89914d013ddbe016cd9c736accb36d11946a73f
-DIST unetbootin-source-506.tar.gz 647310 RMD160 5deb7c0c99e4346d6bb7302e74b6ee2ed1728d57 SHA1 9ba477e63ba64da45e1f60bea7f8694e7b1315c4 SHA256 41f30dcd8bfa5637ea154593a52a25255bac0d6f1a6032ef8bfb9b9cdde76c2d
 DIST unetbootin-source-527.tar.gz 728046 RMD160 0dc41bd1d332642b7b229f63848543ac8f9f626d SHA1 3f064ab350f68aa83272d1e6268a6ecf822b5894 SHA256 8f7b1e73cc6ad4d82d46167503a602558599a0745ca12a45978ff756c51ade5c
-EBUILD unetbootin-494.ebuild 941 RMD160 67c7fd47fb92e3c223620d7d59d523ddc23cf199 SHA1 cf026ee43aa9aa8419d826057d2ddec572ad2b76 SHA256 976cc92676bb8b2e8c19fbceb619b65afee22f0cbba06af2ae20af2015c39b9f
 EBUILD unetbootin-502.ebuild 945 RMD160 52788d66667a500833450451dac606dfecac7435 SHA1 c6837b2a3f206250337c89bc9955789787783134 SHA256 b48ce3870c46dd2227bec63fe881505e5e77aaa8bd5ddbb28a957209abda2388
-EBUILD unetbootin-506.ebuild 940 RMD160 99421ff529543169090bb28342a5c897cc59fda8 SHA1 5790af7bc26e4a0770d3ed4728b4fb96086d17ff SHA256 fe1c111f76340df3b33bec3b9fd3bd192c7099fb7ab1790ee05d6afd2b838c42
+EBUILD unetbootin-527-r1.ebuild 1018 RMD160 30bb806487952c10891ecbd30e944d146cb58b78 SHA1 8551aa2be30762dd245c7236c02a10969290cb45 SHA256 1c83a593a06c0a9b2353e462639336377faac1bbb1ff344b25d505b22bcad9b6
 EBUILD unetbootin-527.ebuild 940 RMD160 e39dcd140f1c300708368326e8e72686f944a080 SHA1 a47603a545ad0be360848af7fc3e43b54e1fb106 SHA256 62ae5205c869a711c52ef2999db6fb71bdde8c65b38467332a737ac5957bf063
-MISC ChangeLog 7642 RMD160 ea35a47b0bfccd4dc75b9773b6d9a9e0bd17addc SHA1 4d942926312d877ead22356f3a4608c25f463525 SHA256 c324e5f3c9b1139e1a1337598c7d4ca966a0a7dd544cdb83cd6c1aa1d3384cda
+MISC ChangeLog 7852 RMD160 4dad4437beaffd6ab2bc32bacb486dd4570ea45f SHA1 dc3816a451808e868ddeff1d524c986b6f29d3fc SHA256 e25bf21c3bfcd457011debc73b3285d7278bfdd2f058ee4f8ab699b0d3b6959d
 MISC metadata.xml 247 RMD160 ce510949efadc662a8bdf3f163ab8da65425031b SHA1 9e77d3a27a86999fbe9fd9c8098a6f487512cd89 SHA256 219ac51d48f3a246086b75c336a1be44caafec3dd2c86ba61a44caa6374778df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2QjLkACgkQuUQtlDBCeQLihACfYBKSy56sjhuN8oyHqrUE9+YM
-/RQAmwbLBV0/m012skiT+MeQ5d4lf5dp
-=fDBL
+iEYEARECAAYFAk2ZSKcACgkQVWmRsqeSphPXwwCfSucNHoNw+Cto96BFrIWh1iFL
+5HQAnidSiZpxjbA7ZGDOHvrpKtwJM5QG
+=S2nc
 -----END PGP SIGNATURE-----
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
 }