Clean up partial version bump, drop old, resolves bug

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

4 files changed, 12 insertions, 101 deletions

diff --git a/net-irc/limnoria/ChangeLog b/net-irc/limnoria/ChangeLog
index 663aba42f701..83c17ef5d983 100644
--- a/net-irc/limnoria/ChangeLog
+++ b/net-irc/limnoria/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/limnoria
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/limnoria/ChangeLog,v 1.4 2015/05/18 09:54:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/limnoria/ChangeLog,v 1.5 2015/05/19 05:28:10 idella4 Exp $
+
+  19 May 2015; Ian Delaney <idella4@gentoo.org> -limnoria-20150318.ebuild,
+  limnoria-20150429.ebuild, limnoria-99999999.ebuild:
+  Clean up partial version bump, drop old, resolves bug
 
   18 May 2015; Patrick Lauer <patrick@gentoo.org> limnoria-20150429.ebuild:
   Whitespace
diff --git a/net-irc/limnoria/limnoria-20150318.ebuild b/net-irc/limnoria/limnoria-20150318.ebuild
deleted file mode 100644
index 495514dac6d1..000000000000
--- a/net-irc/limnoria/limnoria-20150318.ebuild
+++ /dev/null
@@ -1,91 +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/limnoria/limnoria-20150318.ebuild,v 1.1 2015/03/30 06:45:21 idella4 Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PN="Limnoria"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${PV} == "99999999" ]]; then
-	EGIT_REPO_URI="git://github.com/ProgVal/Limnoria.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
-fi
-
-DESCRIPTION="Python based extensible IRC infobot and channel bot"
-HOMEPAGE="http://supybot.aperio.fr/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="crypt ssl test"
-
-RDEPEND="
-	dev-python/charade[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/socksipy[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	!net-irc/supybot
-	!net-irc/supybot-plugins
-	"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
-
-python_prepare(){
-	distutils-r1_python_prepare
-	if python_is_python3; then
-		einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
-		einfo "bindings and feedparser."
-		rm -rf "plugins/RSS" || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/*
-}
-
-python_test() {
-	pushd "${T}" > /dev/null
-	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS=( --exclude="${PLUGINS_DIR}/Scheduler" )
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Filter" )
-	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
-	# runs successfully when running the tests on the installed system
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
-	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
-		--plugins-dir="${PLUGINS_DIR}" --no-network \
-		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
-		|| die "Tests failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/"
-	elog ""
-	elog "Use supybot-wizard to create a configuration file."
-	elog "Run supybot </path/to/config> to use the bot."
-}
diff --git a/net-irc/limnoria/limnoria-20150429.ebuild b/net-irc/limnoria/limnoria-20150429.ebuild
index 5cde5d98a738..866299419ca6 100644
--- a/net-irc/limnoria/limnoria-20150429.ebuild
+++ b/net-irc/limnoria/limnoria-20150429.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/limnoria/limnoria-20150429.ebuild,v 1.2 2015/05/18 09:54:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/limnoria/limnoria-20150429.ebuild,v 1.3 2015/05/19 05:28:10 idella4 Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -42,7 +42,7 @@ RDEPEND="
 	!net-irc/supybot-plugins
 	"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]]; then
diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-99999999.ebuild
index 0d4d7c286fb5..7e5be2d2d133 100644
--- a/net-irc/limnoria/limnoria-99999999.ebuild
+++ b/net-irc/limnoria/limnoria-99999999.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/limnoria/limnoria-99999999.ebuild,v 1.1 2015/03/04 09:13:38 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/limnoria/limnoria-99999999.ebuild,v 1.2 2015/05/19 05:28:10 idella4 Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${MY_PV}"
 
 if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="git://github.com/ProgVal/Limnoria.git"
-	EGIT_BRANCH="master"
+	EGIT_BRANCH="testing"
 	inherit git-r3
 	SRC_URI=""
 else
@@ -26,10 +26,10 @@ DESCRIPTION="Python based extensible IRC infobot and channel bot"
 HOMEPAGE="http://supybot.aperio.fr/"
 LICENSE="BSD"
 SLOT="0"
-IUSE="crypt test"
+IUSE="crypt ssl test"
 
 RDEPEND="
-	dev-python/charade[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/feedparser[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -37,6 +37,7 @@ RDEPEND="
 	dev-python/socksipy[${PYTHON_USEDEP}]
 	dev-python/sqlalchemy[${PYTHON_USEDEP}]
 	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 	!net-irc/supybot
 	!net-irc/supybot-plugins
 	"
@@ -87,7 +88,4 @@ pkg_postinst() {
 	elog ""
 	elog "Use supybot-wizard to create a configuration file."
 	elog "Run supybot </path/to/config> to use the bot."
-	elog ""
-	elog "There are additional plugins available in net-im/limnoria-plugins"
-	elog ""
 }