Version bump. Removed old. Synced release ebuild with live ebuild.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 63 insertions, 99 deletions

diff --git a/www-apps/blohg/ChangeLog b/www-apps/blohg/ChangeLog
index abaeb40b4c8e..f7177952efe8 100644
--- a/www-apps/blohg/ChangeLog
+++ b/www-apps/blohg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/blohg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.16 2012/04/06 00:15:43 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.17 2012/04/25 03:02:38 rafaelmartins Exp $
+
+*blohg-0.10 (25 Apr 2012)
+
+  25 Apr 2012; Rafael G. Martins <rafaelmartins@gentoo.org> -blohg-0.8.ebuild,
+  -blohg-0.9.2.ebuild, +blohg-0.10.ebuild, blohg-9999.ebuild:
+  Version bump. Removed old. Synced release ebuild with live ebuild.
 
 *blohg-0.9.2 (06 Apr 2012)
 
diff --git a/www-apps/blohg/Manifest b/www-apps/blohg/Manifest
index 0643cf942ca2..729b401e4f7b 100644
--- a/www-apps/blohg/Manifest
+++ b/www-apps/blohg/Manifest
@@ -1,21 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST blohg-0.8.tar.gz 46880 RMD160 74014ee82d0ece7b0f72ba0f986f27a0a19609be SHA1 4edea7ef3b5c053306405809c02e95b88ab70c0e SHA256 c13b03652b3480e9d9ed2b74a2cf30236b0bb9e42c578100f7dfa1e681d8b4c0
-DIST blohg-0.9.2.tar.gz 54015 RMD160 f29bd096de710986172c02aac10697f85c938f67 SHA1 3a26bc7e3225fbcc611498f40dd488407c9f0765 SHA256 f571d3635c4bcf283492414bd6e5353713250ba265772640ae0b138f32a42769
-EBUILD blohg-0.8.ebuild 1273 RMD160 2c554092584bbb4f63d04d9889afb57b6b091a4e SHA1 30ab4d0ebeb7906b56bfb50af29bdf2fbd61ec6e SHA256 af669ac81db12fdc919c26426e0104cfda538b8e9df6555654798cf1b6d75770
-EBUILD blohg-0.9.2.ebuild 1341 RMD160 1899e4945386831f631af056d82de418ccfdbea5 SHA1 6e519fa6a156ea5f1419c3ffa41d5c24d6f1d2e6 SHA256 108eb45605c37c88fe2eb5ea90682aa785f255ab99d3d608ca0f06c66dfbb2a1
-EBUILD blohg-9999.ebuild 1214 RMD160 3d89fc10ccde33e36f318589b866dbaecd6f2a2c SHA1 3757af331000eb42077525fad5fbb2f9592ab7a4 SHA256 e222a90fb31a3a708813321d868eb4b5ccca955a357ec9b6c2d2e7a0fe998ca5
-MISC ChangeLog 2795 RMD160 ff5d3bfad94c585104600c072cbac7e0e2b47dd4 SHA1 9f0b6611590e2a132eb2cbe172307be8df5db722 SHA256 e69e15ec30425997d0ba28b9818a7e67ad0b24ab53fc84bf3401d533b5e498cb
+DIST blohg-0.10.tar.gz 56518 RMD160 97a82e9e87f70dcde30a7330e2e60a089098dc5d SHA1 73ccdf1b8e10e09762495f3c2701fb7153f8ffe3 SHA256 c046bb82c19ca5e2c064d9e8119b35c4baab94dbcf3d41aaa38208f89d95fa14
+EBUILD blohg-0.10.ebuild 1577 RMD160 5ac5ab13b000128c27a920939f95ff8c2d1ce3de SHA1 856ee09099a7707e1e2b5052bd5b1611a6be5b6f SHA256 adf915b0a4d29a287c539dd7e566b8c42464cb02ff1767775850a9766dcafb4c
+EBUILD blohg-9999.ebuild 1577 RMD160 5a38be6dd51170d581df48c37f4ffa58bae5dc71 SHA1 6735c6e51a31655ca61c4c79a4df2e43d18f7570 SHA256 d3db61aac738f508acd713a2984ab2d44bcd5cd9186687b163b710bc1853c9a5
+MISC ChangeLog 3033 RMD160 98dadfae1299fcfd0dda4b29422d81fa837dcfc7 SHA1 b2f67caa0a630160c549273a049282be0ae142c3 SHA256 a6ef3cee4bcb246ef22806c500b482a4c5e7c5ae83293eef96a509e5545b66f1
 MISC metadata.xml 844 RMD160 c405fd8d98bd1578d65e17141b312e957714f651 SHA1 a3fd6e21ebdaaa55675e062294c5b48d76e2e5a8 SHA256 a37b40574cf1f05b0ea22b1e5d2581b8d974e55fed08bec2b7396d8c05594899
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPfjW5AAoJEMmH5mwCk1NvoFYH/2q7rnVXmnCdKNeW9MicnTcs
-nv4V2aFGjQh+5BkPf+pdVQLn3AZKCLLhjtIuvAAWUPdo2PNm5AfPk2jnwctsyV4C
-paVa5yOpry5fUIAO6YWDnmtujlKiiguypJ3LXsieqpseWXOS6EZe1SZ0GEi6cjYt
-Xe2FhB4qI/zZogoK3uge4ZhKf36fjbthDpVtYpXHAnqNjBsf8EyVDCIuLgDUgqBr
-y0Tx7uahGCrNdcDJcJJHTXWcCK0CN+uwqjnMjEv4wnqJyIJt/kqX4JEvADd5wjCF
-W/BwtOgBMUpKubxnKFK8s8UtoPXc3f61booXCg45Nk6pR5vXSblEbrD2XjvnWmU=
-=jd25
------END PGP SIGNATURE-----
diff --git a/www-apps/blohg/blohg-0.9.2.ebuild b/www-apps/blohg/blohg-0.10.ebuild
index 81574d840f4e..f45b27e0d9ea 100644
--- a/www-apps/blohg/blohg-0.9.2.ebuild
+++ b/www-apps/blohg/blohg-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.9.2.ebuild,v 1.1 2012/04/06 00:15:43 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.10.ebuild,v 1.1 2012/04/25 03:02:38 rafaelmartins Exp $
 
 EAPI="3"
 
