Fix for gcc 4.1. (#120910) Look for imake in the right place, fix by Octavio Ruiz...

Package-Manager: portage-2.1_pre6-r3

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index b93788e9b217a553480633c790915bb9832bf2fc..4e4017dcd369ee6cc3d3885f9d4d747e9c6fe71a 100644 (file)
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xview
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.19 2006/02/19 04:37:06 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.20 2006/03/16 06:24:52 spyderous Exp $
+
+  16 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>; xview-3.2.ebuild,
+  xview-3.2-r1.ebuild, xview-3.2-r3.ebuild, xview-3.2-r5.ebuild:
+  Fix for gcc 4.1. (#120910) Look for imake in the right place, fix by Octavio
+  Ruiz. No rev bump, since both result in compilation failures. Port remaining
+  ebuilds to modular X.
 
 *xview-3.2-r5 (19 Feb 2006)
 

diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest
index e4cb4220633a8cd5ce139d302f695b12416bdf7f..24b4e1d97bf946fde4f9354d8e1fcc371e7c2884 100644 (file)
--- a/x11-libs/xview/Manifest
+++ b/x11-libs/xview/Manifest
@@ -1,14 +1,42 @@
-MD5 2785cec6df5434dc7f80a2621c65db98 ChangeLog 2866
+MD5 62e216876643b86bf93ef057bd0037bb ChangeLog 3188
+RMD160 506fb0f7363797cad171912966a2ca4ea6b9dae4 ChangeLog 3188
+SHA256 3e3d48eecffe5c2f7621058a6b7de3e863631caa3148850dfe666083dc2d77d2 ChangeLog 3188
 MD5 ca8ca75012c0086e91666513ea0da88d files/CAN-2005-0076.patch 984
+RMD160 46d0ff56c23b414bf566c27720aedfbaf7b0d8a7 files/CAN-2005-0076.patch 984
+SHA256 f94cc69cc3156bf5c80b3fe920f2b505e3daac0cf598def8b0b763abc2d06813 files/CAN-2005-0076.patch 984
 MD5 6de3c812dee458777db24502d252984f files/digest-xview-3.2 138
+RMD160 93aa559ade3afe11a653fa46b2fcbef416085dfb files/digest-xview-3.2 138
+SHA256 e9f0f8e7e788b82b9fec7832ccca6a9320a62529fdb0d157cfb969d7df9682c4 files/digest-xview-3.2 138
 MD5 48636f5ace70cc3f5033a87188e4e7bf files/digest-xview-3.2-r1 138
+RMD160 d58521d34b66eeca35fced7d23e8876c75fbb0f7 files/digest-xview-3.2-r1 138
+SHA256 de117e65745c06d66c4eb17f34f9985fa2f63d89193e31cf3800e641494f756d files/digest-xview-3.2-r1 138
 MD5 d7d90bd733aab393a20a5919e05c0b49 files/digest-xview-3.2-r3 70
+RMD160 1a9eb7b54b1a8c6761c425d64b5d298db4fd3965 files/digest-xview-3.2-r3 70
+SHA256 a94b3301761248d085c0b90eec4ca1c94e2b1dd8e71c503f0ff2f1165f185637 files/digest-xview-3.2-r3 70
 MD5 d7d90bd733aab393a20a5919e05c0b49 files/digest-xview-3.2-r4 70
-MD5 d7d90bd733aab393a20a5919e05c0b49 files/digest-xview-3.2-r5 70
+RMD160 1a9eb7b54b1a8c6761c425d64b5d298db4fd3965 files/digest-xview-3.2-r4 70
+SHA256 a94b3301761248d085c0b90eec4ca1c94e2b1dd8e71c503f0ff2f1165f185637 files/digest-xview-3.2-r4 70
+MD5 9c646053d2007f2fd7be528a4c49be67 files/digest-xview-3.2-r5 527
+RMD160 1219835077bf272c41be67b6689dba37a125b7d3 files/digest-xview-3.2-r5 527
+SHA256 3f35ee18bc918feed4c035f67d45a0052f1fec6c203f589d8730541178fe5297 files/digest-xview-3.2-r5 527
 MD5 52d63a0f0747efefb09e61ce08f3bc1c files/lseek.diff 897
+RMD160 c70b0ed6d846369a7dc1a1f4093186b6f51de64a files/lseek.diff 897
+SHA256 4a0eb56dfadd48f839d2621804763d3dd550f978ac94500660f5cd45877da578 files/lseek.diff 897
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 1f80b853ffb94e1a3fcad18538a35918 xview-3.2-r1.ebuild 2596
-MD5 9a0c239967b3664c61caac1548137243 xview-3.2-r3.ebuild 2669
+RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
+SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160
+MD5 535fdff7f8ea2f9c32cb5e50f8259ece xview-3.2-r1.ebuild 2653
+RMD160 533a5e81f2a3f641af8b6b7b341c59fd19feafaa xview-3.2-r1.ebuild 2653
+SHA256 164de60b7bc37b247ea77fb9fbc4c45a6b326bea3b32e9ba2bfc0828105361f2 xview-3.2-r1.ebuild 2653
+MD5 53623d52a09c57aa5bd5fe78d2cf0a4f xview-3.2-r3.ebuild 2726
+RMD160 1f6fff3132cb10d42d999f9cf956ecfd5c577139 xview-3.2-r3.ebuild 2726
+SHA256 64ae5397dff5c6df81c3ff2cd791c3f69ff162c9142b201ac88f7aad56671996 xview-3.2-r3.ebuild 2726
 MD5 bc369c9dbc5c218e8ffab0309fd98b8b xview-3.2-r4.ebuild 3066
-MD5 074f2bc8a0378ad6232ae8f8f8596ebc xview-3.2-r5.ebuild 3105
-MD5 d6f0240a1b502222522db7d875a66cd8 xview-3.2.ebuild 2280
+RMD160 3f31ca84ca1fc6c3d72a2be7e634f21d515eba01 xview-3.2-r4.ebuild 3066
+SHA256 e023aeb618266232f6aab75ccce2ddade71e1a626192411ca817b30ff7421853 xview-3.2-r4.ebuild 3066
+MD5 706d971d1a46f0a6300d75e193729a62 xview-3.2-r5.ebuild 3368
+RMD160 932bc2519b2850539788e7728a7eef77a0cf3070 xview-3.2-r5.ebuild 3368
+SHA256 329472ede0d22a7868f9d4161e37a3880a278a1e20b4b39b197b866c4dadd471 xview-3.2-r5.ebuild 3368
+MD5 8b155b85209927d76a78199b44321c85 xview-3.2.ebuild 2337
+RMD160 dc3e229b1f16b96f069a45e711d60c18fdedcec1 xview-3.2.ebuild 2337
+SHA256 2de02acaa0553a392b20c7fe6ebdcd89f396ab59a5805f8059480d51479b3125 xview-3.2.ebuild 2337

diff --git a/x11-libs/xview/files/digest-xview-3.2-r5 b/x11-libs/xview/files/digest-xview-3.2-r5
index d467cbbf21c7067824f556e47a3b5251fa84ff5a..f3a34206ae991a8d89e49e73484dc4502b6b6dbd 100644 (file)
--- a/x11-libs/xview/files/digest-xview-3.2-r5
+++ b/x11-libs/xview/files/digest-xview-3.2-r5
@@ -1 +1,6 @@
+MD5 f804d91f5b154f95872a23e86d1a621e xview-3.2-gcc-4.1-v0.1.patch.bz2 8018
+RMD160 0387c073d7f4c8303467f3065ba2a573fdb6710e xview-3.2-gcc-4.1-v0.1.patch.bz2 8018
+SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba xview-3.2-gcc-4.1-v0.1.patch.bz2 8018
 MD5 a61e7ce82cac041a2c613041dc003de5 xview-3.2p1.4-18c.tar.gz 3377010
+RMD160 2d77c7988a483871e0f316ccb03d3b82e9978c45 xview-3.2p1.4-18c.tar.gz 3377010
+SHA256 3bf4b77257881e7146b35fe674e4d4c4f2708cb58b947a17f099d12b166a60c5 xview-3.2p1.4-18c.tar.gz 3377010

diff --git a/x11-libs/xview/xview-3.2-r1.ebuild b/x11-libs/xview/xview-3.2-r1.ebuild
index 96f362b6aae1626292cdab0518face8f8816391c..c21ac536276e9afcb5df53aa882ca73aa6d2b80f 100644 (file)
--- a/x11-libs/xview/xview-3.2-r1.ebuild
+++ b/x11-libs/xview/xview-3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r1.ebuild,v 1.8 2006/01/25 22:06:08 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r1.ebuild,v 1.9 2006/03/16 06:24:52 spyderous Exp $
 
 inherit eutils
 
@@ -25,7 +25,11 @@ SLOT="0"
 KEYWORDS="-alpha -amd64 ~ppc ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( ( x11-libs/libXpm
+                       x11-proto/xextproto
+               )
+               virtual/x11
+       )"
 
 src_unpack() {
        unpack $A

diff --git a/x11-libs/xview/xview-3.2-r3.ebuild b/x11-libs/xview/xview-3.2-r3.ebuild
index aaacd49c15c64f64b5851fbadf906d31a726dbba..166e17fcf77c91be61087aca5f351646e305b529 100644 (file)
--- a/x11-libs/xview/xview-3.2-r3.ebuild
+++ b/x11-libs/xview/xview-3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r3.ebuild,v 1.4 2006/01/25 22:06:08 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r3.ebuild,v 1.5 2006/03/16 06:24:52 spyderous Exp $
 
 inherit eutils
 
@@ -25,7 +25,11 @@ SLOT="0"
 KEYWORDS="-alpha -amd64 ~ppc ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( ( x11-libs/libXpm
+                       x11-proto/xextproto
+               )
+               virtual/x11
+       )"
 
 src_unpack() {
        unpack $A

diff --git a/x11-libs/xview/xview-3.2-r5.ebuild b/x11-libs/xview/xview-3.2-r5.ebuild
index 48b5e84af7fb650d14bc671dbde0817c29e480f6..e80de7ebb3ad04575ec289508627d20c354ea521 100644 (file)
--- a/x11-libs/xview/xview-3.2-r5.ebuild
+++ b/x11-libs/xview/xview-3.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r5.ebuild,v 1.1 2006/02/19 04:37:06 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r5.ebuild,v 1.2 2006/03/16 06:24:52 spyderous Exp $
 
 inherit eutils
 
@@ -8,6 +8,7 @@ DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Worksta
 HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
 
 MY_PN="${P}p1.4-18c"
+GCC_PATCHVER="0.1"
 
 # This is our compound patch derived from debian. We use it because:
 #  * xview is a contribution made by Sun Microsystems (?) to the X community, but
@@ -17,8 +18,9 @@ MY_PN="${P}p1.4-18c"
 
 # We use the xview tarball available from the X organization, but xfree86 appears
 # to be up and available more often so we use that (it's their primary mirror).
-SRC_URI="http://physionet.caregroup.harvard.edu/physiotools/xview/${MY_PN}.tar.gz"
-                #mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz"
+SRC_URI="http://physionet.caregroup.harvard.edu/physiotools/xview/${MY_PN}.tar.gz
+               mirror://gentoo/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2"
+                #mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz
 S=${WORKDIR}/${MY_PN}
 LICENSE="sun-openlook"
 SLOT="0"
@@ -43,11 +45,16 @@ src_unpack() {
        cd "${S}"
        epatch "${FILESDIR}"/CAN-2005-0076.patch
        epatch "${FILESDIR}"/lseek.diff
+       epatch "${DISTDIR}"/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2
+
        # Do not build xgettext and msgfmt since they are provided by the gettext
        # package. Using the programs provided by xview breaks many packages
        # including vim, grep and binutils.
        sed -e 's/MSG_UTIL = xgettext msgfmt/#MSG_UTIL = xgettext msgfmt/' \
-               -i util/Imakefile || die
+               -i util/Imakefile || die "gettext sed failed"
+
+       # (#120910) Look for imake in the right place
+       sed -i -e 's:\/X11::' imake || die "imake sed failed"
 }
 
 src_compile() {

diff --git a/x11-libs/xview/xview-3.2.ebuild b/x11-libs/xview/xview-3.2.ebuild
index c8a5b4389f7c0abe2f795dd44ad9ed08ea61ccec..626edc0194e03c2445341a1c945d06cbb00c1cdf 100644 (file)
--- a/x11-libs/xview/xview-3.2.ebuild
+++ b/x11-libs/xview/xview-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2.ebuild,v 1.12 2006/01/25 22:06:08 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2.ebuild,v 1.13 2006/03/16 06:24:52 spyderous Exp $
 
 inherit eutils
 
@@ -25,7 +25,11 @@ SLOT="0"
 KEYWORDS="-alpha -amd64 ~ppc ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( ( x11-libs/libXpm
+                       x11-proto/xextproto
+               )
+               virtual/x11
+       )"
 
 src_unpack() {
        unpack $A