Updated to accommodate adding dep flask-themes for doc build

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

4 files changed, 69 insertions, 17 deletions

diff --git a/dev-python/flask-restless/ChangeLog b/dev-python/flask-restless/ChangeLog
index be347e828956..bca74c53fc65 100644
--- a/dev-python/flask-restless/ChangeLog
+++ b/dev-python/flask-restless/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/flask-restless
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/ChangeLog,v 1.4 2013/06/10 09:33:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/ChangeLog,v 1.5 2013/06/10 16:52:27 idella4 Exp $
+
+  10 Jun 2013; Ian Delaney <idella4@gentoo.org> files/docbuild.patch,
+  flask-restless-0.11.0-r1.ebuild:
+  Updated to accommodate adding dep flask-themes for doc build
 
 *flask-restless-0.11.0-r1 (10 Jun 2013)
 
diff --git a/dev-python/flask-restless/Manifest b/dev-python/flask-restless/Manifest
index 54f89fa79e2a..5f4a56c2f94a 100644
--- a/dev-python/flask-restless/Manifest
+++ b/dev-python/flask-restless/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX docbuild.patch 752 SHA256 1f6c43e3dd807a450f88692ad7e320d2aa2932ea96821a885d1f621727778bb3 SHA512 604e360f10f7522e33a84782de0f1f0428ee752f20736339d2674dfc83b731023ba1691abd47411bac33e00cbb5948d412826efcca4a811d3126b64b8954856c WHIRLPOOL bfbcc1dc22d74e1a4480bdd09086cb6ecf887919c9dd9250771fe5cba2ca391dc1c170dc120bf3c3a29c0dcb71b06a4de6806600596dea7f4266486111ab5d39
+AUX docbuild.patch 2082 SHA256 fa2cdeb8a222a46682729a41cd11c7205b7ae882069ad87d5a74c031316764f4 SHA512 abddba6c5791ed7977187a2e39d7cab234d5316e20ee310029a5dace8792ff9134bde1782966857509c4dd134350d0988fa02b9f00040b95de0caff33a2f539c WHIRLPOOL 01aa14fad9a7e668b78c905f9e0a099ba6acd5e7a70092f561c78818992b5791f28bcdb5e16c16f493c5286dd158c5ed6c3f8604dff68b9a4658adf72ca59522
 DIST flask-restless-0.10.0.tar.gz 495229 SHA256 ce4d2a018a15f31b24235dad5ae9be554094d818cf95c5654293f63b03baa9d5 SHA512 b6910a44b265a429ddaeca071376f1ab0f78cba7951ef6d5f2ace1a48403624229e0fb64e75c9ea7fa4173cbf0b143aa61801ff36e190cea986ea81781259a85 WHIRLPOOL 426e823fa5eef30b74a6f2692a0d5182ada47fd8892db915e852fded072b8fe333707c0eb470cc775be710f4b9f166bbd481c0188585ae5d32d270da1bda0408
 DIST flask-restless-0.10.1.tar.gz 495409 SHA256 6a7af6c121638cdeb4b8a5f32f188f367a40f096b804ab404b39a81ba6c1a337 SHA512 eb7fec4a6e13674d0d850fb717965f4156b6e5f4a71f804e9fd0f18bdaf1e51092f13875c865a26322df1393798d40ae23b15e75272aaa8cb9726ac91b0b90c2 WHIRLPOOL ad63d0df907205a828badc58fb3e3eb16ea46aea5dfb4fc48b7e1efcc2d42792d79db083eab1d9fdb6e3fb3bad09b76a697e6815502902e592f5a70e956f479a
 DIST flask-restless-0.11.0.tar.gz 500173 SHA256 2f2825d71ed3cdb3d266e525b1a927a1cd49d77c61022222e05a69aa5820ff55 SHA512 8e5f6789c90e81f012bbd27eec06ae83735000d5c8ef8199e3ea34c03d94f31ffc628dbb929ae3fa925427a3c8cf988ed885f83c7fb479accb50ffcd1e79f3b8 WHIRLPOOL 86fd6d7615b4a304f19f03f0728d51a5b64fe152ccc4ff29a7f3418787a7ec013246ce8e44f6f140a566dece2afe0009993ab063c4ed49b899433734eb1baeeb
 EBUILD flask-restless-0.10.0.ebuild 921 SHA256 b8a6c0466316646dba74f209a29343b2d799149bbb9018f3cd926dde6091f670 SHA512 9ebbf5829b4aadbea349dadcd7eb83eaeb4eb179893f0d19fa79b6ee1e4f4ecadc62eaf89f15067e929712b1408531c1cb483daeee332fce288a3e2a687040d8 WHIRLPOOL 2b981a98ae375a5e41a6ba5777e024272073e04ed8aefa124b3060d201a386701c414508c53505e4720d4bb26b6b5c30f942fd61bfcaa3fdc363a19982460a46
 EBUILD flask-restless-0.10.1.ebuild 915 SHA256 25331140c3d931696ab2055984d1baf4f6fba92e280b89c5ecaafa6fb501f969 SHA512 f3fb43bd19dd896811e863f6f1ce3c2b2ba941869ca04a3778876002e58d76138ec88e9756b1ba129ac22314d57af81a937cdbea0433aaa99b8e77f818b7b4e1 WHIRLPOOL 925cdefdac56c1deb23711179753a786c70a11de1cec43af99edb018a90d29677920a4bc92066b1dd7853b819a1dc7c2c5c7f6e96c904e046e0c6c92de715bb9
