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

Package-Manager: portage-2.1.10.65/cvs/Linux i686

7 files changed, 118 insertions, 48 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/Manifest b/dev-vcs/stgit/Manifest
index b7965f374e6f..1a49018707b9 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,10 +1,11 @@
-DIST stgit-0.14.3.tar.gz 227645 SHA256 874fe750a8938d57ea777a0019f9fe50eb0ea408b71b618141a286d4cddfec8d SHA512 1b45d6b4799339c6882b1e5f512a21a67d3c912133c4d50ea27009fd5d241a04acbf1ff756094582386b12fb81942c94d7011a26e0f9ec6a464f9b47e5638482 WHIRLPOOL e7749e9ef46aa50692946da4c6b685f38e8bddf54d9967ab08d75d033a64e8d246043242a8abdbcf2be4694dc10a808a1429502ce017754a5588fe44343fd41f
+AUX stgit-0.16-asciidoc-compat.patch 561 SHA256 3d2e1f78c9857d5e54e3c8de6ae4bf047c9271d44b41408ee2b770316746a637 SHA512 f5a4a260b5b732332a4157a82d7bd153971d0a41c55ce8c38beb58f85a989d7636ec3ff15dc3161d4c5775a392840d4970437abf4fd8c741cdcdf509fd826329 WHIRLPOOL 6dee03e89a11eeeee4a4af9304119f7a0bc9d655651cc4ae4807869fd5ac05fca423d768a5bb74b2e2399a0439058e51fc188afc40883503ae96ace9ff1d4f73
+AUX stgit-0.16-man-linkfix.patch 429 SHA256 456ec1faeea9f9a6c937e1afc3f3ee5dda63dc11ca6abd6e7b06cafe03bb6f97 SHA512 a4e240d804646f002089d428ee92e9a8cde5a7d7447ebd5d635514dc5777cf3d56fc59cef9f406f7313daf09775810b553a65685e419846691bbc2fc51afc2f5 WHIRLPOOL db1d2fd61e9b4826e3fd9804d3ae5ef27ec62866e5ac041650316a6e0703db5e2bcc40c5c95988fb3a0e067de8dd0980773d1e06558a87c113aa0ef8d0053413
 DIST stgit-0.15-missing-patches.tar.gz 1624 SHA256 b0786e5abee9d7d872b9b249f709dfcf088030a40960fc809dc375ef26e4d1aa SHA512 9c241cb9da43b6430066872e7120e7443f889309ea32571d70342ac0ff0814c43da2a51eb5adb7e297bdf51d8ee6599de742afbf5feaeca68b245ba703c151b5 WHIRLPOOL 688d6f8ce99f5b4d8a057463cfd6356cefdce796acf9f15ea80dfe60a1731267fcd9f297369f1ce1d36eb119cb041c8d1c6ae4d0e02502185eb6ba4b18800480
 DIST stgit-0.15.tar.gz 342320 SHA256 691fe26dc0c0691cb65fa2763c437eaafc28c107a4d64a03653ce613414ff84d SHA512 0e4c95d62cd62cfd9d68ed30c281860812ea07966aa5d52788412c396088473ed59ca38ce883cf3b7424cfdb4923f133926b8f31359420e4db65a6a80e3a34ec WHIRLPOOL 9ba04292c775c2fd7dceaca123a7678457e853cf7ce638a7a90a8d23e44b3e32884fe644e4af3707515ed36f0f5f71274f564d0bece5f2c8948ab0491138a007
 DIST stgit-0.16-missing-patches.tar.gz 1667 SHA256 f105bb417592be3c68d830ad1cf2e212e6e5cb809bf64cdffb516a0f7badd4f4 SHA512 29d4c3e68121654153b4e5142dd70d818737b09bbc8371d644a36dd9d18afaf78fdda91bc16f953c330bcbae19084384d8bcd216cdfe674df784e33165186db1 WHIRLPOOL c7628853e6c1eff498a95ff22ec3eb3bb69b60dfb0c6dcd5895a650b8d3aba966166dfd426a0c728e3d292f0a2ed197325b0af5ccd63fc99011b5b2e841e7194
 DIST stgit-0.16.tar.gz 362687 SHA256 02f1a19350ccf4a26abac1421df8c2d021e78f995c913f9562718a1700318a42 SHA512 782de3d5855aad4f5d040478745990517ebe2b26dc315a3ed41db95399bb46e075d63a70baa0e3aa2ab1012b59e6ad1f5940a904f296ef09d6bca60f66e417dd WHIRLPOOL e2334c041cb260455d549d33b6628fd4f6e1e7da850f2987ba86922504e07aed8177d092550348b52cad8894b0335d20ee1608b855fa1cb6545bdd301a9d38f1
