Stabilise 0.4.1 on x86 ppc and amd64. Drop older. Drop unused patch.

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

5 files changed, 23 insertions, 159 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 8360308ea4cd..04f88d4374d2 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.132 2013/05/23 11:31:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.133 2013/07/08 08:57:51 scarabeus Exp $
+
+  08 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> -files/weechat-icon.patch,
+  -weechat-0.4.0.ebuild, weechat-0.4.1.ebuild:
+  Stabilise 0.4.1 on x86 ppc and amd64. Drop older. Drop unused patch.
 
 *weechat-0.4.1 (23 May 2013)
 
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 8843439b0341..39cbb45332db 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,28 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX weechat-icon.patch 1063 SHA256 520c06905af1f29eb1e77be6b12198cde0de502d58a1906426d537b6aa9fe617 SHA512 568496a36438398b6b1a21ef5ce927c9ebba5732c584ad7fd6dd3a51d82c569cadf8a23cf28f460306c2b93b03876e0281ff556dbe5ca442a220738a31bf5d78 WHIRLPOOL 76c57a8d841c0e0c20040f3c3a85988f36759ee5ee1d0de17fe8420fbae2cd2100d4b11a08052beb85eabbb95089bc39c4aaf5ea0f1f12b2da9834b0f14d9a64
-DIST weechat-0.4.0.tar.bz2 1740361 SHA256 1df12201d8b0ac25f62ddbfb675e8f3d978e52bc5b644d55ccf4c755956fa60d SHA512 41e8a6d0714c6b821b5fd1e9feb0b95be7f142c081ccdcd0e107ce817a5630598c0a91ab0393d8243c3ef41c6f54b62d2ee056924272b389076af20ec99de495 WHIRLPOOL 95a2d5a87d5d27a96c24f2346c4c34d2cc8a0ec45672df3ca7889dfaa6d8fed8b0fe436c2f6c24b011cc8fd9795e59b84215d27852e34566b6d4c0f7b8fb36c8
 DIST weechat-0.4.1.tar.bz2 1772500 SHA256 d27bed07ee2d0638c1683ad18666d478ed9a042aeeedcd0dd9ce22f1392e0ebb SHA512 7b8abef303837d0aee61a113163cecb0834c0dd99b736d9c165e18de8bcd37f9a8307984a4c66038a51262ac15286d44bbd2e53b62ed437d410e4df35292a0ed WHIRLPOOL c6d6ad1f0b5df7936b49332944eb009305e97da573d25bf8f088dd4c5a5d710422ab106c02c9c0fbb64b980e3b9312857b8963bd0691bb8e01f0f62f8c62121c
-EBUILD weechat-0.4.0.ebuild 2961 SHA256 38ae4b31fef2234988484171df4a9954d35dd823cfc82819a559687e46a23cd8 SHA512 87c21424c24425903b455e55b677b0590cca822ddc81dbbcdfec37a141bbfe4830c7416e3b7d3e65d3a4317015ee6bf55f60e066216def389a67d5e6b9f2e3c7 WHIRLPOOL 634c72679335dccbf42fceebe1f298c11b0a66f905396f2c7ccaa24edc10b5145fed148d42d474bdfdd1559e50a63dbed6bab3fb866bdd4cbbb41e1ad2b4df5c
-EBUILD weechat-0.4.1.ebuild 3384 SHA256 17f79e7fd07a1f77cf53b5ddff93d20b94ffed117b5ae9d367fcfc8e7174d575 SHA512 f0633e5aacbf9106dcedaea9962518a125e4ce81ef1c2607cf05f9418da88b3245b6791ed31539f8e077e7bcf08e8173226d197615e6d0ef79437f4dbef5df84 WHIRLPOOL 5780fcc82c22c0f618081287e66fd80fa12e0f3e851d2f331cde85b078183ca59e471d809cf0b672c73c6aa261ad3bebf839adb1c1e1204fe6c99f866d4b65ed
+EBUILD weechat-0.4.1.ebuild 3381 SHA256 d68f9c7818bc4b145ed3f128b0d1b1b5bdd0243fe13a639cd87fe2053fb20a0b SHA512 9717e57754d8d7d43c1178c92c60cf81b59006164db6830443e5d4285738764a672a7c8116aa1ab47d23df1c149c6daa3a08bf3f683ab7df71ce703f3a6ff456 WHIRLPOOL 4c9b9e22cf99b3e66521c205f95aee63ce0fc0e881614f1ff674fc76911e3f140223ca32841558d91911caf371269ce9f48feb260a3fb59765cded7664053988
 EBUILD weechat-9999.ebuild 3384 SHA256 2a1aa3e353d27acfeaeecd23e5b94a63c131abb4f92fd7a30e09a2bd0e371a8f SHA512 9e38892cefa4fbbd303670fb867796bf44188b0cd8aa12368d289b8a4b85be08af7974ef2ae5764b5ceee34a14ab16a269eaabf9131b4366c260be48943aacbe WHIRLPOOL 3c5e368d51a322ac40c36dd34feaa4149ff03bd75e6625f25c1e9de87c2a8b5a3dcb5d8c10a5d3a94229027e6d05534a0442827034d453d09e9aadc8b867c1e2