-EBUILD flask-restless-0.11.0-r1.ebuild 1624 SHA256 8c0c767328f4e8aa950fdb642f2d9e7039abcf83ac6c256a1a0b8bc4e3337e50 SHA512 d119a976a9f2fceeea533377995e023c615bf1c1c37ffcb320a945e8228fd4dd97da869fd4cae03fdb7900674e449b0b8120166dfbfeb4ee803efa26982e8b5c WHIRLPOOL 3a380e2285e1aaca1be4ff421e8598ad4dde7ef0bbb33d296ebc7dc7c4bf81cdeb8180559b430f1bc0affee4244947e63d33248556d2de36fd3f21168322a36c
-MISC ChangeLog 942 SHA256 81c0baa04abb20204b08d2b80be081a23b46152931f6b861570bc62eaafaa8c8 SHA512 8135254109c74d0fd30c2463acaa96b6b79728fa2480d908dd069812a2d60a2cb9128ff6b70c5686c335f9410d706e2b349b6ae5a61aff1c249bb68d6fc35918 WHIRLPOOL 4b3f22f3ccdf39454ac5bfae7bad48a32148a410b1874f61dd7934a56ffa9ea241a2a8fa23dda787b9f2925815a9334d2a83b4ba0f3335441fefe571f3d96e55
+EBUILD flask-restless-0.11.0-r1.ebuild 1968 SHA256 292394c6a3b7c1639616fd607bfd050d50473d8a2a280833ac3cc362b5407bf2 SHA512 329d6d0dcb145a23a92563f484c6caf53d1c91f7c00106a078a81c1de873a6e74b747ddb01a1372f100046a583452570272a510b2ad42cdbc571af463662cdcd WHIRLPOOL 10f1a51db81939c6cb3dd28481875bcc7f7d31bf70dadd21ca9841cf393f478fc4f36fdefa9f4589bfd17f9885673a24389a9777f8455c38a47f4ef5dfa575c4
+MISC ChangeLog 1111 SHA256 9ecf5ce6ac972e782ac3f5251b81116eebfbd672fb0e60b425d3658f3f67a91c SHA512 cd4b50d7a6af35fb74d61ba862f6ec3d20be80bb6ca6e0af3a3fcfb07cd2c2735b2a52bb212ed99e7049e610b0842614780c85134cc545889360c3849efeea3a WHIRLPOOL 50378c1071a88f3945145e45571eff2c0f957811b26e38e6606548e52d1e6ef13b4cb38a0050d016ada3f01e9c71cc048502f44e89aefdcdce63372505c03a83
 MISC metadata.xml 161 SHA256 6f41e9b782499f6bac80760066dc5ebb307e73d31d2080f2eaa383b8a236c68e SHA512 9d77a0cf6ef95d95fe0e41852a1ddedc8bc4a82d39fa75e8bbf760ba835deebe6ac3beddc83b9b70e381cee31936f54bb2db7cb88357ed2228c9e972cf2cac47 WHIRLPOOL 1f1ee9aa1b4b8747fb5f6c9234263952071a1a90100df893eb7fed974ea7c63639796521cfa1fde8929fc2f1bf0cc65e88ef6d703a2dff633816ff87cbf21411
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlG1nXIACgkQso7CE7gHKw0NHwCfakxxX8MnXRekTo9JMjvVUsZA
-rUoAn16QR0tbXOkdoPA8sy0QS4zCejAZ
-=Rc4i
+iEYEAREIAAYFAlG2BFsACgkQso7CE7gHKw0OpwCfQ4Ku0VRPPsy6UoygyMN0ny1p
+eooAn2IdJLeiz8aBmjCaUKQWyG92CoMf
+=vcRx
 -----END PGP SIGNATURE-----
