Clean up partial version bump, drop old, resolves bug

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 27 insertions, 106 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/Manifest b/net-irc/limnoria/Manifest
index 5b36f0798f9d..88ebffe0a17c 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,7 +1,17 @@
-DIST limnoria-20150318.tar.gz 931568 SHA256 e719d11bedd8814a54ade4a41cf8f6a363d96665d4be89aec2c2d0f574a676b7 SHA512 02185fbdabfe0ad52fb49713d66773a6bf31dfbb9efdb0b578e5b4244a364a48d70af3b14a95954b0bc01ff8212ea977a16288c97704f9d69da2edfb5eff5620 WHIRLPOOL cb87a506a2b4f148386e982821f9f1e8522553765bfc0dc46c245853b99d58ddb9e29718a8637b44fcc54bf095ea2f4ad98957afddad16e9983e6f6a2f394b0d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST limnoria-20150429.tar.gz 931326 SHA256 a9ad09f3820bad5ed57cdcfa39aa78cd4c698b1ce5860cecc7a722e5b44d287d SHA512 3e6d52463270624506b733364b212c784a730104f4c6760ddd002983e42a17b1815ec6bee785ab619fe1f17f62b90fa35b3d55dac412368d85c392adacca1620 WHIRLPOOL 0cfb169d371a5595b52a404424c5a2134f3a2a03da77ec507cff60e1dbc3f92f7c88c309807c34d58a0c168ad65245e8349e364f4be9e75aa92963640c2ab52f
-EBUILD limnoria-20150318.ebuild 2710 SHA256 f9c43a36c278a7f52735c64e4440cee9fb031aea9cf2b15c9644494645726e3c SHA512 a95448b2669ea387f262c119c49078a4a9df91da8dbc243a62462d81d6df49ddde37a57af79b5f9f4a36f611e885b193aa1c5e7d64a0f329b06858abe5304f6d WHIRLPOOL 0c11ca841b89c6198b6220c8af33ea583e708ed91344f89623de8643306976a64cc85c62d83b68a5bf785563d524d0015d194d7e372097549073d6808ed60229
-EBUILD limnoria-20150429.ebuild 2711 SHA256 0e57d35f35e5eee7e409d23b3d6575b8c76f902c0c3eec3c410673aba9aebf45 SHA512 893fe6a000705aa421be9e9b9803dd4ba28d16f46d223da58afdc65f1a39fd8dc2c31a12bf384d4f03730a9dd67946ffd564a4e0986f23292ce7e1d61ec8c5a1 WHIRLPOOL 314edd785cb87c57a89b75df6dc493d0cd6a2c599bda125885fe1b68d1c4deb92236b2474e7aa4b7117d491bfab460f8578008479a9abb7016d8aa9fddb096fb
-EBUILD limnoria-99999999.ebuild 2784 SHA256 23bde630e8c3cd8a54bd1922e807ef94592ecbf1a030f561761c927cb545f25e SHA512 3a53dc0bc55e4c82449fc3b8fcaccc6849b34908ce999d90c5f88a9efaace4186c6a5e1b01357a2c3afae0c031b073e4c81b5f755b0ddae64f481eaf5c152bc2 WHIRLPOOL 965c06963dd3fd90caf8c0b38dadd6bc4a9186f2730a7f23cb038f3dfcd5ecb7f6d380ed453501c3811aaeb9bef9a6105579ec6137e0be9a897528ab475caa4f
-MISC ChangeLog 1160 SHA256 0af964bf4fe6f717e691caf6c2f74011a4320425c6be4049cabee1d356b4c1fd SHA512 ca1c7eba11cf2150cc832dc2b1f228b1136daf98d62e4c882b4ce381a2826292534355ec7425629efc0cbf79da5c409d7bef75d32895191e43d59e9602696b56 WHIRLPOOL 12d40d9b70e8ff755d7ca2ba62d37482bb0bd6b8b8ced942111a7e19ac06aadbca5ed852361d6934ed3e198eb97fca408a4fa23aa9d237e45f61697031163f02
+EBUILD limnoria-20150429.ebuild 2746 SHA256 16d7a8701d243445fbc630cdcf38ae0cc141014579e9a2707dcae5409305ea44 SHA512 faf8df0968daf138d64d7853a1ee69e5bca97114e50599154dba9efbbb8c4d4097dc292c4dcd2cc6a0b1c06bf784bb754790f5fdc061fbcd2f17d241bf787ccb WHIRLPOOL 8812b0d15eca068dffd4a9cc36cacafdb3384c4d3a521a8dea897cea4192c3c0af3d08cb5ee40633735f1a8c4461885788d1960997677bbcc952ce1a7604f1d8
+EBUILD limnoria-99999999.ebuild 2746 SHA256 f5df56159bf2c1fc87013d8c1ca5b3b981ca38b36a20d86c69eb32c8eae326d8 SHA512 2c5744cfd4af9e7198f90ad44f92c3250fac9cdaae3bfd82872b3b8c99a3fcafbddd452d91721ecb3d87d462584d812b91a044bf778310cb8200c8ab6dcbd586 WHIRLPOOL 4971b280b92b7ad02bcbecab6ab0a2cd9e42312d7f8a2cc603a98a30c3f68418855cb8521b7750154d98474017c04f4f7915054bdf9ebe28d28bf90480ed0095
+MISC ChangeLog 1346 SHA256 ece643024fe94530b006cab6e2e97c9ea75c622c7a70dc3d026a7ba5d2277d17 SHA512 0397d67646ec4ea9fc9b4d77ff9bb1faa5450787482e9085b51e86476e34046500d86cdd12789f57f075a036f9b1c9b2f6fe60a8a9210c8a236304a328ec859d WHIRLPOOL 592f7dc100f1af3f9ba70589a009f8dff1f2ae5fbfffec5825c395fdfe033363ea758b3e3d6e0194ac4447984328b80d88a54ee9b05f0ee7bf1d09ecd8e49692
 MISC metadata.xml 477 SHA256 a6eba8192097a9d15384a11b5691ded2b0a83d57a4006a78a2af0b03d6f00423 SHA512 f8aa94af426f01f436e7ccb60bea47343216c1b45232825a278b5f7155a9cb98fbd546ba74878529ffc8a9c28f1d0e78335040cf4d101427e72060a05053c83b WHIRLPOOL 40f8a2b5011881da7a35f749cf07e52aaad830447c62ce9f15e88f54c17ec3a34a7c1c3a3c9ebe669bb54e7ba49efd0585e4bb61ab6fbd121026d49259945750
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iKYEAREIAGYFAlVayfxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw0MggCgtR1h+y1mZI4EwYQ8Sg+3S/y7
+IV8AoKg6X6P4jqoedPCiDVMpSBbOS0QP
+=TFe7
+-----END PGP SIGNATURE-----
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 ""
 }