Revision bump to fix building when /usr/X11R6 is missing, see bug #149712 and the long list of dupes.

Package-Manager: portage-2.1.3_rc6

4 files changed, 135 insertions, 6 deletions

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index d316da5c6419..55442362c75e 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,6 +1,10 @@
 # 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.23 2006/09/29 14:05:02 ribosome Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/ChangeLog,v 1.24 2007/07/01 19:10:05 flameeyes Exp $
+
+  01 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> +xview-3.2-r6.ebuild:
+  Revision bump to fix building when /usr/X11R6 is missing, see bug #149712
+  and the long list of dupes.
 
   29 Sep 2006; Olivier Fisette <ribosome@gentoo.org> xview-3.2-r5.ebuild:
   Added missing dependency on imake.
diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest
index b6d79060170e..d2580a9abda0 100644
--- a/x11-libs/xview/Manifest
+++ b/x11-libs/xview/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CAN-2005-0076.patch 984 RMD160 46d0ff56c23b414bf566c27720aedfbaf7b0d8a7 SHA1 e64c6efe18525d3519dbb5453cd4211ac0b7b9b4 SHA256 f94cc69cc3156bf5c80b3fe920f2b505e3daac0cf598def8b0b763abc2d06813
 MD5 ca8ca75012c0086e91666513ea0da88d files/CAN-2005-0076.patch 984
 RMD160 46d0ff56c23b414bf566c27720aedfbaf7b0d8a7 files/CAN-2005-0076.patch 984
@@ -12,10 +15,14 @@ EBUILD xview-3.2-r5.ebuild 3490 RMD160 fa393d9e864c02f7337fd32692ee601df1df8adc
 MD5 cc23740c6d83bae69494e6f1ba7d68f3 xview-3.2-r5.ebuild 3490
 RMD160 fa393d9e864c02f7337fd32692ee601df1df8adc xview-3.2-r5.ebuild 3490
 SHA256 70e54154172202dffef6c35ddfc4f296c42f967079755f542d22af6651270673 xview-3.2-r5.ebuild 3490
-MISC ChangeLog 3799 RMD160 148ed0c18cd41152eab361c3ccc40f301c6b73cc SHA1 02a038492321b42bc4106fd368316a052e7a286c SHA256 4ac2c3ce3914fa155b4fef1646c95eb0834550c71a61b760c8cf7b52bd450098
-MD5 cef9dccf915eccb1bf544e6a796fe0f2 ChangeLog 3799
-RMD160 148ed0c18cd41152eab361c3ccc40f301c6b73cc ChangeLog 3799
-SHA256 4ac2c3ce3914fa155b4fef1646c95eb0834550c71a61b760c8cf7b52bd450098 ChangeLog 3799
+EBUILD xview-3.2-r6.ebuild 3341 RMD160 e4d988a921a770688908b918afe1212c3c90ca02 SHA1 b454bb6da3fda5b1485240a4ce0008c6648fe445 SHA256 eacf8cb0a805319610e8801f15e07183d7068c9a76cad8fbb92c18c26410db5e
+MD5 83ece928970e15d202890cc9c46c1b96 xview-3.2-r6.ebuild 3341
+RMD160 e4d988a921a770688908b918afe1212c3c90ca02 xview-3.2-r6.ebuild 3341
+SHA256 eacf8cb0a805319610e8801f15e07183d7068c9a76cad8fbb92c18c26410db5e xview-3.2-r6.ebuild 3341
+MISC ChangeLog 3982 RMD160 c47d1f19bbd3632f7ea9642a3e6aeb30138f1f3c SHA1 d60d01d2fe8a1a64b36a1bc48edf425395a85edb SHA256 3b75ad13e6ddcc2bee4820289f51a81ecaa2b2be696c333b3202cc1bdd22e689
+MD5 78d98ca571bb5a203fa5a54737775afb ChangeLog 3982
+RMD160 c47d1f19bbd3632f7ea9642a3e6aeb30138f1f3c ChangeLog 3982
+SHA256 3b75ad13e6ddcc2bee4820289f51a81ecaa2b2be696c333b3202cc1bdd22e689 ChangeLog 3982
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -23,3 +30,13 @@ SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata
 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 9c646053d2007f2fd7be528a4c49be67 files/digest-xview-3.2-r6 527
