Fixed bug #88001: xview no longer builds its own versions of msgfmt and xgettext.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 89 insertions, 5 deletions

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index 3e1b44c5af55..c84c259b8562 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xview
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.14 2005/06/28 09:27:11 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.15 2005/08/14 00:55:23 ribosome Exp $
+
+*xview-3.2-r4 (14 Aug 2005)
+
+  14 Aug 2005; Olivier Fisette <ribosome@gentoo.org> +xview-3.2-r4.ebuild:
+  Fixed bug #88001: xview no longer builds its own versions of msgfmt and
+  xgettext.
 
   28 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> xview-3.2.ebuild,
   xview-3.2-r1.ebuild, xview-3.2-r3.ebuild:
diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest
index a3161490e874..894bdde7fc81 100644
--- a/x11-libs/xview/Manifest
+++ b/x11-libs/xview/Manifest
@@ -1,9 +1,11 @@
+MD5 125133d3da99b1c0e8e5475c89c7195d xview-3.2-r4.ebuild 2924
+MD5 717d746279077406261efa08e15577e1 xview-3.2-r1.ebuild 2594
+MD5 83b8f35ffc37c3e4237b3bf53aa790c9 xview-3.2.ebuild 2278
 MD5 cab26baa11c349a78725d529cd26af59 xview-3.2-r3.ebuild 2667
+MD5 d6b3d03ec15bd384fb33b6af04e9c0c4 ChangeLog 2298
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 83b8f35ffc37c3e4237b3bf53aa790c9 xview-3.2.ebuild 2278
-MD5 717d746279077406261efa08e15577e1 xview-3.2-r1.ebuild 2594
-MD5 38f129acd128740e97e020727ee72733 ChangeLog 2105
 MD5 ca8ca75012c0086e91666513ea0da88d files/CAN-2005-0076.patch 984
-MD5 d7d90bd733aab393a20a5919e05c0b49 files/digest-xview-3.2-r3 70
 MD5 6de3c812dee458777db24502d252984f files/digest-xview-3.2 138
 MD5 48636f5ace70cc3f5033a87188e4e7bf files/digest-xview-3.2-r1 138
+MD5 d7d90bd733aab393a20a5919e05c0b49 files/digest-xview-3.2-r3 70
+MD5 d7d90bd733aab393a20a5919e05c0b49 files/digest-xview-3.2-r4 70
diff --git a/x11-libs/xview/files/digest-xview-3.2-r4 b/x11-libs/xview/files/digest-xview-3.2-r4
new file mode 100644
index 000000000000..d467cbbf21c7
--- /dev/null
+++ b/x11-libs/xview/files/digest-xview-3.2-r4
@@ -0,0 +1 @@
+MD5 a61e7ce82cac041a2c613041dc003de5 xview-3.2p1.4-18c.tar.gz 3377010
diff --git a/x11-libs/xview/xview-3.2-r4.ebuild b/x11-libs/xview/xview-3.2-r4.ebuild
new file mode 100644
index 000000000000..55102b120cb0
--- /dev/null
+++ b/x11-libs/xview/xview-3.2-r4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r4.ebuild,v 1.1 2005/08/14 00:55:23 ribosome Exp $
+
+inherit eutils
+
+DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
+HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
+
+MY_PN="${P}p1.4-18c"
+
+# 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
+#    fixes for it don't appear to be around other than in the other free distributions.
+#  * It does little harm, only some defaults are changed which we can redefine anyway
+#SRC_PATCH="${PN}_3.2p1.4-16woody2.diff"
+
+# 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"
+S=${WORKDIR}/${MY_PN}
+LICENSE="sun-openlook"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/x11"
+
+src_unpack() {
+	unpack $A
+	cd $S
+	epatch ${FILESDIR}/CAN-2005-0076.patch
+	# 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
+}
+
+src_compile() {
+	# Create the makefile
+	imake -DUseInstalled -I${S}/config -I/usr/X11R6/lib/X11/config \
+		|| die "imake failed"
+
+	# This is crazy and I know it, but wait till you read the code in 
+	# Build-LinuxXView.bash.
+	OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash libs \
+		|| die "building libs failed"
+	OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash clients \
+		|| die "building clients failed"
+	OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash contrib \
+		|| die "building contrib failed"
+	OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash olvwm \
+		|| die "building olvwm failed"
+}
+
+src_install() {
+	DESTDIR=${D} OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instlibs \
+		|| die "installing libs failed"
+	DESTDIR=${D} OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instclients \
+		|| die "installing clients failed"
+	DESTDIR=${D} OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instcontrib \
+		|| die "installing contrib failed"
+	DESTDIR=${D} OPENWINHOME=/usr/X11R6 bash Build-LinuxXView.bash instolvwm \
+		|| die "installing olvwm failed"
+	cd ${D}/usr
+	ln -s X11R6 openwin
+
+	# The rest of the docs is already installed 
+	cd ${S}/doc
+	dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt \
+		dnd_api.txt whats_new.ps bugform config/usenixws/paper.ps
+	rm -rf ${D}/usr/X11R6/share/doc/xview && rm -rf ${D}/usr/X11R6/share/doc
+}