Add revision bump for two small patches, bug 425048. Remove old version, remove myself from metadata

(Portage version: 2.1.10.65/cvs/Linux i686)

6 files changed, 113 insertions, 44 deletions

diff --git a/dev-vcs/stgit/ChangeLog b/dev-vcs/stgit/ChangeLog
index 245bfc0003d9..c4306d3e1df9 100644
--- a/dev-vcs/stgit/ChangeLog
+++ b/dev-vcs/stgit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/stgit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/ChangeLog,v 1.13 2012/01/23 19:18:35 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/ChangeLog,v 1.14 2012/08/06 19:58:58 darkside Exp $
+
+*stgit-0.16-r1 (06 Aug 2012)
+
+  06 Aug 2012; Jeremy Olexa <darkside@gentoo.org> -stgit-0.14.3.ebuild,
+  +stgit-0.16-r1.ebuild, +files/stgit-0.16-asciidoc-compat.patch,
+  +files/stgit-0.16-man-linkfix.patch, metadata.xml:
+  Add revision bump for two small patches, bug 425048. Remove old version,
+  remove myself from metadata
 
   23 Jan 2012; Jeremy Olexa <darkside@gentoo.org> stgit-0.16.ebuild:
   Using the old missing-patches tarball creates failing tests, bug 399631
diff --git a/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch b/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch
new file mode 100644
index 000000000000..4386953a3ef6
--- /dev/null
+++ b/dev-vcs/stgit/files/stgit-0.16-asciidoc-compat.patch
@@ -0,0 +1,13 @@
+diff -urN stgit-0.16.orig/Documentation/asciidoc.conf stgit-0.16/Documentation/asciidoc.conf
+--- stgit-0.16.orig/Documentation/asciidoc.conf	2012-01-09 13:12:42.000000000 -0800
++++ stgit-0.16/Documentation/asciidoc.conf	2012-07-06 04:31:38.279051055 -0700
+@@ -100,3 +100,9 @@
+ [linkstgsub-inlinemacro]
+ <a href="stg-{target}.html">{target}</a>
+ endif::backend-xhtml11[]
++
++[macros]
++# regexen to match macro templates above
++(?P<name>linkman):(?P<target>\w+)\[(?P<attrlist>\d+)]=
++(?P<name>linkstgsub):(?P<target>\w+)\[]=
++(?P<name>linkstg):(?P<target>\w+)\[]=
diff --git a/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch b/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch
new file mode 100644
index 000000000000..83fdb5457879
--- /dev/null
+++ b/dev-vcs/stgit/files/stgit-0.16-man-linkfix.patch
@@ -0,0 +1,11 @@
+--- Documentation/Makefile.old	2012-07-08 23:55:38.958779174 +0200
++++ Documentation/Makefile	2012-07-08 23:56:42.638010483 +0200
+@@ -72,7 +72,7 @@
+ 	$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $<
+ 
+ %.1 : %.xml
+-	xmlto -m callouts.xsl man $<
++	xmlto -m callouts.xsl --stringparam man.base.url.for.relative.links=$(htmldir) man $<
+ 
+ %.xml : %.txt
+ 	$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf $<
diff --git a/dev-vcs/stgit/metadata.xml b/dev-vcs/stgit/metadata.xml
index 4ed566c5ca46..ab0cbfa0014a 100644
--- a/dev-vcs/stgit/metadata.xml
+++ b/dev-vcs/stgit/metadata.xml
@@ -7,10 +7,6 @@
   <description>Proxy maintainer, assign bugs</description>
 </maintainer>
 <maintainer>
-  <email>darkside@gentoo.org</email>
-  <description>Proxy committer, CC bugs</description>
-</maintainer>
-<maintainer>
   <email>flameeyes@gentoo.org</email>
   <description>Proxy/Backup, CC bugs</description>
 </maintainer>
diff --git a/dev-vcs/stgit/stgit-0.14.3.ebuild b/dev-vcs/stgit/stgit-0.14.3.ebuild
deleted file mode 100644
index cd3a18b8b47f..000000000000
--- a/dev-vcs/stgit/stgit-0.14.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.14.3.ebuild,v 1.5 2011/12/30 15:43:10 halcy0n Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils bash-completion
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="http://www.procode.org/stgit/"
-SRC_URI="http://homepage.ntlworld.com/cmarinas/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND=">=dev-vcs/git-1.5"
-DEPEND="$RDEPEND"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	sed -i -e 's-\(prefix:\) ~-\1 /usr-' setup.cfg
-	distutils_src_install
-	dodir /usr/share/doc/${PF}
-	mv "${D}/usr/share/${PN}/examples" "${D}/usr/share/doc/${PF}"
-	rmdir "${D}/usr/share/doc/${PN}"
-	dobashcompletion contrib/stgit-completion.bash ${PN}
-}
-
-src_test() {
-	export PATH=/usr/libexec/git-core/:$PATH
-	emake -j1 test
-}
diff --git a/dev-vcs/stgit/stgit-0.16-r1.ebuild b/dev-vcs/stgit/stgit-0.16-r1.ebuild
new file mode 100644
index 000000000000..4109eaa4e67b
--- /dev/null
+++ b/dev-vcs/stgit/stgit-0.16-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.16-r1.ebuild,v 1.1 2012/08/06 19:58:58 darkside Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils bash-completion-r1
+
+DESCRIPTION="Manage a stack of patches using GIT as a backend"
+HOMEPAGE="http://www.procode.org/stgit/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-missing-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-vcs/git-1.6.3.3"
+
+# NOTE: It seems to be quite important which asciidoc version to use.
+# So keep an eye on it for the future.
+DEPEND="$RDEPEND
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+		dev-lang/perl
+	)"
+
+pkg_setup () {
+	if ! use doc; then
+		echo
+		ewarn "Manpages will not be built and installed."
+		ewarn "Enable the 'doc' useflag, if you want them."
+		echo
+	fi
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare () {
+	epatch "${FILESDIR}/${P}-asciidoc-compat.patch"
+	epatch "${FILESDIR}/${P}-man-linkfix.patch"
+
+	# this will be a noop, as we are working with a tarball,
+	# but throws git errors --> just get rid of it
+	sed -i -e 's/version\.write_builtin_version()//' setup.py
+
+	distutils_src_prepare
+}
+
+src_compile() {
+	# do not call normal 'emake' s.t. Gentoo's Python handling
+	# can do its work
+	# NB: run before doc-building to avoid double-build
+	distutils_src_compile
+
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${ROOT}usr/share/doc/${PF}/html/" \
+			mandir="${ROOT}usr/share/man/" \
+			doc || die "emake doc failed"
+	fi
+}
+
+src_install() {
+	if use doc; then
+		emake DESTDIR="${D}" \
+			htmldir="${ROOT}usr/share/doc/${PF}/html/" \
+			mandir="${ROOT}usr/share/man/" \
+			install-doc install-html || die "emake install-doc install-html failed"
+	fi
+
+	# NB: run after installing docs to avoid double-build
+	distutils_src_install
+
+	newbashcomp stgit-completion.bash ${PN} || die
+}