Install hicolor icons and update icon cache. Fix building with sys-devel/gcc >= 4.7.0.

Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64

4 files changed, 54 insertions, 13 deletions

diff --git a/media-sound/traverso/ChangeLog b/media-sound/traverso/ChangeLog
index 66811379e1e7..1b6feabbc115 100644
--- a/media-sound/traverso/ChangeLog
+++ b/media-sound/traverso/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/traverso
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.31 2012/05/08 12:12:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/ChangeLog,v 1.32 2012/06/27 19:35:01 ssuominen Exp $
+
+  27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  traverso-0.49.2-r1.ebuild, +files/traverso-0.49.2-gcc47.patch:
+  Install hicolor icons and update icon cache. Fix building with sys-devel/gcc
+  >= 4.7.0.
 
   08 May 2012; Alexis Ballier <aballier@gentoo.org> metadata.xml:
   drop maintainership
diff --git a/media-sound/traverso/Manifest b/media-sound/traverso/Manifest
index 772c6fae4341..9540d7488ff7 100644
--- a/media-sound/traverso/Manifest
+++ b/media-sound/traverso/Manifest
@@ -3,15 +3,20 @@ Hash: SHA1
 
 AUX traverso-0.49.1-slv2.patch 673 RMD160 7b3ce4672b984fce9a7eb02c4d1da21d0f50291f SHA1 3e599bf804c01ff24901c7b3094947375340c222 SHA256 90bf9fc1ead1e9c158ba21cb3efc27dc62b5653337f1f634e2d91d1d7a085260
 AUX traverso-0.49.2-desktop.patch 393 RMD160 5de6807ddd5980ad9867bcae15e33894288818a9 SHA1 af678ff8f3b25f500ae20783c5e82062d2ad0bf8 SHA256 33ced010f7e415e6c22ec8597ed915e0c12a05dbadd3f7527d3d19039a62cbb3
+AUX traverso-0.49.2-gcc47.patch 366 RMD160 c3f1167c5751237d589171dbb1316a4492ab6106 SHA1 21c48c0490ff7f14cc66acc3cf71c2fb08f40171 SHA256 b3b0464ee750ee5ecd7ef5c53a02cd1bca59dde34750e205fcc70d13dd72bc23
 AUX traverso-0.49.2-gold.patch 227 RMD160 17cf9ef5ef9bed65c1a82abada714cf6d388ef93 SHA1 28f84a3675ab119b8cf584dfce0aa39f6a2a9351 SHA256 b1bd5ab4cdf26bdfd5854fd33e1397725a7c2bea61a9019b735554acdf7ac5bf
 DIST traverso-0.49.2.tar.gz 1437811 RMD160 8b939201c2269934bf41eddc1d31fe4aa606ae5f SHA1 accca1508e48256307116ec5e85848f602f834cf SHA256 9edbbb10c4245ee58a7a125c33d86327a877d42bf84c8a1b81587642bd601002
-EBUILD traverso-0.49.2-r1.ebuild 1790 RMD160 2a9ac2853d8bcaf2ed6bff69bb15946577476ab7 SHA1 30594198ca822bad446616c9e811d5af346c4c57 SHA256 2db328cc201b87c89b16ad74b67882089185385df7985c6730b2de21a10f6cd7
-MISC ChangeLog 5136 RMD160 b390dd0650f36611ec8575b768b5d26507cfda33 SHA1 c0aca1aa7b3ae1ee9546c85f2162a674f35f2372 SHA256 0cc7830ce06d07f9839852584d7e4bb34b76c7614100e128a05831530fd63241
+EBUILD traverso-0.49.2-r1.ebuild 2104 RMD160 d2c777f68ef731938af8d1f55b85121d787d66a1 SHA1 658e2b3071b2935149b9ed98e8a6ef6d623b0349 SHA256 2268f4c7cbb516feb591bdf5e67e917290ae7e4999951d0e4a3e9954bf4ce9be
+MISC ChangeLog 5348 RMD160 f3053dfa4fba27036e82aa800f3c37d52f4d2835 SHA1 949c5eff751c1623cc4c7a37d617e01fd7e5cefe SHA256 3f7f7213ecdd11c2cc39ffca54ff82f78bb08efb1b4e73c4905a068da60d1dc4
 MISC metadata.xml 458 RMD160 edac1fb08de001106105849cb1d74589ee29bcbf SHA1 528dd8aca2e4f4bef292a10df019cc32a1a053f6 SHA256 8897942d2d9f80baa2985397df88c5bc277631873d6acc13582c4320e35712ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+pDcAACgkQvFcC4BYPU0rwaQCdERrtFJezazLDZ7s1P4gaaW9G