-EBUILD stgit-0.14.3.ebuild 971 SHA256 4369adea11e61a986b48ad98e96de88d2e905c7a1c316aa43f2ca268f57dc5bf SHA512 835ec49d8f6ab377d565707a29dba20f7a213e4f030d9f392965826d8dbed5ec6ecf31e615c608cb311c90bc2692b86e92d8c95d497312b12736c942b03e2b56 WHIRLPOOL 5a599bd77422083a5df1ccc2b36f7dfd6442a17be68da85c66bf8b790d6287c93f2e1232b7d5373c177f6edcf4ba90e7524e04f9afe6d7363023058e823edb28
 EBUILD stgit-0.15-r1.ebuild 1932 SHA256 70bd03659d4d4208cba6364450d08ad784c51338e50cb1eeda89538e41b8f364 SHA512 c5bdea050f6d4bdec02d41384ab2e9eb8ee7ad3b72ea40e7848caa022e0f4c808cd100fc77f563d6050e22a9dcf7c0ed1ab25721cd772b4d5328324497d15004 WHIRLPOOL ce9a11f29cda29b31c2993692db2b02fb30ddea7e34f1ca3fb2e70ac8fa01daa312c5eaf428f2189787ea7d3494031fbfb63725286f0b3da875d9f6243defc26
+EBUILD stgit-0.16-r1.ebuild 1996 SHA256 98202b2e3c373f7f16eb975a999fac8a7886550016804d066f2f29c6302492e1 SHA512 fba3cb0c8498714d2d1a3cf14dce644e2bd8a0baac4cc0909c025421703fad5bed298f6e8a7585e57afa017782d4de785c5395c9e2cbddaacc69142731e24c70 WHIRLPOOL a9e9693a8f90c76a8e08948bcadda73b2db487c14b4888d13a94e82b15688c9cedd0d9131b5ec741c208a0fe9bba37e4fd487597dffafd457dd093cabd95c1e8
 EBUILD stgit-0.16.ebuild 1733 SHA256 e145460d04f43c1d5eb93ce5af604e4c73b4661209be59f01abdabedfafb6e4d SHA512 6d6a91b6d90441c4e7d1a4885a804ee9a996ecb9e20648b9314b7af0ce19b1e36c45df980e217163708c26fb3424a01cc48a9b94e3357d8afc7f7563fed84ded WHIRLPOOL 8edc850d92a8866e5e28a9225e1338f71ee3769a4084a4ccecb9f326cac765a18d2b55d3e82395bec8a3a07b7730e9e395eac8aab64a5c2a03fa6588aedfb063
-MISC ChangeLog 6647 SHA256 605077d3c424aa7b7fc6aac07aed1e719ba6b911be825d09b0fcd6b9c1b31a38 SHA512 1a6a7f8fc6457e26d3177de1ff2e5fc31b1e7923f74625617370f94714ca5d758110a290eae6df4ac1a6f77bb851c834600009f012046df313eb1115834f0432 WHIRLPOOL 4e68f95af1ebd81143fd09c5a090dfdc2bc145c9e8c5d6b9e508ecb913fbe5dc82cf2e013b298e61feb72ea1603a8f1554a31d5070ad4ec1b9825b5b950663b1
-MISC metadata.xml 531 SHA256 18dc5dead3d3f88b7fb261896fe9105bc8d8741e2323cdb6db211e439045b843 SHA512 f275d823a9fa96cfdc7169d7bac75200bdc440193840bd06a643eda39dc3779f3774833f6109510ec19a4938f957e5d07ce9d6101ed6debe258c851ea6fd89dc WHIRLPOOL 0315e007401451c374fd643827a11375ae3d89e98466229b6dd4a7442ab29bf59f9400f70abb894b5a7a7763383c16e39f5821bf7cc7d1bf78a573933e2fea48
+MISC ChangeLog 6974 SHA256 9bf38f6740a571c1e4c8ebbd284d88c9616485cdc1ac9d9be0f77c78c963604d SHA512 5a9ad841cbed140352edd9076973f9dee08044a2cddb8edd20adfff1d6d27acebef986c8e6206e360054c08bc68168646d3693f7d661d8bb901b8b61c0d82973 WHIRLPOOL 3da8e255fd202f9fe520c49a713d3fe5b459eefb82bb219a8b14c9a41cf9462505961c7c2ed67773db51fe0085e63f25d4af9350c37cde9a1b2c604d3d05b752
+MISC metadata.xml 413 SHA256 3d6c16e1fde542caa3d8f2523ebaf399cf0bd189e32f172b28541144c72e4d50 SHA512 e27431feafdcf4376298450757ca6ba2303c7ff1ef6401d5c249bd66357d02f88a03d961ead81fb2fc6cb9fbe2fd6c445540a059f930f71b26b49fcfd1c100bd WHIRLPOOL 2e58179f4a6e3946ea6ad1d3b0d86ad588e0dad63969ae3cc1b44a8cb348aec998046c603d0522119227586b0a51bd1825f7ddead97fbd619a0db82e516d0e8e
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
+}