Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

7 files changed, 20 insertions, 432 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 47d4bc1ea899..9c7284f6cd6f 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.157 2015/05/16 19:17:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.158 2015/05/16 19:19:32 radhermit Exp $
+
+  16 May 2015; Tim Harder <radhermit@gentoo.org> -weechat-0.4.3-r1.ebuild,
+  -weechat-1.0.1.ebuild, -weechat-1.1.ebuild, weechat-9999.ebuild,
+  -files/weechat-0.4.3-always-link-against-pthreads.patch:
+  Remove old.
 
 *weechat-1.2 (16 May 2015)
 
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index f856660ecce2..b16f0c251cd4 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,28 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX weechat-0.4.3-always-link-against-pthreads.patch 913 SHA256 673a3bf7a596753697011b262e48e05d79a9d7fa4846fd2ae65589649ee1f0d7 SHA512 2f9c08d2db088644e16ef2584de670030d1576db2cc385bcfeca6be5d559d0597f166721c953fbb4647fd07209b2274691e8351216cb666bc2672ca5d5a87c05 WHIRLPOOL a5b3593dfaa825001c6b3bb9ce81de399845c0375c3e207773e1c840d59a2e7f91268ef1c5332186b2b4e25c6745551ce2f5a8702d573e92267d7c387fe86a88
-DIST weechat-0.4.3.tar.bz2 2089701 SHA256 a8ec847d331a1201de975530a22f1813c260db420c68675b2ecaa7bf3c7c3ff8 SHA512 0d049626e6a5fb44bc368d732c395d7135ad8869d9368cb95487662c4c738c9a44052db6e40a7fa08db9798916de0c466c24531f94993e91b7b19519b1d7cfc2 WHIRLPOOL 1e8f045be496d70c39ffdc63aaa1a4862c68e52549ca378c14e3295de20a9d882c144c1acee49c3dca94db31c0495c39c70087e388f316a9f07beed7e246a58c
-DIST weechat-1.0.1.tar.bz2 2277780 SHA256 b9285ae5124798dee8e3d77cf4ec1e913699b1df1587b5cee6760ed518072ca8 SHA512 e8b38d28db820471bb2a50288545598590eaf9e473fbe98fdaea54a3fd043ee6625f4ec273ab5fc266efcfd01e39e051771ae6e6acebc693d3dd54179be73dea WHIRLPOOL 95206fd64bff598bfa26c8d2b9d41abe5f0825c5b254e5b68ea47ae4301d0a6c5bc693f1e26e6a3bdf11dbbb27af105af0873c39f1b773ce0700c3246534b8b6
 DIST weechat-1.1.1.tar.bz2 2305377 SHA256 810bf0584fd5888246797fc7f1bbc4facb064a4d1c5d91627a9c8c01cbce97b5 SHA512 710cb8badeb2734cbe6430e1c5f7fc91d8ec5c9ef85d2c6cc2206ffdf915fab083027a04d25ba23a17515e767d3b482f85b3b3e8fc445cbf1d05db941ca13dfd WHIRLPOOL d445db9a42e6ac8a58bf17a6a905bc769ea3da005d29f4c8dd703c859ae475dea0302ba471662ae52ff7c4961f35b09942757ccf657d1d419edc50416dde6002
-DIST weechat-1.1.tar.bz2 2305548 SHA256 d06f15d8b945a76fc6b0ecfad358dfe4ae812b6fc998e0e221e8c2f75e3fca2d SHA512 2f7f44092603de5cf3321941599e4629caccf21bb65a6185ce4404abbae37beaa8eb447b328775c2404a1fc5227aea44623edfcdf86fe5927b4a3a1437f3e0b4 WHIRLPOOL 648c8a30875ba786812db6d97735404f3b070d020a0a402c9c04e4e9452515d616a8a1d6b721365f683945ec284bc705973f697c38d92c61baeecf5b6f759bf4
 DIST weechat-1.2.tar.bz2 2367277 SHA256 7c4501401f3794d551331b3cede354895962858acc50437567ffd40fa7af684d SHA512 dd806c1e63e5abab8fcc2f84a615eae8769fc9271f89abb19fae9ef4489e86e132a8d6a4843714a3c772c064c9060e4b63f7433fe6beddd3e675ba08a744a1f9 WHIRLPOOL 8d9d5db2f3628e41f7b186ae80189113645f64dff407b5b64f602deefcf821b2457225d57d2cb1dee6b4c014704013c48fbc26423f6a39b762a0c55439bfb908
