Clean up the ebuild. Add support for cross-compiling. Try to fix parallel build...

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 34265e17172cf3ce14293cb204dcf6f27f261f28..2cebc151c6b020aa6598d7fc1ec24a2f3411c356 100644 (file)
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 be6cac92523efa73fd08ced0f02dcadb ChangeLog 10163
-MD5 9b6860e1cbed3cbc03402dbde98fcd98 file-4.12.ebuild 1858
+MD5 9fb5c3d48dddf5c9b43afca89570d93e ChangeLog 10308
+MD5 5fef75779bd2c2e254149276b5b9fc64 file-4.12.ebuild 2050
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 deefcaad96da75f331ac1ab9d9bc23f9 file-4.10.ebuild 1900
 MD5 7164ccd6e5dc2c32c0d7911178ea8bd0 file-4.10-r1.ebuild 1909
 MD5 8cf0ba615168e0a01ddd576d39b19efe files/digest-file-4.10 61
 MD5 d83caef7e9c2a9719022f57de134edae files/file-4.10-mconvert.patch 476
 MD5 d336b3490362624aec2e30679c44a198 files/digest-file-4.12 61
+MD5 f856a50dada76a4ca5cee58fbd04e76b files/file-4.12-cross-compile.patch 964
 MD5 04e04c973cb0c88d19b0028d8ed05007 files/file-4.xx-mips-gentoo.diff 4694
 MD5 8cf0ba615168e0a01ddd576d39b19efe files/digest-file-4.10-r1 61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBvPRproRuSHgZdywRAu4wAJ9LlYZdueQ7fUm91g/5C4CcW2oCPQCfSnSx
-tcgPJBb3mFZz/a++LWbNsc0=
-=svZb
+iD4DBQFBvisZroRuSHgZdywRAk5dAJ9NpRWMPB9XLJF7O7xQ69Ut8ZARIwCYrjoU
+07VwqhYTo0I8wJWBx8xuQw==
+=RFlV
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/groff/ChangeLog b/sys-apps/groff/ChangeLog
index a654d5f1058d5b88edf14d20d601b122dfcd30ac..37067f9327c2716db1b9186a7e50cec9afda8d74 100644 (file)
--- a/sys-apps/groff/ChangeLog
+++ b/sys-apps/groff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/groff
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.54 2004/11/05 09:32:31 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/ChangeLog,v 1.55 2004/12/13 23:50:23 vapier Exp $
+
+  13 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/groff-1.19.1-parallel-make.patch, groff-1.19.1-r2.ebuild:
+  Clean up the ebuild. Add support for cross-compiling. Try to fix parallel
+  build (works for me :D).
 
   05 Nov 2004; Hardave Riar <hardave@gentoo.org> groff-1.19.1-r2.ebuild:
   Stable on mips, bug #68404.

diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index f0682a0c48f17b15abf549b39a81674e6a3dcf27..48b2f0d95a14db64e40a63ec07b8e95a9f9baf69 100644 (file)
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5e7c08a6a850bff52f83a1612edcf275 ChangeLog 7465
+MD5 f72b9211d08e8ca8201d50bfe90c4e33 ChangeLog 7685
 MD5 6095957ce1651ff7d72b6c285cddfbd9 groff-1.18.1-r4.ebuild 3140
-MD5 e1be5a1a4b1ef8931d3b152d07fdd3b1 groff-1.19.1-r2.ebuild 3031
+MD5 58b6e27032ccf499957971c0998f596e groff-1.19.1-r2.ebuild 3167
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 b887e99fa5e1252f1bf827af9892a238 files/digest-groff-1.18.1-r4 132
 MD5 b79e74dab8ceadf74f153032ad30eea3 files/digest-groff-1.19.1-r2 65
@@ -14,10 +14,11 @@ MD5 b70471bdc7015ddf030d176b3a0f2d5f files/groff-1.19.1-stack.patch 3659
 MD5 8f3336cc924f20e480ac76ee94f0611e files/groff-1.19.1-tmpfile.patch 710
 MD5 e0ea59264695cc68dc9947e4611dde5d files/groff-man-UTF-8.diff 391
 MD5 a94a3de58bb54769a2793e1f8602a618 files/groff_1.18.1-7-fix.patch 551
