tidy to install, rm old

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

3 files changed, 12 insertions, 36 deletions

diff --git a/dev-python/pyparsing/ChangeLog b/dev-python/pyparsing/ChangeLog
index d41e73e8a305..c84e606e8277 100644
--- a/dev-python/pyparsing/ChangeLog
+++ b/dev-python/pyparsing/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyparsing
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.106 2014/11/09 09:56:22 idella4 Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.107 2015/01/14 07:37:16 idella4 Exp $
+
+  14 Jan 2015; Ian Delaney <idella4@gentoo.org> -pyparsing-2.0.2.ebuild,
+  pyparsing-2.0.3.ebuild:
+  tidy to install, rm old
 
 *pyparsing-2.0.3 (09 Nov 2014)
 
diff --git a/dev-python/pyparsing/pyparsing-2.0.2.ebuild b/dev-python/pyparsing/pyparsing-2.0.2.ebuild
deleted file mode 100644
index 3cf744078828..000000000000
--- a/dev-python/pyparsing/pyparsing-2.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.2.ebuild,v 1.1 2014/04/22 18:05:02 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing"
-HOMEPAGE="http://pyparsing.wikispaces.com/ http://pypi.python.org/pypi/pyparsing"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
-
-python_install_all() {
-	local HTML_DOCS=( HowToUsePyparsing.html )
-	use doc && HTML_DOCS+=( htmldoc/ )
-
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.pdf
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pyparsing/pyparsing-2.0.3.ebuild b/dev-python/pyparsing/pyparsing-2.0.3.ebuild
index 695271983d2b..e7b765657a7b 100644
--- a/dev-python/pyparsing/pyparsing-2.0.3.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.3.ebuild,v 1.1 2014/11/09 09:56:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-2.0.3.ebuild,v 1.2 2015/01/14 07:37:16 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -20,9 +20,10 @@ RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
 
 python_install_all() {
 	local HTML_DOCS=( HowToUsePyparsing.html )
-	use doc && HTML_DOCS+=( htmldoc/ )
+	if use doc; then
+		HTML_DOCS+=( htmldoc/. )
+		dodoc docs/*.pdf
+	fi
 	use examples && local EXAMPLES=( examples/. )
 	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.pdf
 }