-EBUILD weechat-0.4.3-r1.ebuild 3462 SHA256 a896a7b3016ca16ec944f5ea124300ed5ea987ce0c8bd1bf036f966633b9ecbb SHA512 06b31244446e542790ebb240946cd7ea22949557744b3ff11082e39c9e0c20d4ae5434fa05e126a9bc0d8d9e1bd6a490160540e0ed589fcf683335b558f90ab1 WHIRLPOOL c03401ad8a4dcc18b5b4dcb86a231f99e53ca1dab692c831c28dfe88bd73496bbb6ba5b03bc7c3d3faf35638bb2361ad8b4e44eabeb1fef55503e9ded5d62bd6
-EBUILD weechat-1.0.1.ebuild 3368 SHA256 2a90efb34150971b50a52a92d261cddecd228380dda9529e43cf2a4e9441f03a SHA512 41dcbccb75ee104fa86b8e42a8aef1b39c6d251797236f0b42ae1064925d0083dec5e77346d88624e908d42f5011d271ba5cfcb907864bda66a937354374d971 WHIRLPOOL 5867516dde4012304c63e3310e94f2612f2fdb9eecaac117d45156b811b3863b8f6b5f6ff8fd10e04b68f6642cf228401d0d18b7658a3f700199cdeb93159174
 EBUILD weechat-1.1.1.ebuild 3456 SHA256 941797c359947141eea26484f993884a2c7442cf86fc47f6e4d1010200e00b5a SHA512 7b7e62219178fc36b82aa6ca5e7186fca0d6b65f8487bc1fd953e59c6e25fd30a9be569bdb747b26ed9b1b8bf5b07d1690018d032170c01bf101a77b30214046 WHIRLPOOL eeaf448dfea806b2411cb8d6eacc291384693a8e8027bcb1a79e643d88341f8eb67426fb3d814dc995aa01a50e9dd47ba7b598617031574b5edb74781afaf74f
-EBUILD weechat-1.1.ebuild 3366 SHA256 b5d4a8956cd09ed05e80b58c01fe9aa2700ceb8308206018a5f0f76c4c247044 SHA512 f53a964d37b74948387ccf7f602307aefb97361355421a077551dbce47b1e8120aec3289e4c92bf518a485bca4991b79f78935771999945b54cf143f01596c37 WHIRLPOOL 3babe914bcfe0cb33409c596b5e59614a5ea6c67a72d2d4acc5e5accfd08ec1ec8dfe9c8cfd7fd1f6423cae4654f102acb4e3c2ac7583ece05f9a3ca5c881aa3
 EBUILD weechat-1.2.ebuild 3638 SHA256 f61ea199cdbfca0c86946e5c61b45b14980df3c4b3db74d5263b58ee88eab900 SHA512 e1b024074ef00068a86d893b3f67baa4d6ddc30761590663efa37cf054ca2942e81e6eaa8602586069e0668d22faeeb8fed3c1351a2544162762d6f7fceb7249 WHIRLPOOL ebe012f0f423d845e398cd67bf0dc65fe4da688c1d4c288f24260ffa4c322826673002aaa879b96875a7ba532161315c946fa873d534eb16d0be786393acd3fc