-MISC ChangeLog 18268 SHA256 a11a3232703158c15698f9b8648a5a970f1dedfa9006ead4695f85f5f4107502 SHA512 e7cfc1d63ee4c9dc0db499a58901f8580ee87c5c634469b07875fac43d6e1137f418e3b7f7cbcc65de9928d34fb61fa20f7a515a41c39251789fcd2e72baecde WHIRLPOOL c41f55fc5cdb0d448fd5667df873b4598249d56cff05c80b03897e494828273b6f066bd97eb2a355d403bae1a056c53a916725a809fc3159f9105d694986fa2c
+MISC ChangeLog 18469 SHA256 0c70e073a3f0b0a6e5319b4dc1ec052534ebdd7d5a1e88bb9b96da598e1aff80 SHA512 5b3f4f9ae8681770b1df6fa24aa98bd5c57da45202d0c706f586a1f76414891a9bf7a3a7b5cfbdf65ca1acfc55fa1c9b8090ba499cb2797e03ce6b2b6749add5 WHIRLPOOL de62a15d3f5a7ee3e1c66d2cc1e8101e52ce2e0e7f0e8d1e4766b108f89bd4e2b228933b32e4553eca8be1e4aaea04f21bf701abd88b01094396545fef67e241
 MISC metadata.xml 775 SHA256 baddf6a8f9e77502d45119a96455031b564e19a864c8540e5c44500aeb1ddc54 SHA512 2aad4ad5d7b4634bf06078f62e8bb6a53e19df95257b150b43e82b2fe8487ed37c5311dc15d364cb1f5d5fc3eb04ae933e54cc9e44fcf06a471348021feb4d4e WHIRLPOOL 0a21b77e3c62b2e3e2ce4ee935a7212aee8517ef83445710855823e5a5c146255dc15e369f049ca20503205afac611957394494a857ea2f40371ebc50c87d25a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRnf5QAAoJEOSiRoyO7jvohYIP/1kKwQy9y/Sxo/wo3cW468f+
-9dVxiJLgn6Dya99cMvldQG8kI70O6N0vJjAoRcpNwyY9nnKTSoKpDdX2UPc+rOYm
-dsC9OfZdKCD83tWnIAc87LSuSzue+YydpI4htvOV1RpZZPMyNNoKK5+CESEbE8tt
-KBkU3+qU6f0s3oxTfP7gDtHW9s7pQIUJOt88VeGjgF+i7LKyjILzJW7Yeo0nVFLd
-Z+pmRLMwIk2OrE28wWWHkE7KdDEa5/jpQv5SJSotRxzvWMhod6llz5r/scMOJFVe
-n5myswTNpO2LgMsroTtYPiwGTJOSru7xug6q6+0Xv9L+LQ3ysOWI5UXxnYbtepZE
-D6Q4NeVfkDJ6qzyIbSQFTD9EqTNbHeStQd2dVReipNQ2sp9TBKfz6AB0FkdEiKdT
-jMSNH/3TzPCxgGvgjwiBlhDfCo+WSVH7AH7CBFQ2hMBwKqThDs7G/i6bH+y+gJdm
-23pR7R3/YUXlmG8IbRJMqdH6zQ+qsUI8OeazHX+gwjKiqpaCVUg/UHqAoGR6TNzy
-CyhTuwB2OpXp3OvcvZxRbU0rO3erckr9yZWAy7STdV3lr5gzXsxCD5ZF7a+VHPBe
-gzdpVF9QFYh5vuXIJ/k+gI7DUbjTGzD0zlDxam7vlySJgxq55sCMqWmi2AIm3ncV
-SLgyTwT5bKZH2RYiKtHv
-=bRV6
+iQIcBAEBCAAGBQJR2n8jAAoJEOSiRoyO7jvo+MAP/REXE230gzIKcamnHP68FeRF
+aov0EaDnZ1N/55IgBxxqukNiM8Kh2Gt+QtNzuf9S8RuWKERbVNeKR0xxhUqJJx9Y
+FyJmVFSsjxqaSHNlgHhyKhaKiGhFC2ZcD3o5fger/aVzyGi7hgt7HK9aSmIq0XSt
+HYfY40Wh5/RIkjK9Y45ekmPwY2hQWv3FwajASv1g3kUW4m+HGAe6q2046F8vya+u
+2eC0lKiJ80EBdb7TIWdXTRLLMbZ7eWLlv2XObHoR2Q/H+8AuMwNPGI/cAqP3j/N/
+36wbhrppnkV6GqssZ1sgC+vgw/Hj8lO1CpaI36b/dRvb8i3KYp8bRKwiu++oBZlE
+LZwmejqLEgOH6hpaKfrME1FHJiubKc2xsKOhougeBPmfdnlzwRJRMvPs+Wm0v5s0
+ZDRiGegQ/odheiZc6LkGHxPKZmxfa/kg8Ind/gpvsddwD4v6O167OaGhB3SBuShn
+4OMN2nHP7IxSnCR0pMOTEWsHQuaC3JgJM+OxbzqNxmQx2dQNLRILP7Vq4A3pwiII
+8VU++T3/+3FZmn4qdT04n6uhgw72YDwWhYKOr/6DGH9Za3mMt+kFjmQUWHLgw1SQ
+uVv8w83qG+g9an8oR7fI1ysiMPiaz4JHobH7Ge83FcCClVqS47Fv7FmN10AwIiMN
+F50YihMYcuULWzfoCPst
+=26iC
 -----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/files/weechat-icon.patch b/net-irc/weechat/files/weechat-icon.patch
