filter -Os on all arches #63938 and update texinfo DEPEND #63970

diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index bc517a11199edda6c0a00153d4addd2695190aa1..40a328580538019e69eaeb38f27dba8bb5add4b3 100644 (file)
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,6 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 c6f0bec2c536e327415b376b5eb527d9 ChangeLog 6458
 MD5 6095957ce1651ff7d72b6c285cddfbd9 groff-1.18.1-r4.ebuild 3140
-MD5 34bd5bc3f8f3ad9c7538351de5a3a4b6 groff-1.19.1-r1.ebuild 3067
+MD5 25613eba8f051f9bbfc0817178d052d3 groff-1.19.1-r1.ebuild 2964
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 c43ddaf604dd389afc6107d79b90ce6c files/groff-1.18-infoext.patch 673
 MD5 ab6a81383557e8cf8eed1e9b15d45540 files/groff-1.18-no-netpbm-depend.patch 367
@@ -10,3 +13,10 @@ MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1-7-fix.patch 551
 MD5 b887e99fa5e1252f1bf827af9892a238 files/digest-groff-1.18.1-r4 132
 MD5 b79e74dab8ceadf74f153032ad30eea3 files/digest-groff-1.19.1-r1 65
 MD5 b70471bdc7015ddf030d176b3a0f2d5f files/groff-1.19.1-stack.patch 3659
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBgaxjHTu7gpaalycRArEaAJ9GZkZ6o1CbgmkGrYFksYMxxgmj9ACeMd9T
+NcwDUldnHs2VjNX2Mhj3HLU=
+=SYZe
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/groff/groff-1.19.1-r1.ebuild b/sys-apps/groff/groff-1.19.1-r1.ebuild
index d0fa1d029147cda260f6616e01c07cbaed7d22f4..e6ac531d088f1ef32f63fef85fcb242de9cfe022 100644 (file)
--- a/sys-apps/groff/groff-1.19.1-r1.ebuild
+++ b/sys-apps/groff/groff-1.19.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r1.ebuild,v 1.5 2004/10/28 15:50:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r1.ebuild,v 1.6 2004/10/29 02:34:37 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86"
 IUSE="X"
 
 DEPEND="virtual/libc
-       >=sys-apps/texinfo-4.0"
+       >=sys-apps/texinfo-4.7-r1"
 PDEPEND=">=sys-apps/man-1.5k-r1"
 
 src_unpack() {
@@ -46,18 +46,12 @@ src_compile() {
        export CC="$(tc-getCC)"
        export CXX="$(tc-getCXX)"
 
-       case ${ARCH} in
-               alpha)
-                       # -Os causes segfaults, -O is probably a fine replacement
-                       # (fixes bug 36008, 06 Jan 2004 agriffis)
-                       replace-flags -Os -O
-                       ;;
-               hppa)
-                       # -march=2.0 makes groff unable to finish the compile process
-                       export CFLAGS="${CFLAGS/-march=2.0/}"
-                       export CXXFLAGS="${CXXFLAGS/-march=2.0/}"
-                       ;;
-       esac
+       # -Os causes segfaults, -O is probably a fine replacement
+       # (fixes bug 36008, 06 Jan 2004 agriffis)
+       replace-flags -Os -O
+
+       # -march=2.0 makes groff unable to finish the compile process
+       use hppa && replace-cpu-flags 2.0 1.0
 
 #      myconf="${myconf} `use_enable cjk multibyte`"