+MD5 64d15253bef046fc681356d45aecf417 files/groff-1.19.1-parallel-make.patch 1067
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBvf5XroRuSHgZdywRAitsAJ957za/Ll/nsHIRPZdZH9XTHhaJigCgkiHZ
-oMdoqsobKb30virKXUZHRKE=
-=zY2d
+iD8DBQFBvireroRuSHgZdywRAtXgAJ44ZkHZGnp/LrzKoD0AjRi8YJqMLwCeLvBR
+1cIBSk7ZLKUh8RiDsoS6KjA=
+=9Dlr
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/groff/files/groff-1.19.1-parallel-make.patch b/sys-apps/groff/files/groff-1.19.1-parallel-make.patch
new file mode 100644 (file)
index 0000000..af8931f
--- /dev/null
+++ b/sys-apps/groff/files/groff-1.19.1-parallel-make.patch
@@ -0,0 +1,41 @@
+--- groff-1.19.1/Makefile.in.orig      2004-12-13 17:08:22.845281534 -0500
++++ groff-1.19.1/Makefile.in   2004-12-13 17:11:14.903873176 -0500
+@@ -541,3 +541,3 @@
+ 
+-$(LIBDIRS): FORCE
++$(LIBDIRS): FORCE $(INCDIRS) $(PROGDEPDIRS)
+       @$(ENVSETUP); \
+@@ -557,3 +557,3 @@
+ 
+-$(CPROGDIRS): FORCE
++$(CPROGDIRS): FORCE $(LIBDIRS)
+       @$(ENVSETUP); \
+@@ -573,3 +573,3 @@
+ 
+-$(CCPROGDIRS): FORCE
++$(CCPROGDIRS): FORCE $(LIBDIRS)
+       @$(ENVSETUP); \
+@@ -589,3 +589,3 @@
+ 
+-$(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE
++$(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDIRS)
+       @$(ENVSETUP); \
+@@ -603,3 +603,17 @@
+ 
+-$(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
++$(OTHERDIRS): FORCE $(PROGDIRS)
++      @$(ENVSETUP); \
++      if test $(srcdir) = .; then \
++        srcdir=.; \
++      else \
++        srcdir=`cd $(srcdir); pwd`/$@; \
++      fi; \
++      test -d $@ || $(mkinstalldirs) $@; \
++      cd $@; \
++      $(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
++        -f $(top_srcdir)/Makefile.comm \
++        -f $$srcdir/Makefile.sub \
++        -f $(top_srcdir)/Makefile.man $(do)
++
++$(INCDIRS) $(PROGDEPDIRS): FORCE
+       @$(ENVSETUP); \

diff --git a/sys-apps/groff/groff-1.19.1-r2.ebuild b/sys-apps/groff/groff-1.19.1-r2.ebuild
index cd2783898bea4e55c4582df17bc0534193cbc419..ae1a29ee7d241108e83cdd8bb6a38a705019c0d0 100644 (file)
--- a/sys-apps/groff/groff-1.19.1-r2.ebuild
+++ b/sys-apps/groff/groff-1.19.1-r2.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-r2.ebuild,v 1.9 2004/11/12 14:28:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.19.1-r2.ebuild,v 1.10 2004/12/13 23:50:23 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -40,14 +40,31 @@ src_unpack() {
 
        # Fix tempfile usage #68404
        epatch ${FILESDIR}/${P}-tmpfile.patch
+
+       # Fix make dependencies so we can build in parallel
+       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"
+               touch .dont-build-X
+       fi
+       # Only build X stuff if we have X installed, but do 
+       # not depend on it, else we get circular deps :(
+       if ! use X || [ ! -x /usr/X11R6/bin/xmkmf ] ; then
+               touch .dont-build-X
+       fi
 }
 
 src_compile() {
-       local myconf=
-
        # Fix problems with not finding g++
-       export CC="$(tc-getCC)"
-       export CXX="$(tc-getCXX)"
+       tc-export CC CXX
 
        # -Os causes segfaults, -O is probably a fine replacement
        # (fixes bug 36008, 06 Jan 2004 agriffis)
@@ -56,26 +73,19 @@ src_compile() {
        # -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`"
-
-       # this is incredibly broken, i have no idea why people are trying to use
-       # it... even the documentation on it states that -fnew-ra is "meant only
-       # for testing. Users should not specify this option, since it is not yet
-       # ready for production use."
-       filter-flags -fnew-ra
+       # CJK doesnt work yet with groff-1.19
+       #       $(use_enable cjk multibyte)
 
        # many fun sandbox errors with econf
-       myconf="${myconf} --host=${CHOST} --prefix=/usr \
-               --mandir=/usr/share/man --infodir=\${inforoot}"
-       ./configure ${myconf} || die
-
-       # Parallel build doesn't work. Patched wanted.
-       emake -j1 || die
-
-       # Only build X stuff if we have X installed, but do
-       # not depend on it, else we get circular deps.
-       if use X && [ -x /usr/X11R6/bin/xmkmf ]
-       then
+       ./configure \
+               --host=${CHOST} \
+               --prefix=/usr \
+               --mandir=/usr/share/man \
+               --infodir=\${inforoot} \
+               || die
+       emake || die
+
+       if [ ! -f .dont-build-X ] ; then
                cd ${S}/src/xditview
                xmkmf || die
                make depend all || die
@@ -84,28 +94,27 @@ src_compile() {
 
 src_install() {
        dodir /usr /usr/share/doc/${PF}/{examples,html}
-       make prefix=${D}/usr \
-               manroot=${D}/usr/share/man \
-               inforoot=${D}/usr/share/info \
-               docdir=${D}/usr/share/doc/${PF} \
+       make \
+               prefix="${D}"/usr \
+               manroot="${D}"/usr/share/man \
+               inforoot="${D}"/usr/share/info \
+               docdir="${D}"/usr/share/doc/${PF} \
                install || die
 
-       if use X && [ -x /usr/X11R6/bin/xmkmf ]
-       then
-               cd ${S}/src/xditview
-               make DESTDIR=${D} \
-                       BINDIR=/usr/bin \
-                       MANPATH=/usr/share/man \
-                       install \
-                       install.man || die
-       fi
-
        # The following links are required for xman
        dosym eqn /usr/bin/geqn
        dosym tbl /usr/bin/gtbl
        dosym soelim /usr/bin/zsoelim
 
-       cd ${S}
        dodoc BUG-REPORT ChangeLog FDL MORE.STUFF NEWS \
                PROBLEMS PROJECTS README REVISION TODO VERSION
+
+       if [ ! -f .dont-build-X ] ; then
+               cd ${S}/src/xditview
+               make DESTDIR="${D}" \
+                       BINDIR=/usr/bin \
+                       MANPATH=/usr/share/man \
+                       install \
+                       install.man || die
+       fi
 }

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 90133250bb6df00b267814399f6f0690f6d3ad87..9dc4c957b46096ecb8e4d6c596d3625034978b3a 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,7 +6,7 @@ MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
 MD5 792bf823d26f12bc03b4c9c7a370374c portage-2.0.51-r3.ebuild 12546
 MD5 45d685c485d82a914b924ba6ace963e1 portage-2.0.51_rc7.ebuild 11767
 MD5 45cd332af1ba186c050ec9eeafe9e915 portage-2.0.51-r7.ebuild 12278
-MD5 33dd490e02d06670ded8042044b3b1c5 portage-2.0.51-r8.ebuild 12290
+MD5 379ad174e3720dad6ddd8deb352afa5b portage-2.0.51-r8.ebuild 12285
 MD5 2200865f3cd8ee0f4bfbd91c3de84181 portage-2.0.51-r2.ebuild 12263
 MD5 63cadb5f6ef798aaa8b95a899fdea82f portage-2.0.50-r11.ebuild 11572
 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
@@ -20,7 +20,7 @@ MD5 30e618b070e4b7e13f3dd9b3f1db6140 files/digest-portage-2.0.51-r8 70
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBtmibroRuSHgZdywRAllRAJ4n49bzHkPDtn6TIWvVb70QukfR8QCfdUr9
-nVpIcnmtOA36YaKJ8LXXrkc=
-=PKPQ
+iD8DBQFBvis2roRuSHgZdywRAiNeAJ9d6ICjX6vnA/f/g2cyNuZkPhna2wCfXbVd
+xD64jBcz+Gbf+yK9ZTQwKxI=
+=WSBu
 -----END PGP SIGNATURE-----