-EBUILD weechat-9999.ebuild 3515 SHA256 58b8591969640e9a92f337799fe7fb111cdcbee506390407d682a669015f6b28 SHA512 30cdb94e36040071721d27d62e0b403753b4956d01d0f4e89505e3821cabdb6b4d6741fa3b72a3bf6ad89054be04d3714bb12448243ff0b89bf08c54f7e4ddcc WHIRLPOOL 9c4e731dbbc28d5087c502cf615d7af101f87239d4438566dcb32565e1321a4e5b4553ea4e6c29d67fa828052958ba74e4b13eb961b08138eb30279f2c92374f
-MISC ChangeLog 21929 SHA256 d0e99b6eef2cc663ec6f36f1735078390a3bcc3795c86387584757b791ea501d SHA512 c9ba02e883b35e63eea2f6f457b75d58843db2abb30e55e1928ca929f85bd81966a34b7fc6d1652d24e7e1f2e4b96dafabaff844502e02b6a8a31e7dac80b459 WHIRLPOOL 9e9db6b07f5dd18736390e1a0171d2ff751ed47ddfcdc3d31a711f9c3b96c178a01e05e210e888553d8d21ba5bbad230144812503052a898c1b79c38b8a6dbe8
+EBUILD weechat-9999.ebuild 3691 SHA256 a95770679a39ca141096df6f39056466981983af3ebde576655f60d17a7b29c4 SHA512 e1d1a25928b1c05f20fc5cf9e4f3537d7b113d4d2238f19a501eab6f41ec5028a7c0fd140505d7291e5fa8edd75e60e91d521e14f7fd2d525d3fda60cbf574c7 WHIRLPOOL 4d51d30d6bacc54367e2155ec4d68002fa824ee83626cc18a42e43f7f86625868aff7812c174d6f8071db8a8a44b21b5fe2fdae106186a801e022cf2ba694d8d
+MISC ChangeLog 22145 SHA256 96c6e162723e1e8f3bf054ffa7db9fb988789b888f8e9b877a62c6407c0688c5 SHA512 8ea6a13bebb67147b30b7878a2ca6b8d9fae1dd54d493d7d5f7787feb51b6e86e3971db4afe34b5e025cdce92e4e1a5e7dad122301ba5eb4afd873f0fc939982 WHIRLPOOL 43287bd022db4103fa1704f836fb89ddce504dc756095b168d4499606c75ed6a878b18cfe9b99916ca8aefed109eafe41aa7c4484b5d9f59423d6fdf90320e12
 MISC metadata.xml 942 SHA256 6ff57da4fb08c6a4416fed9185c979a0f3f03e7c8232141a3822dc15d6662a18 SHA512 2a9f6af7c422322e3c3900e78eb6c612b1bf8a3a111d6d3074ed169904a61e1d038d009e698c767b104a393930f0f93eaf4bc27da1f8f78d1a460067c6d81816 WHIRLPOOL 24ac92d123e15a98bd53a2fe214f693c1b216b752ac8ea3e655dbcf608742b06dba12224d51f2bf99034efdb79a722a8229fd688e467eb83f87a3bce8ccde030
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVV5fCAAoJEEqz6FtPBkyjkUAIAIicky79LLkWMKLMJs99JcsP
-rf0BXcHulF9bCQcE1su2b8kNXtj0yh8v0+zrDRN4oW+Ouc1etwWnnxoMelGsCaP0
-uCSPw8uyfFCmYcFIluL8xRZvtzWQv7ZZt4a346KEatm8s8PDvcUbJF/Q3W5i/5Sc
-Fw85qosj+vOS/EOA2YDXsggDc1nOkDGd1n35esvpxJBC+AZK2LF8RgVassEKmlVr
-VOUDF2tTkI9ejVMCyXwuEUhVnKGFXDI2NHOVM37N2D0TfVGMKbecWCeLFtQgoHUX
-EbRLoGvkgAmLUm+xMRXJzfD1Ue7xLZcgXPEFVOu0J4FkHK0Dkj8LAVluftS1i2c=
-=LLU7
+iQEcBAEBCAAGBQJVV5hFAAoJEEqz6FtPBkyjS0oH/1Lx4nzL6WyoSg8+ZdWYMJvS
+58G5WOJWAIVGSG6aAQnHZPFSebAU67p+E8WD5FxyLJm9/3UGbgJPVA2Cj3qFuF1R
+ByEAo318rM0cYqhSIVdqK9Et+KxjtYekVJM4FtNLKfwHvMq4megD1KQ/z90FijHu
+vpqxDzGoyBnPjzSL4wEzcWE/67S7ft5QEWSCKmPik/EUX1C5S3CFVM3KimmGUdNI
+sWU4BAUgX0URhG3UKBclXaREq/Ol7a3UbzDnH2ZkAadhYNeCuk0WHCma8O0MMtXR
+/6kWIj+nuep8Lfvldn368a7ZfKFfiMJuGCc8zfnrK3KM7JD0NLrl5lCJrVsB9tI=
+=bp9D
 -----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/files/weechat-0.4.3-always-link-against-pthreads.patch b/net-irc/weechat/files/weechat-0.4.3-always-link-against-pthreads.patch
