dev-util/mercurial-server version bump to 0.9

(Portage version: 2.1.6.13/git/Linux i686)
 (Signed Manifest commit)

4 files changed, 64 insertions, 23 deletions

diff --git a/dev-util/mercurial-server/ChangeLog b/dev-util/mercurial-server/ChangeLog
index 6540136b4..3fa7797f2 100644
--- a/dev-util/mercurial-server/ChangeLog
+++ b/dev-util/mercurial-server/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mercurial-server-0.9 (14 Nov 2009)
+
+  14 Nov 2009; Christoph Junghans <kleiner_otti@gmx.de>
+  -mercurial-server-0.6.ebuild, +mercurial-server-0.9.ebuild,
+  +files/mercurial-server-0.9-docbook-path.patch:
+  version bump to 0.9
+
   28 Sep 2009; Christoph Junghans <kleiner_otti@gmx.de>
   mercurial-server-0.6.ebuild:
   Homepage updated, bug 286695
diff --git a/dev-util/mercurial-server/Manifest b/dev-util/mercurial-server/Manifest
index a5d8fed83..3b09523a1 100644
--- a/dev-util/mercurial-server/Manifest
+++ b/dev-util/mercurial-server/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST release_0.6.tar.gz 17050 RMD160 c2cc1e0f0f7d3e5d2d4b94044dd4472aebd926af SHA1 f0005bc431f2a642bb1d1a6900d1fbb5709713c8 SHA256 d97f26f11c61e2d54a6f40bbeb64441232e25015f2dadaeb41f3e1cc1f5d9efc
-EBUILD mercurial-server-0.6.ebuild 2131 RMD160 15ee195f4d6dd6300c602701033581b3d573fd4e SHA1 979a1b71eec19d774c1402d28234a3dbadf42f42 SHA256 b17eae8a6dc6a34661d5873bc5f0ff18378a4c893e1fe334b18d3c04061da6fb
-MISC ChangeLog 403 RMD160 17e3a8b338eaf49914bc97cb12d00ec77c5d8ca8 SHA1 6b6f124ff41f648bbaecd1ab6fcd39fdac98385d SHA256 77018f92e7d1d6ddbf33d273a96e0875e4654b1ff10836e6c139ad2474c997b4
+AUX mercurial-server-0.9-docbook-path.patch 1038 RMD160 41262720f38576b47bdbb8a22097f54ddaa57c25 SHA1 52bc6cfd6fb1ff125b65f1a4a58e4b672ab3895e SHA256 7f443fe6f54fd62db06c93ae8340cda2e1e39052f0121cdf13fa68aa11630c7e
+DIST mercurial-server_0.9.orig.tar.gz 18995 RMD160 0f9450e22ce48557c79fe7b1c32927e4e647b3b3 SHA1 c01ddb155272c44679038fabb266e1b613952e7a SHA256 83fa04858d96cea0fbcfdcc3458f9bc38ad9fb51f70e5ee4758467c79435ab80
+EBUILD mercurial-server-0.9.ebuild 2081 RMD160 c8fb3a65716cadd542be2d4c6575d41da6108c5b SHA1 5a82b05d77073645151edb6d9b13699e103f3b5f SHA256 5871ad6c86630efbc885abd4705c6a98bf0275f635e6f3e65121575cd2cb5bb8
+MISC ChangeLog 631 RMD160 208feb2c7837225b27c157c8cbef2f719d06dd9b SHA1 52e0bbc3262adf1286f44eaeb23f148e61c71cf6 SHA256 34af43ac9047d744a6d57f70c553581ae654c7e28b127ec18761487141df8e70
 MISC metadata.xml 220 RMD160 fd3dba7eeac39bb91e6658be7d4d846249c1c329 SHA1 0aafe188f55c4c22697755bea33de012cccf3f49 SHA256 0b5c322d93461039b700509ae2671b429f0637f66596c61e48ebba9e365c9f92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrA7OMACgkQy0OE/ans1/kAjgCfTkfVD7ou6PUksjYu21X+JlgK
-4X8Anitnp3RuEUdhixnZgYZlIJhs+3Kl
-=1A8k
+iEYEARECAAYFAkr+8fEACgkQy0OE/ans1/mRwACfWBwDWo4O1VOwOhyGq04Vt4xQ
+r/8AnRP0VG0HTZ52wlHXQIG7jD9wyOrv
+=aIPj
 -----END PGP SIGNATURE-----
