Remove old.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

6 files changed, 11 insertions, 416 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/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
 }