Make sure we forces dashes in unicode to the traditional "-" so that users dont get confused by the pretty looking versions #121502.

Package-Manager: portage-2.2_pre2

4 files changed, 128 insertions, 10 deletions

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index 9b39933c096e..ed0dbc7b59e7 100644
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/groff
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.78 2006/12/30 13:44:18 usata Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.79 2008/02/24 18:59:32 vapier Exp $
+
+*groff-1.19.2-r2 (24 Feb 2008)
+
+  24 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/groff-1.19.2-man-unicode-dashes.patch, +groff-1.19.2-r2.ebuild:
+  Make sure we forces dashes in unicode to the traditional "-" so that users
+  dont get confused by the pretty looking versions #121502.
 
   30 Dec 2006; Mamoru KOMACHI <usata@gentoo.org> groff-1.19.2-r1.ebuild:
   Added eautoreconf and --enable-japanese in order to get cjk patch working
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index bcdcdca67a9e..de6377cdbc7f 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,15 +1,20 @@
-AUX groff-1.18-infoext.patch 673 RMD160 f0038c01fd702c543240ea79220b0b2eaebd6285 SHA1 9035cb640de6f8ad9f681b0768d3624412406daa SHA256 aeaf8f2058504c98a8f4f7a99332b4862f613d610bcd948455d9460e07c4b0b6
-AUX groff-1.18-no-netpbm-depend.patch 920 RMD160 52b52deb065a04eb5520cb04290408ed99878133 SHA1 819986afc2865ece66e0a45a1db7601ea3b0e131 SHA256 069de596ec7aba98433b62cfbce3097d65b714d9046708060fa3c8c5609b1b20
-AUX groff-1.18.1.1-deb-fix.patch 403 RMD160 009fd556e5205fbacfec9d1fb6e679a4ccc72f21 SHA1 2e7e45ae385dcf14e1c8c575468ccca2eb943b17 SHA256 1f89f075328a5094e62177d4beb514db583e77815e7df2de170feaa0fac0fec9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX groff-1.19.2-infoext.patch 2779 RMD160 1f88f4ae40128b8496f7de47a91917dea777aee5 SHA1 013f1f36b868235d4a583bda62517a1b577ade98 SHA256 f6bcf74c010c187d8518dbe03918facdedad93b06fcf126fc4a3a58115778d22
+AUX groff-1.19.2-man-unicode-dashes.patch 574 RMD160 759b9822f6950eeaac78ac16cfc8ebf58a77be38 SHA1 a7859ebef38fc0e2d73c1bc500e716c77ce8dc47 SHA256 e8fa93d3536bb6053ec104b567444cec7da8f101e24923dc4003efc8b7bf5bbe
 AUX groff-1.19.2-parallel-make.patch 620 RMD160 57ffb1ccd56f1de7ef94f99187f51dceab116c20 SHA1 44add9e98ec14e6c0dfd72d9bcb2249bd46a0542 SHA256 ac213a872f5f96c36fdb098578f032b09dfebd7cf4e192da98813781f400dafe
 AUX groff-man-UTF-8.diff 391 RMD160 58abd2807f47316e486fe5021994ce856a2c8942 SHA1 c6163482daefd660fd7318bcc0d0a15aa28d305b SHA256 d5095044064e30178e50ea6bc63f20d7a55c3daf053054bae38f6584611ce754
-AUX groff_1.18.1.1-10-fix.patch 551 RMD160 a513e09b797e58dbe5cf9428dff5b3550d4f1692 SHA1 e55755fd887b2cc267dcb42add6c41f6312cdd97 SHA256 9199ffeedbd05a5f8644ba25231dba4c922bbbb01448009f5dfbaf06e8e930b7
-DIST groff-1.18.1.1.tar.gz 2260623 RMD160 af0a96109e8644f3c32fa13b8531fb494905e4cc SHA1 19c8c83e6ee29dd6041dae0daf1c1d0debd3d32a SHA256 e1ad500044e1e9bfd851d5dd60ff64b980b88af68feed020ae372447cbb9d7b0
 DIST groff-1.19.2-japanese.patch.bz2 160688 RMD160 4f52a0ac81c20bc5f8cb308d0fc08fd99c42e907 SHA1 50a4612657b2ac2b7852c69c8cbca08021f3956f SHA256 67c09321a9190a33ad4c9d2c5ca8462ddaa235dd1c230a80ae6eef6236053c41
 DIST groff-1.19.2.tar.gz 2903263 RMD160 d5e57fa1d71dbff2c59a40a5a68c7417ffe211c9 SHA1 cfad99a5c52933a6a9180e394bd94fbaec0ac956 SHA256 d864fbd0bf6dea24e4f71736da9902a1cae86d0a1a893b5fe17118927257ec3e