+RMD160 1219835077bf272c41be67b6689dba37a125b7d3 files/digest-xview-3.2-r6 527
+SHA256 3f35ee18bc918feed4c035f67d45a0052f1fec6c203f589d8730541178fe5297 files/digest-xview-3.2-r6 527
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGh/w0AiZjviIA2XgRAsL/AKDAX3TUAaHUyLLEW12yzfHG2XgskQCgwe7r
+aR8zEpC6dd/kSbTllnRXmo4=
+=e32U
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/xview/files/digest-xview-3.2-r6 b/x11-libs/xview/files/digest-xview-3.2-r6
new file mode 100644
index 000000000000..f3a34206ae99
--- /dev/null
+++ b/x11-libs/xview/files/digest-xview-3.2-r6
@@ -0,0 +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-r6.ebuild b/x11-libs/xview/xview-3.2-r6.ebuild
new file mode 100644
index 000000000000..91ead6123b17
--- /dev/null
+++ b/x11-libs/xview/xview-3.2-r6.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xview/xview-3.2-r6.ebuild,v 1.3 2007/07/01 19:10:05 flameeyes Exp $
+
+inherit eutils
+
+MY_PN="${P}p1.4-18c"
+GCC_PATCHVER="0.1"
+
+DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
+HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
+LICENSE="sun-openlook"
+# 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://gentoo/${P}-gcc-4.1-v${GCC_PATCHVER}.patch.bz2"
+		# mirror://debian/pool/main/x/xview/${SRC_PATCH}.gz
+
+SLOT="0"
+IUSE=""
+KEYWORDS="-alpha -amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="x11-libs/libXpm
+	x11-proto/xextproto
+	media-fonts/font-bh-75dpi
+	media-fonts/font-sun-misc"
+
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# 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"
+	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 "gettext sed failed"
+
+	# (#120910) Look for imake in the right place
+	sed -i -e 's:\/X11::' imake || die "imake sed failed"
+
+	sed -i -e 's:/usr/X11R6:/usr:' "${S}"/config/XView.cf "${S}"/Build-LinuxXView.bash
+}
+
+src_compile() {
+	# Create the makefile
+	imake -DUseInstalled -I"${S}"/config -I/usr/$(get_libdir)/X11/config \
+		|| die "imake failed"
+
+	export OPENWINHOME="/usr"
+	export X11DIR="/usr"
+
+	# This is crazy and I know it, but wait till you read the code in
+	# Build-LinuxXView.bash.
+	bash Build-LinuxXView.bash libs \
+		|| die "building libs failed"
+	bash Build-LinuxXView.bash clients \
+		|| die "building clients failed"
+	bash Build-LinuxXView.bash contrib \
+		|| die "building contrib failed"
+	bash Build-LinuxXView.bash olvwm \
+		|| die "building olvwm failed"
+}
+
+src_install() {
+	export OPENWINHOME="/usr"
+	export X11DIR="/usr"
+	export DESTDIR="${D}"
+
+	bash Build-LinuxXView.bash instlibs \
+		|| die "installing libs failed"
+	bash Build-LinuxXView.bash instclients \
+		|| die "installing clients failed"
+	bash Build-LinuxXView.bash instcontrib \
+		|| die "installing contrib failed"
+	bash Build-LinuxXView.bash instolvwm \
+		|| die "installing olvwm failed"
+	cd "${D}"/usr
+
+	# 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
+	rm -rf "${D}"/usr/X11R6/share/doc/xview && rm -rf "${D}"/usr/X11R6/share/doc
+}