Removed vulnerable versions

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 6 insertions, 306 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index 269e21cec9d9..4b9e31320abe 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.360 2014/11/25 17:07:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.361 2014/12/28 10:47:51 polynomial-c Exp $
+
+  28 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -pidgin-2.10.9-r1.ebuild,
+  -files/pidgin-2.10.9-python3_fix1.patch,
+  -files/pidgin-2.10.9-python3_fix2.patch:
+  Removed vulnerable versions.
 
 *pidgin-2.10.11 (25 Nov 2014)
 
diff --git a/net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch b/net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch
deleted file mode 100644
index 67e94312f770..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.9-python3_fix1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# HG changeset patch
-# User Ed Catmur <ed@catmur.co.uk>
-# Date 1392340585 18000
-# Node ID c8bb4edd63253b5b23006e8674c015c854075981
-# Parent  eeb82d3d33b1720024ee7aef9bdfba87bb1b163d
-Fix build of Finch against Python3.
-
-Fixes #15969.
-
-diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
---- a/finch/libgnt/gntwm.c
-+++ b/finch/libgnt/gntwm.c
-@@ -1281,7 +1281,12 @@
- {
- 	char *dir = g_path_get_dirname(path);
- 	FILE *file = fopen(path, "r");
--	PyObject *pp = PySys_GetObject("path"), *dirobj = PyString_FromString(dir);
-+	PyObject *pp = PySys_GetObject("path");
-+#if PY_MAJOR_VERSION >= 3
-+	PyObject *dirobj = PyUnicode_FromString(dir);
-+#else
-+	PyObject *dirobj = PyString_FromString(dir);
-+#endif
- 
- 	PyList_Insert(pp, 0, dirobj);
- 	Py_DECREF(dirobj);
-
diff --git a/net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch b/net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch
deleted file mode 100644
index 06ccaef7175f..000000000000
--- a/net-im/pidgin/files/pidgin-2.10.9-python3_fix2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# HG changeset patch
-# User Elliott Sales de Andrade <qulogic@pidgin.im>
-# Date 1392341598 18000
-# Node ID 922e7abddb4dbc1a397aad9c1d3b6fd091c4e392
-# Parent  a591c0486b041e029075e12b446430cf32b27d24
-Fix call to Py_SetProgramName in Python3.
-
-Refs #15969.
-
-diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c
---- a/finch/libgnt/gntwm.c
-+++ b/finch/libgnt/gntwm.c
-@@ -1577,7 +1577,17 @@
- 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "run-python", run_python,
- 				GNT_KEY_F3, NULL);
- 	if (!Py_IsInitialized()) {
-+#if PY_MAJOR_VERSION >= 3
-+		wchar_t *name;
-+		size_t len;
-+		len = mbstowcs(NULL, "gnt", 0);
-+		name = g_new(wchar_t, len + 1);
-+		mbstowcs(name, "gnt", len + 1);
-+		Py_SetProgramName(name);
-+		g_free(name);
-+#else
- 		Py_SetProgramName("gnt");
-+#endif
- 		Py_Initialize();
- 		started_python = TRUE;
- 	}
-
diff --git a/net-im/pidgin/pidgin-2.10.9-r1.ebuild b/net-im/pidgin/pidgin-2.10.9-r1.ebuild
deleted file mode 100644
index 99aeda230942..000000000000
--- a/net-im/pidgin/pidgin-2.10.9-r1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.9-r1.ebuild,v 1.19 2014/11/16 20:50:16 dilfridge Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
-inherit autotools flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python-single-r1
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	http://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
-IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
-IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
-IUSE+=" aqua"
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? ( sys-libs/ncurses[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} ) )
-	gtk? (
-		>=x11-libs/gtk+-2.10:2[aqua=]
-		x11-libs/libSM
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		spell? ( >=app-text/gtkspell-2.0.2:2 )
-		eds? ( >=gnome-extra/evolution-data-server-3.6:= )
-		prediction? ( >=dev-db/sqlite-3.3:3 ) )
-	gstreamer? ( =media-libs/gstreamer-0.10*
-		=media-libs/gst-plugins-good-0.10*
-		net-libs/farstream:0.1
-		media-plugins/gst-plugins-meta:0.10
-		media-plugins/gst-plugins-gconf:0.10 )
-	zeroconf? ( net-dns/avahi[dbus] )
-	dbus? ( >=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-0.90
-		dev-python/dbus-python )
-	perl? ( >=dev-lang/perl-5.16 )
-	gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls]
-		>=net-libs/libgadu-1.11.0[-ssl] ) )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.15.4 )
-	meanwhile? ( net-libs/meanwhile )
-	silc? ( >=net-im/silc-toolkit-1.0.1 )
-	tcl? ( dev-lang/tcl )
-	tk? ( dev-lang/tk )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	networkmanager? ( net-misc/networkmanager )
-	idn? ( net-dns/libidn )
-	!<x11-plugins/pidgin-facebookchat-1.69-r1"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	gtk? ( x11-proto/scrnsaverproto
-		${NLS_DEPEND} )
-	dbus? ( ${PYTHON_DEPS} )
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS="AUTHORS HACKING NEWS README ChangeLog"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-		dbus? ( ${PYTHON_REQUIRED_USE} )"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-pkg_setup() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch" \
-		"${WORKDIR}/${PN}-eds-3.6.patch" \
-		"${FILESDIR}/${P}-fix-gtkmedia.patch" \
-		"${FILESDIR}/${P}-python3_fix1.patch" \
-		"${FILESDIR}/${P}-python3_fix2.patch"
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	local myconf
-
-	if use gadu; then
-		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},gg"
-			myconf="${myconf} --with-gadu-includes=."
-			myconf="${myconf} --with-gadu-libs=."
-	fi
-
-	use groupwise && DYNAMIC_PRPLS+=",novell"
-	use silc && DYNAMIC_PRPLS+=",silc"
-	use meanwhile && DYNAMIC_PRPLS+=",sametime"
-	use mxit && DYNAMIC_PRPLS+=",mxit"
-	use zephyr && DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf && DYNAMIC_PRPLS+=",bonjour"
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=" --enable-nss=no --enable-gnutls=yes"
-		myconf+=" --with-gnutls-includes=${EPREFIX}/usr/include/gnutls"
-		myconf+=" --with-gnutls-libs=${EPREFIX}/usr/$(get_libdir)"
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=" --enable-gnutls=no --enable-nss=yes"
-	fi
-
-	if use dbus || { use ncurses && use python; }; then
-		myconf+=" --with-python=${PYTHON}"
-	else
-		myconf+=" --without-python"
-	fi
-
-	econf \
-		$(use_enable ncurses consoleui) \
-		$(use_enable gtk gtkui) \
-		$(use_enable gtk sm) \
-		$(use gtk || use_enable nls) \
-		$(use gtk && echo "--enable-nls") \
-		$(use gtk && use_enable xscreensaver screensaver) \
-		$(use gtk && use_enable prediction cap) \
-		$(use gtk && use_enable eds gevolution) \
-		$(use gtk && use_enable spell gtkspell) \
-		$(use_enable perl) \
-		$(use_enable tk) \
-		$(use_enable tcl) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable meanwhile) \
-		$(use_enable gstreamer) \
-		$(use_enable gstreamer farstream) \
-		$(use_enable gstreamer vv) \
-		$(use_enable sasl cyrus-sasl ) \
-		$(use_enable doc doxygen) \
-		$(use_enable networkmanager nm) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable idn) \
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/" \
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}" \
-		--disable-mono \
-		--x-includes="${EPREFIX}"/usr/include/X11 \
-		${myconf}
-		#$(use_enable mono) \
-}
-
-src_install() {
-	gnome2_src_install
-	if use gtk; then
-		# Fix tray pathes for kde-3.5, e16 (x11-wm/enlightenment) and other
-		# implementations that are not complient with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${ED}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	if use python || use dbus ; then
-		python_fix_shebang "${D}"
-		python_optimize
-	fi
-
-	dodoc finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	prune_libtool_files --all
-}