@@ -9,19 +9,31 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils
+HG_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	HG_ECLASS="mercurial"
+	EHG_REPO_URI="https://hg.rafaelmartins.eng.br/blohg/"
+	EHG_REVISION="default"
+fi
+
+inherit distutils ${HG_ECLASS}
 
 DESCRIPTION="A Mercurial-based blogging engine."
 HOMEPAGE="http://blohg.org/ http://pypi.python.org/pypi/blohg"
+
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc test"
 
-DEPEND=">=dev-python/docutils-0.7
-	>=dev-python/flask-0.8
+CDEPEND=">=dev-python/docutils-0.7
+	>=dev-python/flask-0.7
 	>=dev-python/flask-babel-0.6
 	>=dev-python/flask-script-0.3
 	>=dev-python/frozen-flask-0.7
@@ -29,10 +41,12 @@ DEPEND=">=dev-python/docutils-0.7
 	>=dev-vcs/mercurial-1.6
 	dev-python/pyyaml
 	dev-python/setuptools
-	dev-python/pygments
+	dev-python/pygments"
+
+DEPEND="${CDEPEND}
 	doc? ( dev-python/sphinx )"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${CDEPEND}"
 
 src_compile() {
 	distutils_src_compile
@@ -53,8 +67,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	distutils_pkg_postinst
+	local ver="${PV}"
+	[[ ${PV} = *9999* ]] && ver="latest"
 
-	einfo "If you're upgrading from <=blohg-0.5.1, please read the upgrade notes:"
-	einfo "http://docs.blohg.org/upgrade/#from-0-5-1-to-0-6"
+	elog "You may want to check the upgrade notes:"
+	elog "http://docs.blohg.org/en/${ver}/upgrade/"
 }
diff --git a/www-apps/blohg/blohg-0.8.ebuild b/www-apps/blohg/blohg-0.8.ebuild
deleted file mode 100644
index 947fd69ea776..000000000000
--- a/www-apps/blohg/blohg-0.8.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.8.ebuild,v 1.1 2011/11/17 00:38:16 rafaelmartins Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit distutils
-
-DESCRIPTION="A Mercurial-based blogging engine."
-HOMEPAGE="http://blohg.org/ http://pypi.python.org/pypi/blohg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-DEPEND=">=dev-python/docutils-0.7
-	>=dev-python/flask-0.7
-	>=dev-python/flask-babel-0.6
-	>=dev-python/flask-script-0.3
-	>=dev-python/jinja-2.5.2
-	>=dev-vcs/mercurial-1.6
-	dev-python/pyyaml
-	dev-python/setuptools
-	dev-python/pygments
-	doc? ( dev-python/sphinx )"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo 'building documentation'
-		emake -C docs html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		einfo 'installing documentation'
-		dohtml -r docs/_build/html/*
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo "If you're upgrading from <=blohg-0.5.1, please read the upgrade notes:"
-	einfo "http://docs.blohg.org/upgrade/#from-0-5-1-to-0-6"
-}
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
index 0e160ac78951..7d6affdcd320 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-9999.ebuild,v 1.7 2012/01/08 13:50:14 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-9999.ebuild,v 1.8 2012/04/25 03:02:38 rafaelmartins Exp $
 
 EAPI="3"
 
@@ -9,21 +9,30 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
 DISTUTILS_SRC_TEST="setup.py"
 
-EHG_REPO_URI="http://hg.rafaelmartins.eng.br/blohg/"
-EHG_REVISION="default"
+HG_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	HG_ECLASS="mercurial"
+	EHG_REPO_URI="https://hg.rafaelmartins.eng.br/blohg/"
+	EHG_REVISION="default"
+fi
 
-inherit mercurial distutils
+inherit distutils ${HG_ECLASS}
 
 DESCRIPTION="A Mercurial-based blogging engine."
 HOMEPAGE="http://blohg.org/ http://pypi.python.org/pypi/blohg"
-SRC_URI=""
-KEYWORDS=""
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc test"
 
-DEPEND=">=dev-python/docutils-0.7
+CDEPEND=">=dev-python/docutils-0.7
 	>=dev-python/flask-0.7
 	>=dev-python/flask-babel-0.6
 	>=dev-python/flask-script-0.3
@@ -32,12 +41,12 @@ DEPEND=">=dev-python/docutils-0.7
 	>=dev-vcs/mercurial-1.6
 	dev-python/pyyaml
 	dev-python/setuptools
-	dev-python/pygments
-	doc? ( dev-python/sphinx )"
+	dev-python/pygments"
 
-RDEPEND="${DEPEND}"
+DEPEND="${CDEPEND}
+	doc? ( dev-python/sphinx )"
 
-S="${WORKDIR}/${PN}"
+RDEPEND="${CDEPEND}"
 
 src_compile() {
 	distutils_src_compile
@@ -56,3 +65,11 @@ src_install() {
 		dohtml -r docs/_build/html/*
 	fi
 }
+
+pkg_postinst() {
+	local ver="${PV}"
+	[[ ${PV} = *9999* ]] && ver="latest"
+
+	elog "You may want to check the upgrade notes:"
+	elog "http://docs.blohg.org/en/${ver}/upgrade/"
+}