diff --git a/dev-util/mercurial-server/files/mercurial-server-0.9-docbook-path.patch b/dev-util/mercurial-server/files/mercurial-server-0.9-docbook-path.patch
new file mode 100644
index 000000000..c978e8775
--- /dev/null
+++ b/dev-util/mercurial-server/files/mercurial-server-0.9-docbook-path.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Christoph Junghans <kleiner_otti@gmx.de>
+# Date 1258219410 -3600
+# Node ID ddd0f0d12e128a4f90f5a5faf577239e6e2aedd9
+# Parent  31e862df1884641a650e907909e247e1d9afb4a4
+make docbook stylesheet path changeable
+
+diff -r 31e862df1884 -r ddd0f0d12e12 Makefile
+--- a/Makefile	Thu Nov 12 11:19:36 2009 +0000
++++ b/Makefile	Sat Nov 14 18:23:30 2009 +0100
+@@ -5,6 +5,7 @@
+ DOCDIR=$(PREFIX)/doc/mercurial-server
+ ETCDIR=/etc/mercurial-server
+ NEWUSER=hg
++XSL=/usr/share/xml/docbook/stylesheet/nwalsh
+ 
+ INSTALL=install
+ 
+@@ -29,11 +30,11 @@
+ 	$(INSTALL) -m 644 -t $(DESTDIR)$(DOCDIR)/html build/html/index.html
+ 
+ build/html/index.html: doc/manual.docbook
+-	xsltproc --nonet -o $@ /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl $^
++	xsltproc --nonet -o $@ $(XSL)/html/docbook.xsl $^
+ 
+ build/pdf/manual.pdf: doc/manual.docbook
+ 	mkdir -p build/pdf
+-	fop -xml $^ -xsl /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl $@
++	fop -xml $^ -xsl $(XSL)/fo/docbook.xsl $@
+ 
+ pythonbuild:
+ 	python setup.py build
diff --git a/dev-util/mercurial-server/mercurial-server-0.6.ebuild b/dev-util/mercurial-server/mercurial-server-0.9.ebuild
index f12f798a0..46071b5bf 100644
--- a/dev-util/mercurial-server/mercurial-server-0.6.ebuild
+++ b/dev-util/mercurial-server/mercurial-server-0.9.ebuild
@@ -8,17 +8,22 @@ inherit eutils
 
 DESCRIPTION="Mercurial authentication and authorization tools"
 HOMEPAGE="http://www.lshift.net/mercurial-server.html"
-SRC_URI="http://hg.opensource.lshift.net/mercurial-server/archive/release_${PV}.tar.gz"
+SRC_URI="http://dev.lshift.net/paul/mercurial-server/mercurial-server_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="dev-util/mercurial"
-RDEPEND="${DEPEND}"
+DEPEND="dev-util/mercurial
+	dev-lang/python
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
 
-S="${WORKDIR}/${PN}-release_${PV}"
+RDEPEND="dev-util/mercurial
+	dev-lang/python"
+
+S="${WORKDIR}/${PN}_${PV}.orig"
 
 pkg_setup() {
 	enewgroup hg
@@ -26,23 +31,19 @@ pkg_setup() {
 	chmod 700 /home/hg
 }
 
-src_install () {
-	#no distutils support yet
-	./install --root="${D}" --prefix=/usr || die "install failed"
-
-	#Move doc
-	cd "${D}"/usr/share/doc
-	dodoc -r "${PN}"/*
-	rm -rf "${PN}"
+src_prepare() {
+	epatch "${FILESDIR}/${PF}-docbook-path.patch"
+}
 
-	#purge is an extension now
-	echo -e "\n[extensions]\npurge =\n" >> "${D}"/etc/mercurial-server/remote-hgrc
+src_compile() {
+	emake XSL=/usr/share/sgml/docbook/xsl-stylesheets || die "emake failed"
+}
 
-	#NOTE to prefix guys you may have to:
-	#-change getEtcPath function in paths.py
-	#-disable creation of user hg
+src_install() {
+	emake installfiles PREFIX=/usr/share DOCDIR="/usr/share/doc/${PF}" DESTDIR="${D}"
 }
 
+
 pkg_postinst() {
 	#skip the comments if there is already a hgadmin repo
 	[ -d /home/hg/repos/hgadmin/.hg ] && return