-TDIAn3CGhYvvHKG+YjZzlCGM0XVXdOhJ
-=v9Qp
+iQEcBAEBAgAGBQJP618tAAoJEEdUh39IaPFNwnwH/R4O/xsxzl6l/j10elVubLOZ
+Cc+ydxGr/ciPFrRss6pp+YCeYh4X0SfWstbHKdke+T8W04TeHT78V9C9eHMcT0d0
+N5DWVgHl6Ci5kzloLkMPX6ZDuTuCiHT9U3xnrJ/Klf8wI06IslUTHxen6+BTZ92c
+F9nqqPpymJfFA0koO3QphrvFOBanaXA6WjpBICgkaRCxpNLUQWfS5R7mf91TBVkB
+Eu/ieBJsUsW1C5K0/LMt5D4ee2W3/F/mIT82KQevUsCkpX7vRFeHP/5mdXqntiaQ
+gJJ7Z1KxIKt3LI5GNVCR7gtd5hA8vpkVBjYlMBfJsr1lfWN2W626Dxb1r5MhSpM=
+=O494
 -----END PGP SIGNATURE-----
diff --git a/media-sound/traverso/files/traverso-0.49.2-gcc47.patch b/media-sound/traverso/files/traverso-0.49.2-gcc47.patch
new file mode 100644
index 000000000000..33820ea5ab06
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.2-gcc47.patch
@@ -0,0 +1,20 @@
+--- src/core/FileHelpers.cpp
++++ src/core/FileHelpers.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "FileHelpers.h"
+ 
++#include <unistd.h> /* read and write */
+ #include <sys/stat.h>
+ #include "Config.h"
+ #include <QDir>
+--- src/traverso/Main.cpp
++++ src/traverso/Main.cpp
+@@ -19,6 +19,7 @@
+ 
+ */
+ 
++#include <unistd.h> /* getpgrp */
+ #include <signal.h>
+ #include <stdlib.h>
+ 
diff --git a/media-sound/traverso/traverso-0.49.2-r1.ebuild b/media-sound/traverso/traverso-0.49.2-r1.ebuild
index 78e346fa6084..3a79ccbba701 100644
--- a/media-sound/traverso/traverso-0.49.2-r1.ebuild
+++ b/media-sound/traverso/traverso-0.49.2-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.49.2-r1.ebuild,v 1.1 2012/05/07 11:33:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/traverso/traverso-0.49.2-r1.ebuild,v 1.2 2012/06/27 19:35:01 ssuominen Exp $
 
 EAPI=4
-
-inherit eutils cmake-utils
+inherit cmake-utils eutils gnome2-utils
 
 DESCRIPTION="Professional Audio Tools for GNU/Linux"
 HOMEPAGE="http://traverso-daw.org/"
@@ -37,9 +36,10 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README resources/help.text )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.49.1-slv2.patch"
-	"${FILESDIR}/${P}-desktop.patch"
-	"${FILESDIR}/${P}-gold.patch"
+	"${FILESDIR}"/${PN}-0.49.1-slv2.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-gold.patch
+	"${FILESDIR}"/${P}-gcc47.patch
 	)
 
 src_configure() {
@@ -55,8 +55,19 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	doicon resources/freedesktop/icons/128x128/apps/traverso.png
+
+	local res
+	for res in 16 24 48 64 128; do
+		doicon -s ${res} resources/freedesktop/icons/${res}x${res}/apps/${PN}.png
+	done
+	doicon -s scalable resources/freedesktop/icons/scalable/apps/${PN}.svg
+
 	domenu resources/traverso.desktop
+
 	insinto /usr/share/${PN}
 	doins -r resources/themes
 }
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }