Fix bug#453464. Missing icon patch provided by tomboy64.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 52 insertions, 21 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 5c08e96e12ab..7bc337ab70d9 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.126 2013/01/21 13:38:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.127 2013/04/05 10:18:48 scarabeus Exp $
+
+  05 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> +files/weechat-icon.patch,
+  weechat-0.4.0.ebuild, weechat-9999.ebuild:
+  Fix bug#453464. Missing icon patch provided by tomboy64.
 
   21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> weechat-0.4.0.ebuild,
   weechat-9999.ebuild:
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 3f3eb07db0f9..9f7dea4b01d4 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX weechat-icon.patch 1060 SHA256 1184faafe91320ba7ce5f77c0873e251e3b4efe0714a0a702968391ed458a996 SHA512 d39b149b6b9d0a9ec0a5a754fc1101d5adc2a39b5040ea0037f4c4777d55cc3125de6a0b8d923eeb7a5a3749169b91e1cbc75a094fdcc4c511b54d44f72f81ed WHIRLPOOL bb50559ccfb59f324bdded8385a983953bde34aa1b79c42a66e7ad54c27c2bfff1c36b2d670a7953d0d72360afd30c768f171779066e871c8f272696ebfd7961
 DIST weechat-0.3.9.2.tar.bz2 2721004 SHA256 5e9cb967be7d6496c37d4b05dbff5144796954a7abdd21f3f5e4305f772f7532 SHA512 a34a72204e289fe7ebb5441214b5256471af54e13198ce5dbb58dade043090fb09042ef35e672ef3d3174d0e48744c4d103644fbbea743b32b2b65bd982da965 WHIRLPOOL 6ef454e9d4b0b89554b0c055b6dd5677004064638f958a0871e5401fa5da612c9fec2c7dc4e84f0b483f51f7b73b9e5c18e0ca4a717d0b3c11a1bf9e1f4fc0e0
 DIST weechat-0.4.0.tar.bz2 1740361 SHA256 1df12201d8b0ac25f62ddbfb675e8f3d978e52bc5b644d55ccf4c755956fa60d SHA512 41e8a6d0714c6b821b5fd1e9feb0b95be7f142c081ccdcd0e107ce817a5630598c0a91ab0393d8243c3ef41c6f54b62d2ee056924272b389076af20ec99de495 WHIRLPOOL 95a2d5a87d5d27a96c24f2346c4c34d2cc8a0ec45672df3ca7889dfaa6d8fed8b0fe436c2f6c24b011cc8fd9795e59b84215d27852e34566b6d4c0f7b8fb36c8
 EBUILD weechat-0.3.9.2.ebuild 2904 SHA256 4cf53493a791efdf12a4228dbfd9a4074f62214d5ef455ea82218c3d3573d4d8 SHA512 5f2096c133f701849e6bf4db88f5e0585103f6e304ca0e593bf85d07226dfd744bf44bd30dc85d10c6fd6803bd225fe975c5edb661adf6692208ee1d1222ab96 WHIRLPOOL 4956fbf3c0f006129ca863b9072d31eaabfba4be46964943cd9b1a88f47eeee1af2d0410f9c74c131bbe322983347ec8b6fa42b262decc280719c4d3f51cdd61
