Fixed inability to build irc-mode, thank Zdenek Behan for report and Ivan Ponomarev for this fix. Drop unused.

(Portage version: 2.1.8.1/cvs/Linux x86_64)

3 files changed, 33 insertions, 14 deletions

diff --git a/x11-plugins/purple-plugin_pack/ChangeLog b/x11-plugins/purple-plugin_pack/ChangeLog
index e2c6b6f99390..f8fed9905df3 100644
--- a/x11-plugins/purple-plugin_pack/ChangeLog
+++ b/x11-plugins/purple-plugin_pack/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/purple-plugin_pack
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/ChangeLog,v 1.27 2010/01/16 13:55:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/ChangeLog,v 1.28 2010/03/08 18:37:33 pva Exp $
+
+*purple-plugin_pack-2.6.2-r1 (08 Mar 2010)
+
+  08 Mar 2010; Peter Volkov <pva@gentoo.org>
+  -purple-plugin_pack-2.6.1.ebuild, +purple-plugin_pack-2.6.2-r1.ebuild,
+  +files/purple-plugin_pack-2.6.2-build-irc-more.patch:
+  Fixed inability to build irc-mode, thank Zdenek Behan for report and Ivan
+  Ponomarev for this fix. Drop unused.
 
 *purple-plugin_pack-2.6.2 (16 Jan 2010)
 
diff --git a/x11-plugins/purple-plugin_pack/files/purple-plugin_pack-2.6.2-build-irc-more.patch b/x11-plugins/purple-plugin_pack/files/purple-plugin_pack-2.6.2-build-irc-more.patch
new file mode 100644
index 000000000000..c865ae59dd15
--- /dev/null
+++ b/x11-plugins/purple-plugin_pack/files/purple-plugin_pack-2.6.2-build-irc-more.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=263513
+http://plugins.guifications.org/trac/ticket/607
+
+--- purple-plugin_pack-2.6.2/irc-more/plugins.cfg.orig	2009-04-19 10:30:03.000000000 +0600
++++ purple-plugin_pack-2.6.2/irc-more/plugins.cfg	2010-03-08 18:27:29.000000000 +0500
+@@ -1,7 +1,7 @@
+ [IRC More]
+ type=default
+ depends=purple
+-provides=ircmore
++provides=irc-more
+ summary=Adds additional IRC features
+ description=Adds additional IRC features, including a customizable quit message, a customizable CTCP VERSION reply, and the /notice command for notices where libpurple does not support it.
+ authors=Sadrul Habib Chowdhury,John Bailey
diff --git a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.1.ebuild b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.2-r1.ebuild
index fbf6d7d80691..923443614028 100644
--- a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.1.ebuild
+++ b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.1.ebuild,v 1.2 2009/12/22 00:35:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.2-r1.ebuild,v 1.1 2010/03/08 18:37:33 pva Exp $
 
 EAPI="2"
 
-inherit eutils autotools
+inherit eutils
 
 DESCRIPTION="A package with many different plugins for pidgin and libpurple"
 HOMEPAGE="http://plugins.guifications.org"
@@ -21,25 +21,22 @@ RDEPEND="net-im/pidgin[gtk?,ncurses?]
 DEPEND="${RDEPEND}
 	dev-lang/python"
 
-src_prepare() {
-	# http://plugins.guifications.org/trac/ticket/597
-	sed -e '/DEPENDENCIES=/{s:talkfilters:talkfiltersbin:}' \
-		-i configure* || die
-	sed -e '/^depends/{s:$: talkfiltersbin:}' \
-		-i talkfilters/plugins.cfg || die
-	eautoreconf #Avoid maintainer mode
-}
-
 list_plugins_dep() {
 	local dependency=${1}
 	grep -EH "depends.*$dependency" */plugins.cfg | sed 's:/.*::'
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build-irc-more.patch"
+}
+
 src_configure() {
 	local plugins=""
 
 	# list all plugins, then pull DISABLED_PLUGINS with the ones we don't need
 	plugins="$(python plugin_pack.py -d dist_dirs)"
+	einfo "List of all possible plugins:"
+	einfo "${plugins}"
 
 	eval DISABLED_PLUGINS="\$${PN//[^a-z]/_}_DISABLED_PLUGINS"
 	# disable known broken plugins
@@ -68,5 +65,5 @@ src_install() {
 pkg_preinst() {
 	elog "Note: if you want to disable some plugins in pack, define"
 	elog "${PN//[^a-z]/_}_DISABLED_PLUGINS with a list of plugins to"
-	elog "skip during install."
+	elog "skip during install (for list see einfo in build output)."
 }