diff --git a/dev-python/flask-restless/files/docbuild.patch b/dev-python/flask-restless/files/docbuild.patch
index a23f1e0a074a..7e4c6550f962 100644
--- a/dev-python/flask-restless/files/docbuild.patch
+++ b/dev-python/flask-restless/files/docbuild.patch
@@ -1,10 +1,36 @@
+A number of these settings are simply unworkable in gentoo
 diff -ur flask-restless-0.11.0.orig/docs/conf.py flask-restless-0.11.0/docs/conf.py
 --- docs/conf.py	2013-05-19 01:50:21.000000000 +0800
-+++ docs/conf.py	2013-06-10 15:44:36.332477943 +0800
-@@ -254,14 +254,6 @@
- ]
++++ docs/conf.py	2013-06-10 23:39:05.741199580 +0800
+@@ -99,7 +99,6 @@
+
+ # The name of the Pygments (syntax highlighting) style to use.
+ #pygments_style = 'sphinx'
+-pygments_style = 'flask_theme_support.FlaskyStyle'
+
+ # A list of ignored prefixes for module index sorting.
+ #modindex_common_prefix = []
+@@ -110,14 +110,11 @@
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+ #html_theme = 'default'
+-html_theme = 'flask'
++#html_theme = 'flask'
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
+ # documentation.
+-html_theme_options = {
+-    'index_logo':       'flask-restless.png'
+-}
  
+ # Add any paths that contain custom themes here, relative to this directory.
+ html_theme_path = ['_themes']
+@@ -253,25 +250,12 @@
+      [u'Jeffrey Finkelstein'], 1)
+ ]
  
+-
 -# Example configuration for intersphinx: refer to the Python standard library.
 -intersphinx_mapping = {'python': ('http://docs.python.org/', None),
 -                       'flask': ('http://flask.pocoo.org/docs', None),
@@ -15,4 +41,17 @@ diff -ur flask-restless-0.11.0.orig/docs/conf.py flask-restless-0.11.0/docs/conf
 -
  # fall back if theme is not there
  try:
-     __import__('flask_theme_support')
+-    __import__('flask_theme_support')
++    from flaskext import themes
++    themes.html_theme = 'flask'
+ except ImportError, e:
+-    print '-' * 74
+-    print 'Warning: Flask themes unavailable.  Building with default theme'
+-    print 'If you want the Flask themes, run this command and build again:'
+-    print
+-    print '  git submodule update --init'
+-    print '-' * 74
++    print 'flask theme unavailable'
+ 
+     pygments_style = 'tango'
+     html_theme = 'default'
diff --git a/dev-python/flask-restless/flask-restless-0.11.0-r1.ebuild b/dev-python/flask-restless/flask-restless-0.11.0-r1.ebuild
index f26d419cc573..db18ef47dfeb 100644
--- a/dev-python/flask-restless/flask-restless-0.11.0-r1.ebuild
+++ b/dev-python/flask-restless/flask-restless-0.11.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/flask-restless-0.11.0-r1.ebuild,v 1.1 2013/06/10 09:33:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restless/flask-restless-0.11.0-r1.ebuild,v 1.2 2013/06/10 16:52:27 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
@@ -27,17 +27,26 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}] )
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
 		>=dev-python/sphinxcontrib-httpdomain-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/sphinxcontrib-issuetracker-0.11[${PYTHON_USEDEP}] )"
+		>=dev-python/sphinxcontrib-issuetracker-0.11[${PYTHON_USEDEP}]
+		dev-python/flask-themes[${PYTHON_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}"/docbuild.patch )
 
 python_compile_all() {
 	if use doc; then
-		ewarn "";ewarn "If flask-restless is not installed, first emerge"
-		ewarn "without USE=doc, then re-run.  Building of docs "
-		ewarn "requires flask-restless to be installed"
-	emake -C docs html
+		if ! "${PYTHON}" -c "import flask_restless"; then
+			eerror "flask-restless is not installed. Building of the docs"
+			eerror "requires flask-restless to already be installed."
+			eerror "Firstly emerge without USE=doc, then re-emerge with USE=doc"
+			eerror ""
+			die
+		fi
 	fi
+		# Changes connect to read issues @ github
+		rm -f docs/changelog.rst
+		einfo "Generating html docs for ${PN}"
+		PYTHONPATH=${PYTHONPATH}"${S}"/docs emake -C docs html \
+			|| die "Generating html docs for ${PN} failed"
 }
 
 python_test() {