-EBUILD weechat-0.4.0.ebuild 2883 SHA256 dbd4276f2a96848ed2b3da66feec005310cd5f8f6543ee91682b72c69ab9283b SHA512 fc68a2944b3e143761e400a7727d591840e97f14bdfadbea7d866795ac6deef827f06553c8b747d7f85b09780d692488f6332c39a3325b214156529981d7e005 WHIRLPOOL cd42ab92608ce7245df5b8350e4c2268aa230ac40f369e35f257f89798de5baaa40288b2c0721dd5768f8afc75866a6cc15d9c3aaeeff178f7ffa5898c29240b
-EBUILD weechat-9999.ebuild 2883 SHA256 e44e62d4c08ceb46792727a6abcd8a13b936e8a6e99741405cbd6844f8dec906 SHA512 0d36a26d79582fc38b2659cea06bece084c398c36d82195fe4891c00ad5536f6f5bd8f7668e7bf199a7a9fa55279320ca7d7049b3ee1645a247bed40d74f0556 WHIRLPOOL 6d295aebbbe9844723be60449358908582d74812519730e8e0919f450ba092f47f9d3573d9308404f53264e9611b360a7d46203a2891658c4ee03a0da9c2ee00
-MISC ChangeLog 17221 SHA256 65f8768f5ef7082fe0ba8bc49a6842c1a8be9c98385b818caf904eaab848f74b SHA512 b9b030bbe95f31b27b2103b925a0b154f0b1fd31d2233c98a4dddc50837438b836a253c238397b5824de4d6057e079b510f3c1ddb6883c48522b3fbd96b70269 WHIRLPOOL b8a6e40c72f8c54d1e6d554ede1d3af58bffbbcc95e2d172b8d6cfc12bd58f3310b21f74f886ad8b4a5daa055013e48b3230fdb8da7b8188e3904905b1d4b3b3
+EBUILD weechat-0.4.0.ebuild 2930 SHA256 2a670cc25e2a0f99b93226ece31179072d3f2dff77b334405628a2838b47934d SHA512 95f40dee7909c3b0e93098b189ba694b85323b68377f5ff110fabd83f6a49c11f2c516d99d0a59c3e6eb860a5009014dd563475785245c6e68f05865190d429e WHIRLPOOL c893d5922d28105f70280a1a239bca80987d0f8c7af1c68b14c338aef6f40ada21271c86cb698e95b416d06cd02158b5cb311813cc78184d2671f614896f0a5d
+EBUILD weechat-9999.ebuild 2930 SHA256 1f25fabfed47549acd9f5c71775575171474b1a725cb618cfc8b55ccf56a76dd SHA512 ed30a74bff3f60c5c2d32ed5c3318d9096d475eae78a71adfdf00271fb19faa5899c75dc707ff44c83f854d8349a0bbd34c176d6072dcc93d56da7bdf1e49aa4 WHIRLPOOL 5183b635c3bf36a523758a4a147eb4da8a5c681abf2cfa262c5df50d919ac07025ee83724f4500f30840475f64ad8993494ebf7d66c067d75f3b8f98f45c1bf9
+MISC ChangeLog 17408 SHA256 0c137c12c402301a5ac2860b3cea211d1b983f554c6f53454f163ae17971e783 SHA512 2eac42ece5ba418f825edb02cb3078709c0f9e5e38043c36b0f86ffe87f565b44ee639daed74837fceeea49e9f8613cbf2eccb99ead57236c64b43ecb28bd441 WHIRLPOOL 3bbd6ced6f30d8393d892dd6cebdaf3502bf7889b97a6a88f94e3ca283c7ad0f096e90472c0d056df0a8502c70da6164b9024f868038aa54e3ffff5080bc1fe9
 MISC metadata.xml 775 SHA256 baddf6a8f9e77502d45119a96455031b564e19a864c8540e5c44500aeb1ddc54 SHA512 2aad4ad5d7b4634bf06078f62e8bb6a53e19df95257b150b43e82b2fe8487ed37c5311dc15d364cb1f5d5fc3eb04ae933e54cc9e44fcf06a471348021feb4d4e WHIRLPOOL 0a21b77e3c62b2e3e2ce4ee935a7212aee8517ef83445710855823e5a5c146255dc15e369f049ca20503205afac611957394494a857ea2f40371ebc50c87d25a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/US6AAoJEOSiRoyO7jvoh6IP/iT10qzz4zuAROp/VINNUgV2