-DIST groff_1.18.1.1-12.diff.gz 127812 RMD160 e49d682f23c7d2a63d4d4804af3d3ea9d39c2313 SHA1 bd24503fc4cf330b1d6c5137f3aa2d0cd03b7861 SHA256 71b1b7a75ca6f2f2a29b8093c16508841487eae92e2750fb49d297e89d0d3c97
-EBUILD groff-1.18.1.1.ebuild 2901 RMD160 0c1499a4f2a2f909238b3e04c0a51722b2369487 SHA1 0da186e28982c17487b0b76bec37c31024a04c9c SHA256 d5e55f0fd66a55785371e2ea8c69967056434be60ae7f75c100b198afd1495c1
 EBUILD groff-1.19.2-r1.ebuild 2477 RMD160 eb259ae7da2392d61660ca0896eb5e44558dc316 SHA1 46688c6efef023a44dd0a4657a20ccbee0d9a8f9 SHA256 54dcafc01d8be2710afc62a14171de7d756a5b76f38586544b73f3bc6ec7a7c9
-MISC ChangeLog 10898 RMD160 87b4336357d8c6e3150f6daa09548558d51f2525 SHA1 8c2f36baaa53851c05e5f29e96ef67b1b00ec1f0 SHA256 5885c715e82e126798334e5d8d7870726e4cf43dd39851e6530001bec4aed26c
+EBUILD groff-1.19.2-r2.ebuild 2228 RMD160 c4391f846ba2916e61a2c366c9d7c392a9d9062f SHA1 13623189230156509cac4fb21a69df886a89f436 SHA256 2a5103706dc0ac3e9c6859e8bffe1eec1e0933a7659623e843bf05239d953d4c
+MISC ChangeLog 11192 RMD160 62555041e5b6d61fd425a54400473183cb4122ad SHA1 6780d80eb6122dd12232a72048bc4ab99d7df64a SHA256 18e22146583f7bfe5db38575b897f404223ba1c3fbf04e9b3d204861cb581bb7
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHwb6aj9hvisErhMIRAhczAJ9c358J6jZQPxGO0F/e4+1elP8aewCg3wDH
+X21BHBMIT0D8tt81EXysgLY=
+=dTdX
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
new file mode 100644
index 000000000000..d85a8330d274
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.19.2-man-unicode-dashes.patch
@@ -0,0 +1,24 @@
+format dashes as dashes so as to not confuse people
+
+http://bugs.gentoo.org/16108
+http://bugs.gentoo.org/17580
+http://bugs.gentoo.org/121502
+
+--- tmac/man.local
++++ tmac/man.local
+@@ -1,2 +1,6 @@
+ .\" This file is loaded after an-old.tmac.
+ .\" Put any local modifications to an-old.tmac here.
++.if '\*[.T]'utf8' \{\
++.  char \- \N'45'
++.  char  - \N'45'
++.\}
+--- tmac/mdoc.local
++++ tmac/mdoc.local
+@@ -1,2 +1,6 @@
+ .\" This file is loaded after doc.tmac.
+ .\" Put any local modifications to doc.tmac here.
++.if '\*[.T]'utf8' \{\
++.  char \- \N'45'
++.  char  - \N'45'
++.\}
diff --git a/sys-apps/groff/groff-1.19.2-r2.ebuild b/sys-apps/groff/groff-1.19.2-r2.ebuild
new file mode 100644
index 000000000000..3d4b061b22b0
--- /dev/null
+++ b/sys-apps/groff/groff-1.19.2-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.2-r2.ebuild,v 1.1 2008/02/24 18:59:32 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib autotools
+
+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://gentoo/groff-1.19.2-japanese.patch.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="cjk X"
+
+DEPEND=">=sys-apps/texinfo-4.7-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix the info pages to have .info extensions,
+	# else they do not get gzipped.
+	epatch "${FILESDIR}"/${P}-infoext.patch
+
+	epatch "${FILESDIR}"/${P}-man-unicode-dashes.patch #16108 #17580 #121502
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	# Make sure we can cross-compile this puppy
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e '/^GROFFBIN=/s:=.*:=/usr/bin/groff:' \
+			-e '/^TROFFBIN=/s:=.*:=/usr/bin/troff:' \
+			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
+			contrib/mom/Makefile.sub \
+			doc/Makefile.in \
+			doc/Makefile.sub || die "cross-compile sed failed"
+	fi
+
+	if use cjk ; then
+		epatch "${WORKDIR}"/groff-1.19.2-japanese.patch #134377
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	# Fix problems with not finding g++
+	tc-export CC CXX
+
+	# -Os causes segfaults, -O is probably a fine replacement
+	# (fixes bug 36008, 06 Jan 2004 agriffis)
+	replace-flags -Os -O
+
+	econf \
+		--with-appresdir=/etc/X11/app-defaults \
+		$(use_with X x) \
+		$(use_enable cjk japanese) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin
+	make \
+		prefix="${D}"/usr \
+		bindir="${D}"/usr/bin \
+		libdir="${D}"/usr/$(get_libdir) \
+		appresdir="${D}"/etc/X11/app-defaults \
+		datadir="${D}"/usr/share \
+		mandir="${D}"/usr/share/man \
+		infodir="${D}"/usr/share/info \
+		docdir="${D}"/usr/share/doc/${PF} \
+		install || die
+
+	# The following links are required for man #123674
+	dosym eqn /usr/bin/geqn
+	dosym tbl /usr/bin/gtbl
+
+	dodoc BUG-REPORT ChangeLog FDL MORE.STUFF NEWS \
+		PROBLEMS PROJECTS README REVISION TODO VERSION
+}