deleted file mode 100644
index 2a3bc8807a49..000000000000
--- a/net-irc/weechat/files/weechat-0.4.3-always-link-against-pthreads.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 30073b511397646b9ef06ed657fda157dd8c6209 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Thu, 13 Feb 2014 14:36:23 +0100
-Subject: [PATCH] Link against pthread on all platforms.
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- src/gui/curses/CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
-index 325c611..a8927bc 100644
---- a/src/gui/curses/CMakeLists.txt
-+++ b/src/gui/curses/CMakeLists.txt
-@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-   ENDIF(HAVE_BACKTRACE)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
- 
--IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
--  LIST(APPEND EXTRA_LIBS "pthread")
--ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-+LIST(APPEND EXTRA_LIBS "pthread")
- 
- IF(ICONV_LIBRARY)
-   LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
--- 
-1.8.5.4
-
diff --git a/net-irc/weechat/weechat-0.4.3-r1.ebuild b/net-irc/weechat/weechat-0.4.3-r1.ebuild
deleted file mode 100644
index 537bb15a9fd2..000000000000
--- a/net-irc/weechat/weechat-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.3-r1.ebuild,v 1.10 2015/04/26 11:58:54 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
-[[ ${PV} == "9999" ]] && GIT_ECLASS="git-r3"
-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 x86 ~amd64-fbsd ~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} doc nls +ssl"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( dev-scheme/guile:12 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	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:0= )
-"
-#	ncurses? ( sys-libs/ncurses )
-#	gtk? ( x11-libs/gtk+:2 )
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		dev-util/source-highlight
-	)
-	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
-
-	epatch "${FILESDIR}"/"${PN}"-0.4.3-always-link-against-pthreads.patch
-
-	# 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
-
-	# install only required documentation ; en always
-	for i in `grep ADD_SUBDIRECTORY doc/CMakeLists.txt \
-			| sed -e 's/.*ADD_SUBDIRECTORY( \(..\) ).*/\1/' -e '/en/d'`; do
-		if ! use linguas_${i} ; then
-			sed -i \
-				-e '/ADD_SUBDIRECTORY( '${i}' )/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-}
-
-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 alias)
-		$(cmake-utils_use_enable doc)
-		$(cmake-utils_use_enable charset)
-		$(cmake-utils_use_enable fifo)
-		$(cmake-utils_use_enable guile)
-		$(cmake-utils_use_enable irc)
-		$(cmake-utils_use_enable logger)
-		$(cmake-utils_use_enable lua)
-		$(cmake-utils_use_enable nls)
-		$(cmake-utils_use_enable perl)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable relay)
-		$(cmake-utils_use_enable rmodifier)
-		$(cmake-utils_use_enable ruby)
-		$(cmake-utils_use_enable scripts)
-		$(cmake-utils_use_enable scripts script)
-		$(cmake-utils_use_enable spell ASPELL)
-		$(cmake-utils_use_enable ssl GNUTLS)
-		$(cmake-utils_use_enable tcl)
-		$(cmake-utils_use_enable xfer)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-1.0.1.ebuild b/net-irc/weechat/weechat-1.0.1.ebuild
deleted file mode 100644
index 43fad13f02bf..000000000000
--- a/net-irc/weechat/weechat-1.0.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-1.0.1.ebuild,v 1.4 2015/03/25 16:39:41 jlec Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit python-single-r1 multilib cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="http://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
-#INTERFACES="+ncurses gtk"
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt_BR ru tr"
-IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-#REQUIRED_USE=" || ( ncurses gtk )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( dev-scheme/guile:12 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	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:0= )
-"
-#	ncurses? ( sys-libs/ncurses )
-#	gtk? ( x11-libs/gtk+:2 )
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		dev-util/source-highlight
-	)
-	nls? ( >=sys-devel/gettext-0.15 )
-	test? ( dev-util/cpputest )
-"
-
-DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc"
-
-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
-
-	# install only required documentation ; en always
-	for i in `grep ADD_SUBDIRECTORY doc/CMakeLists.txt \
-			| sed -e 's/.*ADD_SUBDIRECTORY( \(..\) ).*/\1/' -e '/en/d'`; do
-		if ! use linguas_${i} ; then
-			sed -i \
-				-e '/ADD_SUBDIRECTORY( '${i}' )/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-}
-
-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 alias)
-		$(cmake-utils_use_enable doc)
-		$(cmake-utils_use_enable charset)
-		$(cmake-utils_use_enable exec)
-		$(cmake-utils_use_enable fifo)
-		$(cmake-utils_use_enable guile)
-		$(cmake-utils_use_enable irc)
-		$(cmake-utils_use_enable logger)
-		$(cmake-utils_use_enable lua)
-		$(cmake-utils_use_enable nls)
-		$(cmake-utils_use_enable perl)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable relay)
-		$(cmake-utils_use_enable ruby)
-		$(cmake-utils_use_enable scripts)
-		$(cmake-utils_use_enable scripts script)
-		$(cmake-utils_use_enable spell ASPELL)
-		$(cmake-utils_use_enable ssl GNUTLS)
-		$(cmake-utils_use_enable tcl)
-		$(cmake-utils_use_enable test TESTS)
-		$(cmake-utils_use_enable trigger)
-		$(cmake-utils_use_enable xfer)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-1.1.ebuild b/net-irc/weechat/weechat-1.1.ebuild
deleted file mode 100644
index 542460c5cf41..000000000000
--- a/net-irc/weechat/weechat-1.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-1.1.ebuild,v 1.2 2015/03/25 16:39:41 jlec Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit python-single-r1 multilib cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="http://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
-#INTERFACES="+ncurses gtk"
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt_BR ru tr"
-IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-#REQUIRED_USE=" || ( ncurses gtk )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( dev-scheme/guile:12 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	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:0= )
-"
-#	ncurses? ( sys-libs/ncurses )
-#	gtk? ( x11-libs/gtk+:2 )
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		dev-util/source-highlight
-	)
-	nls? ( >=sys-devel/gettext-0.15 )
-	test? ( dev-util/cpputest )
-"
-
-DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc"
-
-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
-
-	# install only required documentation ; en always
-	for i in `grep ADD_SUBDIRECTORY doc/CMakeLists.txt \
-			| sed -e 's/.*ADD_SUBDIRECTORY( \(..\) ).*/\1/' -e '/en/d'`; do
-		if ! use linguas_${i} ; then
-			sed -i \
-				-e '/ADD_SUBDIRECTORY( '${i}' )/d' \
-				doc/CMakeLists.txt || die
-		fi
-	done
-}
-
-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 alias)
-		$(cmake-utils_use_enable doc)
-		$(cmake-utils_use_enable charset)
-		$(cmake-utils_use_enable exec)
-		$(cmake-utils_use_enable fifo)
-		$(cmake-utils_use_enable guile)
-		$(cmake-utils_use_enable irc)
-		$(cmake-utils_use_enable logger)
-		$(cmake-utils_use_enable lua)
-		$(cmake-utils_use_enable nls)
-		$(cmake-utils_use_enable perl)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable relay)
-		$(cmake-utils_use_enable ruby)
-		$(cmake-utils_use_enable scripts)
-		$(cmake-utils_use_enable scripts script)
-		$(cmake-utils_use_enable spell ASPELL)
-		$(cmake-utils_use_enable ssl GNUTLS)
-		$(cmake-utils_use_enable tcl)
-		$(cmake-utils_use_enable test TESTS)
-		$(cmake-utils_use_enable trigger)
-		$(cmake-utils_use_enable xfer)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 96af9a3f20d8..6e96884e5cc8 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.39 2015/04/01 20:52:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.40 2015/05/16 19:19:32 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -23,6 +23,7 @@ SLOT="0"
 NETWORKS="+irc"
 PLUGINS="+alias +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
 #INTERFACES="+ncurses gtk"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 SCRIPT_LANGS="guile lua +perl +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt_BR ru tr"
 IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
@@ -57,6 +58,9 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc"
 
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }