commit: 794e1549113644726c709d7102c349c251077d66
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu May 10 19:23:31 2012 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu May 10 19:31:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=794e1549
app-text/docbook-to-man: 2.0.0-r31
---
....0.0.ebuild => docbook-to-man-2.0.0-r31.ebuild} | 17 +++++++---
.../files/docbook-to-man-2.0.0-compile.patch | 35 ++++++++++++++++++++
.../files/docbook-to-man-2.0.0-docbook-4.5.patch | 22 ++++++++++++
.../files/docbook-to-man-2.0.0-paths.patch | 15 ++++++++
4 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/app-text/docbook-to-man/docbook-to-man-2.0.0.ebuild b/app-text/docbook-to-man/docbook-to-man-2.0.0-r31.ebuild
similarity index 60%
rename from app-text/docbook-to-man/docbook-to-man-2.0.0.ebuild
rename to app-text/docbook-to-man/docbook-to-man-2.0.0-r31.ebuild
index 6c924c4..ca7c4f9 100644
--- a/app-text/docbook-to-man/docbook-to-man-2.0.0.ebuild
+++ b/app-text/docbook-to-man/docbook-to-man-2.0.0-r31.ebuild
@@ -4,24 +4,31 @@
EAPI="3"
-inherit eutils
+inherit versionator eutils
+DEBIAN_LEVEL=${PF##*-r}
DESCRIPTION="Transform DocBook SGML into nroff/troff man pages"
HOMEPAGE="http://www.oasis-open.org/docbook/tools/dtm/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz
+ mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_LEVEL}.debian.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="" # masked for now, does not yet work as expected
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
-RDEPEND=""
+RDEPEND="app-text/openjade
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-sgml-dtd:4.5"
S=${WORKDIR}/${PN}-${PV}.orig
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0_p19960617-compile.patch
+ epatch "${WORKDIR}"/debian/patches/*.patch
+ epatch "${FILESDIR}"/${P}-compile.patch
+ epatch "${FILESDIR}"/${P}-paths.patch
+ epatch "${FILESDIR}"/${P}-docbook-4.5.patch
}
src_compile() {
diff --git a/app-text/docbook-to-man/files/docbook-to-man-2.0.0-compile.patch b/app-text/docbook-to-man/files/docbook-to-man-2.0.0-compile.patch
new file mode 100644
index 0000000..1e0ba3b
--- /dev/null
+++ b/app-text/docbook-to-man/files/docbook-to-man-2.0.0-compile.patch
@@ -0,0 +1,35 @@
+From a166c7b91b852b368d33f956f4174c7b5cf29e3a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@...>
+Date: Thu, 10 May 2012 19:14:02 +0200
+Subject: [PATCH] Fix compilation
+
+---
+ Instant/tables.c | 2 +-
+ Instant/tptregexp/regerror.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Instant/tables.c b/Instant/tables.c
+index 146e3e5..4f687e9 100644
+--- a/Instant/tables.c
++++ b/Instant/tables.c
+@@ -380,7 +380,7 @@ CALStable(
+ av[1], av[2]);
+ }
+ else {
+- fprintf(stderr, "Incomplete %s table instruction\n");
++ fprintf(stderr, "Incomplete table instruction\n");
+ }
+ }
+
+diff --git a/Instant/tptregexp/regerror.c b/Instant/tptregexp/regerror.c
+index 7bd554e..c5b65e0 100644
+--- a/Instant/tptregexp/regerror.c
++++ b/Instant/tptregexp/regerror.c
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdlib.h>
+
+ void
+ tpt_regerror(s)
+--
+1.7.8.5
diff --git a/app-text/docbook-to-man/files/docbook-to-man-2.0.0-docbook-4.5.patch b/app-text/docbook-to-man/files/docbook-to-man-2.0.0-docbook-4.5.patch
new file mode 100644
index 0000000..313e366
--- /dev/null
+++ b/app-text/docbook-to-man/files/docbook-to-man-2.0.0-docbook-4.5.patch
@@ -0,0 +1,22 @@
+--- cmd/docbook-to-man.sh 2012-05-10 21:09:53.895990682 +0200
++++ cmd/docbook-to-man.sh 2012-05-10 21:11:35.830716322 +0200
+@@ -39,7 +39,7 @@
+
+ ROOT=/usr
+ SGMLS=$ROOT/share/sgml
+-DOCBOOK=$SGMLS/docbook/dtd/4.1
++DOCBOOK=$SGMLS/docbook
+
+ if test -x /usr/bin/nsgmls; then
+ PARSER=/usr/bin/nsgmls
+@@ -51,8 +51,8 @@
+ INSTANT=/usr/bin/instant
+ INSTANT_OPT=${INSTANT_OPT:-"-d"}
+
+-CATALOG=$DOCBOOK/docbook.cat
+-DECL=$DOCBOOK/docbook.dcl
++CATALOG=$DOCBOOK/xml-dtd-4.5/docbook.cat
++DECL=$DOCBOOK/sgml-dtd-4.5/docbook.dcl
+
+ error=false
+
diff --git a/app-text/docbook-to-man/files/docbook-to-man-2.0.0-paths.patch b/app-text/docbook-to-man/files/docbook-to-man-2.0.0-paths.patch
new file mode 100644
index 0000000..6197f78
--- /dev/null
+++ b/app-text/docbook-to-man/files/docbook-to-man-2.0.0-paths.patch
@@ -0,0 +1,15 @@
+--- cmd/docbook-to-man.sh 2012-05-10 21:14:57.431195968 +0200
++++ cmd/docbook-to-man.sh 2012-05-10 21:16:40.793903756 +0200
+@@ -63,9 +63,11 @@
+
+ $error && echo "usage: docbook-to-man docbook-instance" 1>&2 && exit 1
+
++TRANSPEC=/usr/share/sgml/transpec
++
+ (#cat /tmp/dtm.$$.psinc;
+ $PARSER -gl -m$CATALOG $DECL $INSTANCE |
+- $INSTANT -croff.cmap -sroff.sdata -tdocbook-to-man.ts $INSTANT_OPT |
++ $INSTANT -c$TRANSPEC/roff.cmap -s$TRANSPEC/roff.sdata -t$TRANSPEC/docbook-to-man.ts $INSTANT_OPT |
+ sed 's/^[ ]*//
+ s/$/ /
+ s/--/\\-\\-/g
|
