cleanup ebuild

(Portage version: 2.1_rc2-r1)

3 files changed, 32 insertions, 19 deletions

diff --git a/sys-apps/groff/files/digest-groff-1.18.1.1 b/sys-apps/groff/files/digest-groff-1.18.1.1
index f0c43598a0cc..fbdfaef3917a 100644
--- a/sys-apps/groff/files/digest-groff-1.18.1.1
+++ b/sys-apps/groff/files/digest-groff-1.18.1.1
@@ -1,2 +1,4 @@
 MD5 511dbd64b67548c99805f1521f82cc5e groff-1.18.1.1.tar.gz 2260623
-MD5 e4ddab0e8fe7bee80d70dd117ec3f230 groff_1.18.1.1-10.diff.gz 131002
+MD5 5f53631feb4d2a3811d35519e2bc3410 groff_1.18.1.1-12.diff.gz 127812
+RMD160 e49d682f23c7d2a63d4d4804af3d3ea9d39c2313 groff_1.18.1.1-12.diff.gz 127812
+SHA256 71b1b7a75ca6f2f2a29b8093c16508841487eae92e2750fb49d297e89d0d3c97 groff_1.18.1.1-12.diff.gz 127812
diff --git a/sys-apps/groff/files/groff-1.18.1.1-deb-fix.patch b/sys-apps/groff/files/groff-1.18.1.1-deb-fix.patch
new file mode 100644
index 000000000000..1ecbdfa108ef
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.18.1.1-deb-fix.patch
@@ -0,0 +1,19 @@
+--- groff-1.18.1/tmac/docj.tmac
++++ groff-1.18.1/tmac/docj.tmac
+@@ -49,14 +49,14 @@
+ .de sO
+ .mso mdoc/\\$1
+ ..
++.sO doc-doc-common
++.sO doc-doc-syms
+ .if t \{\
+ .       sO docj-ditroff
+ .\}
+ .if n \{\
+ .       sO docj-nroff
+ .\}
+-.sO doc-common
+-.sO doc-syms
+ .\" NS Db macro - start/stop DEBUG MODE
+ .\" NS Db register DEBUG MODE
+ .\" NS iN register DEBUG MODE (inline if 1, to stderr if 0 (default))
diff --git a/sys-apps/groff/groff-1.18.1.1.ebuild b/sys-apps/groff/groff-1.18.1.1.ebuild
index 3078a9fd758d..8d77e96459f4 100644
--- a/sys-apps/groff/groff-1.18.1.1.ebuild
+++ b/sys-apps/groff/groff-1.18.1.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1.1.ebuild,v 1.5 2006/05/25 21:28:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.18.1.1.ebuild,v 1.6 2006/05/25 21:55:35 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
-MB_PATCH="${P/-/_}-10"
+DEB_PATCH="${P/-/_}-12"
 DESCRIPTION="Text formatter used for man pages"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 SRC_URI="mirror://gnu/groff/${P}.tar.gz
-	cjk? ( mirror://debian/pool/main/g/groff/${MB_PATCH}.diff.gz )"
+	mirror://debian/pool/main/g/groff/${DEB_PATCH}.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,32 +20,24 @@ PDEPEND=">=sys-apps/man-1.5k-r1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
-	if use cjk; then
-		# multibyte patch contains no-color-segfault
-		epatch ${WORKDIR}/${MB_PATCH}.diff
-		epatch ${FILESDIR}/${MB_PATCH}-fix.patch
-	else
-		# Do not segfault if no color is defined in input, bug #14329
-		# <azarah@gentoo.org> (08 Feb 2003)
-		epatch ${FILESDIR}/groff-1.18.1-no-color-segfault.patch
-	fi
+	# We lub Debian
+	epatch "${WORKDIR}"/${DEB_PATCH}.diff
+	epatch "${FILESDIR}"/${P}-deb-fix.patch
 
 	# Fix the info pages to have .info extensions,
 	# else they do not get gzipped.
-	epatch ${FILESDIR}/groff-1.18-infoext.patch
+	epatch "${FILESDIR}"/groff-1.18-infoext.patch
 
 	# Do not generate example files that require us to
 	# depend on netpbm.
-	epatch ${FILESDIR}/groff-1.18-no-netpbm-depend.patch
+	epatch "${FILESDIR}"/groff-1.18-no-netpbm-depend.patch
 
 	# Make dashes the same as minus on the keyboard so that you
 	# can search for it. Fixes #17580 and #16108
 	# Thanks to James Cloos <cloos@jhcloos.com>
-	epatch ${FILESDIR}/${PN}-man-UTF-8.diff
-
-	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${PN}-man-UTF-8.diff
 
 	# Fix syntax error in pic2graph. Closes #32300.
 	sed -i -e "s:groffpic_opts=\"-U\":groffpic_opts=\"-U\";;:" contrib/pic2graph/pic2graph.sh