-cCgyDPTUDnIGeoY/bsgg/1zksgzl97pXgVkGobcYFobRPfqV3V43G7R6/FjIm+tb
-8/FpskxWIsA5V2JjZ/N4UpOnYDPmH08wqzu72da0YKddk6OahjtneuRf87rFbTCo
-2+ZUG1UUCpREdH2ClwLo0oLdiavbgzolrudypzLHipE8VyvOqbyEBUQkzHXp881n
-z4RH2x02Yf2NJnFuo/kpaCrS4dtrkn94jxsOggzEOTHy1r/pGpkyBb4utrKpU+TS
-2ZqFhAX6QcA7RkAmASADrIsbw9MJoqy9iY61cOYXnpFNiCvwIC87cAR/+ktQk1oR
-xHAeJgr/zRg2xiA490njCP6GfxCF4S/hogYRKd7FaTSwjH3X+oID/Efj99IiZ17X
-A4hj0unFWp+2VgfCYnwurdn1GMacAf7w17lnZOf9WHltHTZ0FPA9bqCdzFnzyORX
-7pJJUSDiZ8BfeCmSURPJVklLNaVlmpUgf0GeaAMxYYhJfq/vNtUlZvF+52C5JICR
-cHDiKgAWZwhS5R+l+cZx33KH7Y+ApkUUptDft946JsO7VodNO9K4CfrRosnlWxif
-ZejbMLnD2PLRWtJXst2z4Yt13WvynoQRdt5rV0QwGp8+phiIiEcT7m4b6I0KZ7c1
-2fM2EPQue6Y4bop+0BSc
-=z3gR
+iQIcBAEBCAAGBQJRXqUNAAoJEOSiRoyO7jvoic4QAJC0B4Syn3ZsVqq5sTT+RYKu
+sjSTWxbqd5LkNnpM98Uw8kWDarn2cgSGvLnhNk5YKoKMTAXzS9URalL465rhtjQ6
+AXsdM+VBu8w13zsJVbOlx+hu7e53CNWM7DtVGNjEF8++werN/L19SsF7Yi85nKpi
+j+OviefCcxrkl9jIeEzIIZkrLV9LZnC/m89gLpQUEdrTcm9csaobbtTMz0gHw0eD
+y5cn+FUZ4UasecvjwCXYQ/8kQs7t05Srjk+ku45zqA+x2IIN41On1CDpTRBdLpYU
+4wD5hjvShMrGgXYOzJoGoUTKXWQBHH9BCXF93ZN9XtN9ugl19sUe0JnTM4D3P5Ly
+ljADSww0P4sg/qdkCeXnFJbMygY3zQm9iHDMzaQefOPvlEFatv2OsGokjfq9xVBZ
+GcJg0JNaO1BvJJ3uzy+uZXiPM5wQXgesIEyuYUwpmGXTlTlI1RdVhiA6F/gH1R/z
+QJsluusnUPeEkLvFjEjbblxpr8aZdVOlcntFvyNkmkgrUNxTx+/veEhe3/ywiIrl
+bJuqHCmqcKWWJQEqTOWptq5gax5hF36gsFG5LPKyU3gKNlLJhNXDAZ+w/1Xe1j2K
+CUlgna+1czdAaSRt/4yWi8UmZhwkYj70J4LG1yZVUW9pW/oRYtwi+Dw1yqCFC4no
+rholZfbrX3RARdxYrB2i
+=k15y
 -----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/files/weechat-icon.patch b/net-irc/weechat/files/weechat-icon.patch
new file mode 100644
index 000000000000..9535a64a75bc
--- /dev/null
+++ b/net-irc/weechat/files/weechat-icon.patch
@@ -0,0 +1,22 @@
+--- /var/tmp/portage/net-irc/weechat-0.4.0/work/weechat-0.4.0/CMakeLists.txt	2013-03-12 22:00:57.000000000 +0100
++++ /tmp/CMakeLists.txt	2013-03-12 21:40:44.000000000 +0100
+@@ -132,6 +131,11 @@
+ SET(includedir "\${prefix}/include")
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pkgconfig)
++# icon
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/weechat_icon_32.png
++    ${CMAKE_CURRENT_BINARY_DIR}/weechat.png @ONLY)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.png DESTINATION
++    ${SHAREDIR}/icons/hicolor/32x32/apps)
+ 
+ # packages
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
+@@ -141,6 +145,7 @@
+ SET(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+ SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+ SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
++SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/weechat_icon_32.png")
+ 
+ # binary package
+ SET(CPACK_GENERATOR "STGZ;TGZ;TBZ2")
diff --git a/net-irc/weechat/weechat-0.4.0.ebuild b/net-irc/weechat/weechat-0.4.0.ebuild
index ce1395fe2910..f7dc1acdabc9 100644
--- a/net-irc/weechat/weechat-0.4.0.ebuild
+++ b/net-irc/weechat/weechat-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.0.ebuild,v 1.2 2013/01/21 13:38:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.0.ebuild,v 1.3 2013/04/05 10:18:48 scarabeus Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
-inherit python-single-r1 multilib cmake-utils ${GIT_ECLASS}
+inherit eutils python-single-r1 multilib cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.org/"
@@ -78,6 +78,8 @@ src_prepare() {
 				po/CMakeLists.txt || die
 		fi
 	done
+
+	epatch "${FILESDIR}/${PN}-icon.patch"
 }
 
 # alias, rmodifier, xfer
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index f82a550aa7b1..bd75cc54dbea 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.24 2013/01/21 13:38:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.25 2013/04/05 10:18:48 scarabeus Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
 
 EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
 [[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
-inherit python-single-r1 multilib cmake-utils ${GIT_ECLASS}
+inherit eutils python-single-r1 multilib cmake-utils ${GIT_ECLASS}
 
 DESCRIPTION="Portable and multi-interface IRC client."
 HOMEPAGE="http://weechat.org/"
@@ -78,6 +78,8 @@ src_prepare() {
 				po/CMakeLists.txt || die
 		fi
 	done
+
+	epatch "${FILESDIR}/${PN}-icon.patch"
 }
 
 # alias, rmodifier, xfer