From 4f68bb7dfe91d5212c537065c0153b271ac5eb09 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Mon, 8 Mar 2010 18:37:34 +0000 Subject: [PATCH] Fixed inability to build irc-mode, thank Zdenek Behan for report and Ivan Ponomarev for this fix. Drop unused. Package-Manager: portage-2.1.8.1/cvs/Linux x86_64 --- x11-plugins/purple-plugin_pack/ChangeLog | 10 +++++++- x11-plugins/purple-plugin_pack/Manifest | 6 ++--- ...ple-plugin_pack-2.6.2-build-irc-more.patch | 14 +++++++++++ ...ild => purple-plugin_pack-2.6.2-r1.ebuild} | 23 ++++++++----------- 4 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 x11-plugins/purple-plugin_pack/files/purple-plugin_pack-2.6.2-build-irc-more.patch rename x11-plugins/purple-plugin_pack/{purple-plugin_pack-2.6.1.ebuild => purple-plugin_pack-2.6.2-r1.ebuild} (80%) 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 + -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/Manifest b/x11-plugins/purple-plugin_pack/Manifest index af2427044122..0b741139d8a5 100644 --- a/x11-plugins/purple-plugin_pack/Manifest +++ b/x11-plugins/purple-plugin_pack/Manifest @@ -1,8 +1,8 @@ +AUX purple-plugin_pack-2.6.2-build-irc-more.patch 640 RMD160 1edd315e07d9c8cee0e750a8a26ac7eff72eb36c SHA1 c9a4eed714e1d959ec78c95e0151e8b5d3fef562 SHA256 bcd08ae1e47e59ed8e2d3a1d9ef2f660ddec93ab377813c7312f24ead32bc3d2 DIST purple-plugin_pack-2.5.1.tar.bz2 634377 RMD160 5301a0fc0698d76ff849c7591670b7437ec22705 SHA1 d8dd41dd7d4a79ea25ac46b0a3de76f2375e06ff SHA256 83b83a6915337f72ec21dc661078350fd292dbbcd2132232a247b0bcd3dc57f9 -DIST purple-plugin_pack-2.6.1.tar.bz2 688428 RMD160 e3a065e8e282d71eb82f38471dd570631f34ff02 SHA1 f5d46df01d69a01380f2b8c90d38d8d22ced1130 SHA256 00ab403e19b2b50780f35ecebecae3698aa730b36e649080e51b0c29316f6bf2 DIST purple-plugin_pack-2.6.2.tar.bz2 688806 RMD160 53487d3be8754fe81a3ce8fe67c1afa84c21f9b1 SHA1 5216eb47cb764719ac1e9666ae8fda665ffaa4fd SHA256 62af96202aec6040835c8d419224e8f830d0bcfce20edebe32ba5cf348db23cf EBUILD purple-plugin_pack-2.5.1-r1.ebuild 1669 RMD160 979f0095cc014525625a50478b6f14e608d0f90d SHA1 ec7aed35dcfe395d06c944224b4973eee5299fc3 SHA256 b390874a3ae9e25ff666dd566c6398bb3497b8722f17f7a0d7608945ebb15eba -EBUILD purple-plugin_pack-2.6.1.ebuild 2149 RMD160 e151313d9055eab6701aca5c30671a9d35d8510a SHA1 24bddecef4cbccc17d811cc8b5f9ef38b738a109 SHA256 bdc71cc739951302777f0e8748f5ecfc4b0ddca1d72b6e915888e6ff39617149 +EBUILD purple-plugin_pack-2.6.2-r1.ebuild 2030 RMD160 b4eed75f4f3b81398e157bd67e5781e724f19c66 SHA1 9ed0df64496f872fb9b1605240ad9efbfc6c42f3 SHA256 2d3ed09ecb7017276eaa199b1152712050c37779ddd002781c252a1353626c72 EBUILD purple-plugin_pack-2.6.2.ebuild 1960 RMD160 6bfbffd7966246b5ef49d75199962e8fda978912 SHA1 1c8f0765a2becde7f2035b62397f07ef38abcc94 SHA256 acf598d545218dbc0a0fe66e5e97f3958b036598bdf5ea417f97be6c381e6934 -MISC ChangeLog 3917 RMD160 d992bd7a40277724c58034ea25c6ef8c250083b6 SHA1 2f7e5cc20b5eb1ce2b38b358546b74e219ff77ed SHA256 9381ab674391c7aad82e3f80e3846c8fb111e651efa25cf5b7200d77fdd51f22 +MISC ChangeLog 4251 RMD160 f7c421811477bb072c9e6d7626c107decbfd31df SHA1 3e1caa1d8bc5d3061fe15e77501b9bf7aea87f5b SHA256 6c01e04ad2630d67fae5c33bcab4b2d8a484f608b6e9d19e0aa03c4d455efa0d MISC metadata.xml 259 RMD160 850f51a3edf4bde0b448018fc075abda1e9aa6c3 SHA1 eb98d4e915a716139d8734f2a91cd0efeff6c2a7 SHA256 e816434b840119ef3c9b153e2e4b53206db75953e7c210f135896caa5468eca7 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 similarity index 80% rename from x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.1.ebuild rename to 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)." } -- 2.26.2