Version Bump

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

4 files changed, 24 insertions, 60 deletions

diff --git a/dev-python/markdown/ChangeLog b/dev-python/markdown/ChangeLog
index 469843f30bfa..2865104a3a32 100644
--- a/dev-python/markdown/ChangeLog
+++ b/dev-python/markdown/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/markdown
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/ChangeLog,v 1.70 2015/05/22 09:49:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/ChangeLog,v 1.71 2015/05/27 08:55:22 jlec Exp $
+
+*markdown-2.6.2 (27 May 2015)
+
+  27 May 2015; Justin Lecher <jlec@gentoo.org> +markdown-2.6.2.ebuild,
+  -markdown-2.5.2.ebuild, -markdown-2.6.ebuild, metadata.xml:
+  Version Bump
 
   22 May 2015; Agostino Sarubbo <ago@gentoo.org> markdown-2.6.1.ebuild:
   Stable for amd64, wrt bug #550128
diff --git a/dev-python/markdown/markdown-2.5.2.ebuild b/dev-python/markdown/markdown-2.5.2.ebuild
deleted file mode 100644
index 78a58840544b..000000000000
--- a/dev-python/markdown/markdown-2.5.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.5.2.ebuild,v 1.2 2015/03/03 07:07:33 dlan Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Markdown"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python implementation of the markdown markup language"
-HOMEPAGE="http://www.freewisdom.org/projects/python-markdown http://pypi.python.org/pypi/Markdown"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc test pygments"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}] )"
-# source cites pytidylib however from testruns it appears optional
-RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_docs
-}
-
-python_test() {
-	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	pushd "${BUILD_DIR}" > /dev/null
-	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-	popd > /dev/null
-}
-
-python_install_all() {
-	# make use doc do a doc build
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-2.6.ebuild b/dev-python/markdown/markdown-2.6.2.ebuild
index 24d883162305..40f9e74be4bf 100644
--- a/dev-python/markdown/markdown-2.6.ebuild
+++ b/dev-python/markdown/markdown-2.6.2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.6.ebuild,v 1.1 2015/02/28 07:48:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markdown/markdown-2.6.2.ebuild,v 1.1 2015/05/27 08:55:22 jlec Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -16,11 +17,14 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test pygments"
 
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}] )"
+DEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
 # source cites pytidylib however from testruns it appears optional
 RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
 
@@ -32,9 +36,8 @@ python_compile_all() {
 
 python_test() {
 	cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
-	pushd "${BUILD_DIR}" > /dev/null
+	cd "${BUILD_DIR}" || die
 	"${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
-	popd > /dev/null
 }
 
 python_install_all() {
diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml
index 6cd0e751c837..46571022df6a 100644
--- a/dev-python/markdown/metadata.xml
+++ b/dev-python/markdown/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<use>
-		<flag name="pygments">Enable fancy pygments support</flag>
-	</use>
-	<upstream>
-		<remote-id type="pypi">Markdown</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <use>
+    <flag name="pygments">Enable fancy pygments support</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">Markdown</remote-id>
+  </upstream>
 </pkgmetadata>