Migrate to python-any-r1, add missing dependency on json-glib. Fixes bug #430042.

(Portage version: 2.1.13.3/cvs/Linux x86_64, signed Manifest commit with key )

4 files changed, 27 insertions, 144 deletions

diff --git a/x11-plugins/purple-plugin_pack/ChangeLog b/x11-plugins/purple-plugin_pack/ChangeLog
index 96fb4352959d..8ad8efd6e2cc 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/ChangeLog,v 1.45 2012/08/24 14:57:33 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/ChangeLog,v 1.46 2013/08/03 23:02:35 mrueg Exp $
+
+*purple-plugin_pack-2.7.0-r1 (03 Aug 2013)
+
+  03 Aug 2013; Manuel Rüger <mrueg@gentoo.org>
+  +purple-plugin_pack-2.7.0-r1.ebuild, -purple-plugin_pack-2.5.1-r1.ebuild,
+  -purple-plugin_pack-2.6.2-r1.ebuild, -purple-plugin_pack-2.6.3.ebuild:
+  Migrate to python-any-r1, add missing dependency on json-glib. Fixes bug
+  #430042.
 
   24 Aug 2012; Michael Weber <xmw@gentoo.org> purple-plugin_pack-2.7.0.ebuild:
   ppc stable (bug 422399).
diff --git a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.5.1-r1.ebuild b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.5.1-r1.ebuild
deleted file mode 100644
index af3c76e04810..000000000000
--- a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 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.5.1-r1.ebuild,v 1.5 2011/10/27 06:46:56 tetromino Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A package with many different plugins for pidgin and libpurple"
-HOMEPAGE="http://plugins.guifications.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE="talkfilters debug gtk ncurses spell"
-
-RDEPEND="net-im/pidgin[gtk?,ncurses?]
-	talkfilters? ( app-text/talkfilters )
-	spell? ( app-text/gtkspell:2 )"
-DEPEND="${RDEPEND}
-	dev-lang/python"
-
-src_configure() {
-	local plugins=""
-
-	# XMMS Remote is disabled due to XMMS being masked
-	DISABLED_PLUGINS="xmmsremote"
-
-	use talkfilters || DISABLED_PLUGINS="${DISABLED_PLUGINS} talkfilters"
-	use spell || DISABLED_PLUGINS="${DISABLED_PLUGINS} switchspell"
-
-	plugins="$(python plugin_pack.py -p dist_dirs)"
-	use gtk && plugins="${plugins} $(python plugin_pack.py -P dist_dirs)"
-	use ncurses && plugins="${plugins} $(python plugin_pack.py -f dist_dirs)"
-
-	# Disable incomplete plugins too
-	DISABLED_PLUGINS="${DISABLED_PLUGINS} $(python plugin_pack.py -i dist_dirs)"
-
-	for i in $DISABLED_PLUGINS; do
-		plugins="${plugins//$i/}"
-		plugins="${plugins//  / }"
-		plugins="${plugins/# /}"
-		plugins="${plugins/% /}"
-		echo disabled $i
-		echo $plugins
-	done
-
-	plugins="${plugins// /,}"
-
-	econf --with-plugins="${plugins}" $(use_enable debug) || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README VERSION || die
-}
diff --git a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.2-r1.ebuild b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.2-r1.ebuild
deleted file mode 100644
index cc5ab945d086..000000000000
--- a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2011 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.2-r1.ebuild,v 1.6 2011/10/27 06:46:56 tetromino Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A package with many different plugins for pidgin and libpurple"
-HOMEPAGE="http://plugins.guifications.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE="debug gtk ncurses spell talkfilters"
-
-RDEPEND="net-im/pidgin[gtk?,ncurses?]
-	talkfilters? ( app-text/talkfilters )
-	spell? ( app-text/gtkspell:2 )"
-DEPEND="${RDEPEND}
-	dev-lang/python"
-
-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
-	DISABLED_PLUGINS+=" schedule findip"
-	use gtk || DISABLED_PLUGINS+=" $(list_plugins_dep pidgin)"
-	use ncurses || DISABLED_PLUGINS+=" $(list_plugins_dep finch)"
-	use spell || DISABLED_PLUGINS+=" $(list_plugins_dep gtkspell)"
-	use talkfilters || DISABLED_PLUGINS+=" $(list_plugins_dep talkfiltersbin)"
-
-	for plug in ${DISABLED_PLUGINS}; do
-		plugins="${plugins//${plug}}"
-	done
-
-	plugins="$(echo ${plugins} | sed 's:[ \t]\+:,:g;s:,$::;s:^,::')"
-
-	econf \
-		--with-plugins="${plugins}" \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README VERSION || die
-}
-
-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 (for list see einfo in build output)."
-}
diff --git a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild
index f12084edfff1..ce1b1451931a 100644
--- a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.6.3.ebuild
+++ b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.3.ebuild,v 1.8 2012/06/14 02:02:57 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild,v 1.1 2013/08/03 23:02:35 mrueg Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit eutils python
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit eutils python-any-r1
 
+MY_PN=${PN/_/-}
+MY_P=${MY_PN}-${PV}
 DESCRIPTION="A package with many different plugins for pidgin and libpurple"
-HOMEPAGE="http://plugins.guifications.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="https://bitbucket.org/rekkanoryo/purple-plugin-pack/"
+SRC_URI="https://bitbucket.org/rekkanoryo/${MY_PN}/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 IUSE="debug gtk ncurses spell talkfilters"
 
-RDEPEND="net-im/pidgin[gtk?,ncurses?]
+RDEPEND="dev-libs/json-glib
+	net-im/pidgin[gtk?,ncurses?]
 	talkfilters? ( app-text/talkfilters )
 	spell? ( app-text/gtkspell:2 )"
 DEPEND="${RDEPEND}
-	=dev-lang/python-2*"
+	${PYTHON_DEPS}"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	sed -e '/CFLAGS=/{s| -g3||}' -i configure || die
@@ -39,7 +40,7 @@ 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)"
+	plugins="$(${EPYTHON} plugin_pack.py -d dist_dirs)"
 	einfo "List of all possible plugins:"
 	einfo "${plugins}"
 
@@ -63,8 +64,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README VERSION || die
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README VERSION
 }
 
 pkg_preinst() {