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.

(Portage version: 2.1_pre6-r3)

6 files changed, 41 insertions, 11 deletions

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index b93788e9b217..4e4017dcd369 100644
--- 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/files/digest-xview-3.2-r5 b/x11-libs/xview/files/digest-xview-3.2-r5
index d467cbbf21c7..f3a34206ae99 100644
--- 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 96f362b6aae1..c21ac536276e 100644
--- 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 aaacd49c15c6..166e17fcf77c 100644
--- 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 48b5e84af7fb..e80de7ebb3ad 100644
--- 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 c8a5b4389f7c..626edc0194e0 100644
--- 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