deleted file mode 100644
index 7f19dbae558d..000000000000
--- a/net-irc/weechat/files/weechat-icon.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /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 COPYONLY)
-+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
deleted file mode 100644
index 6c926e1409f6..000000000000
--- a/net-irc/weechat/weechat-0.4.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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.5 2013/04/05 10:42:16 scarabeus Exp $
-
-EAPI=5
-
-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 eutils python-single-r1 multilib cmake-utils ${GIT_ECLASS}
-
-DESCRIPTION="Portable and multi-interface IRC client."
-HOMEPAGE="http://weechat.org/"
-[[ ${PV} == "9999" ]] || SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-NETWORKS="+irc"
-PLUGINS="+alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer"
-#INTERFACES="+ncurses gtk"
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} +crypt doc nls +ssl"
-
-RDEPEND="
-	net-misc/curl[ssl]
-	sys-libs/ncurses
-	charset? ( virtual/libiconv )
-	guile? ( dev-scheme/guile )
-	irc? ( dev-libs/libgcrypt )
-	lua? ( dev-lang/lua[deprecated] )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( >=dev-lang/ruby-1.9 )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15 )
-"
-#	ncurses? ( sys-libs/ncurses )
-#	gtk? ( x11-libs/gtk+:2 )
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.15 )
-"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-#REQUIRED_USE=" || ( ncurses gtk )"
-
-LANGS=( cs de es fr hu it ja pl pt_BR ru )
-for X in "${LANGS[@]}" ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local i
-
-	# fix libdir placement
-	sed -i \
-		-e "s:lib/:$(get_libdir)/:g" \
-		-e "s:lib\":$(get_libdir)\":g" \
-		CMakeLists.txt || die "sed failed"
-
-	# install only required translations
-	for i in "${LANGS[@]}" ; do
-		if ! use linguas_${i} ; then
-			sed -i \
-				-e "/${i}.po/d" \
-				po/CMakeLists.txt || die
-		fi
-	done
-
-	epatch "${FILESDIR}/${PN}-icon.patch"
-}
-
-# alias, rmodifier, xfer
-src_configure() {
-	# $(cmake-utils_use_enable gtk)
-	# $(cmake-utils_use_enable ncurses)
-	local mycmakeargs=(
-		"-DENABLE_NCURSES=ON"
-		"-DENABLE_LARGEFILE=ON"
-		"-DENABLE_DEMO=OFF"
-		"-DENABLE_GTK=OFF"
-		"-DPYTHON_EXECUTABLE=${PYTHON}"
-		$(cmake-utils_use_enable nls)
-		$(cmake-utils_use_enable crypt GCRYPT)
-		$(cmake-utils_use_enable spell ASPELL)
-		$(cmake-utils_use_enable charset)
-		$(cmake-utils_use_enable fifo)
-		$(cmake-utils_use_enable irc)
-		$(cmake-utils_use_enable logger)
-		$(cmake-utils_use_enable relay)
-		$(cmake-utils_use_enable scripts)
-		$(cmake-utils_use_enable scripts script)
-		$(cmake-utils_use_enable perl)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable ruby)
-		$(cmake-utils_use_enable lua)
-		$(cmake-utils_use_enable tcl)
-		$(cmake-utils_use_enable guile)
-		$(cmake-utils_use_enable doc)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-0.4.1.ebuild b/net-irc/weechat/weechat-0.4.1.ebuild
index acbdd800eaeb..9c60d8675265 100644
--- a/net-irc/weechat/weechat-0.4.1.ebuild
+++ b/net-irc/weechat/weechat-0.4.1.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.1.ebuild,v 1.1 2013/05/23 11:31:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.1.ebuild,v 1.2 2013/07/08 08:57:51 scarabeus Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SLOT="0"
 if [[ ${PV} == "9999" ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-linux ~amd64-linux"
+	KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 NETWORKS="+irc"