summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-04-11 09:37:13 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-04-11 09:37:13 +0000
commita1541aef82f41672d06c38d6b8135f5deb755f36 (patch)
tree54cf115a23044d4b4121103e104832f7970ebca2 /net-irc
parentFix libpng dependency to pull in libpng15.so.15 wrt #465484 by Martin von Gagern (diff)
downloadgentoo-2-a1541aef82f41672d06c38d6b8135f5deb755f36.tar.gz
gentoo-2-a1541aef82f41672d06c38d6b8135f5deb755f36.tar.bz2
gentoo-2-a1541aef82f41672d06c38d6b8135f5deb755f36.zip
Remove patch from live ebuild. Already applied differently. Update 0.4 patch wrt bug#453464.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'net-irc')
-rw-r--r--net-irc/weechat/ChangeLog7
-rw-r--r--net-irc/weechat/files/weechat-icon.patch2
-rw-r--r--net-irc/weechat/weechat-9999.ebuild4
3 files changed, 8 insertions, 5 deletions
diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 760db2beb774..e771b4ee38bc 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,11 @@
# 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.129 2013/04/05 10:42:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.130 2013/04/11 09:37:13 scarabeus Exp $
+
+ 11 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> files/weechat-icon.patch,
+ weechat-9999.ebuild:
+ Remove patch from live ebuild. Already applied differently. Update 0.4 patch
+ wrt bug#453464.
05 Apr 2013; Tomáš Chvátal <scarabeus@gentoo.org> -weechat-0.3.9.2.ebuild,
weechat-0.4.0.ebuild:
diff --git a/net-irc/weechat/files/weechat-icon.patch b/net-irc/weechat/files/weechat-icon.patch
index 9535a64a75bc..7f19dbae558d 100644
--- a/net-irc/weechat/files/weechat-icon.patch
+++ b/net-irc/weechat/files/weechat-icon.patch
@@ -6,7 +6,7 @@
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)
++ ${CMAKE_CURRENT_BINARY_DIR}/weechat.png COPYONLY)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.png DESTINATION
+ ${SHAREDIR}/icons/hicolor/32x32/apps)
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 2bbab5858a35..f71949377392 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.26 2013/04/05 10:38:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.27 2013/04/11 09:37:13 scarabeus Exp $
EAPI=5
@@ -78,8 +78,6 @@ src_prepare() {
po/CMakeLists.txt || die
fi
done
-
- epatch "${FILESDIR}/${PN}-icon.patch"
}
# alias, rmodifier, xfer