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

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

4 files changed, 35 insertions, 5 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/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