x11-libs/xview: Use everything from debian; build only 32bit libs everywhere; be carefully this is very hacky approach

(Portage version: 2.2.0_alpha120/git/Linux x86_64, unsigned Manifest commit)

5 files changed, 155 insertions, 8 deletions

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index c281a436f..59416a1d6 100644
--- a/x11-libs/xview/ChangeLog
+++ b/x11-libs/xview/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for x11-libs/xview
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*xview-3.2-r7 (31 Jul 2012)
+
+  31 Jul 2012; Justin Lecher <jlec@gentoo.org> +xview-3.2-r7.ebuild,
+  +files/xview-3.2-impl-dec.patch, metadata.xml:
+  Use everything from debian; build only 32bit libs everywhere; be carefully
+  this is very hacky approach
+
   25 Jun 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Fixed herd entry in metadata.xml
 
diff --git a/x11-libs/xview/Manifest b/x11-libs/xview/Manifest
index 238314363..b024f62b2 100644
--- a/x11-libs/xview/Manifest
+++ b/x11-libs/xview/Manifest
@@ -1,2 +1,4 @@
-DIST xview-3.2-gcc-4.1-v0.1.patch.bz2 8018 RMD160 0387c073d7f4c8303467f3065ba2a573fdb6710e SHA1 f06eb2412e4d61dffaee7db436527d7933a50931 SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba
-DIST xview-3.2p1.4-19c.tar.gz 3350088 RMD160 6e0e90a737df7de8d30dbbd647527d599f13e8dd SHA1 1a2023945edef33ea4251fcb3b9e69bcf35a531c SHA256 ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83
+DIST xview-3.2-gcc-4.1-v0.1.patch.bz2 8018 SHA256 2b26f10122535eff43a4f87fc97ffb54eac88c312a3688b05bce806ce9a273ba SHA512 d4c80bccc2b8d57ff6906002b1b3e12f0cb480c7873ef118423d7bd566a6b655f422c61782893f796889052b1ab19f1328fcf670a1e0ef93e6b2e28aec2eb80b WHIRLPOOL f42e871a21c06bb213e9726edd88e58b9024320e95798b4acf32222dd3b0efd6b5183dcdfe64c3b257429fee1524d010e3f8e75f5428642d87fd81ef99244deb
+DIST xview-3.2p1.4-19c.tar.gz 3350088 SHA256 ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83 SHA512 d0e29de2d540d0cc8ec2739e61e0ccdf36cf97f4e87fcffe469733e1649ee837d3ed115b944f92843612752fdb823227df7ffd55ec62c093aea1b04d9f2f3af9 WHIRLPOOL 78b87f49c2605b418e4c6294a7323ed4a85f4fa741ab80f3013b934877bae07c969c1a7fde5b422f6a7eb88217bf7c48d43c01f2633e5886aa21925dd669ab3a
+DIST xview_3.2p1.4-28.debian.tar.gz 95902 SHA256 38458016e3cabb2264a0aa0f8fd0e8ddb00dda5659755eb6dc35d2af58243ec0 SHA512 80beaf7a3fad6aa8d410913ab218426b3bd2dda0b9ad3242989973cf3f2cdd9a43238f939f9a6d72ca8859dfa867365513b5ab5f226ba4c4a75a8a3579d90f28 WHIRLPOOL 31b065a9b22d116a5b3e648583d4b6237781ecace7d31d5d701fefe5f180f90f7e549fed3cbe7d72e8794ab5a3278eb5e15cdc01d1e0c9c0374f3eed0e52eae6
+DIST xview_3.2p1.4.orig.tar.gz 3227552 SHA256 fcc88f884a6cb05789ed800edea24d9c4cf1f60cb7d61f3ce7f10de677ef9e8d SHA512 5dd55529aee68d5ca7f2ff4e899b790b59cefb1bcd95706eef9b9e2c5545dc4ca6c866a55ed06ca91914ebde5d6ca4dcd038ce9e2ae97bfe240595b045a69315 WHIRLPOOL 4c1ef22107350659ec4b91beb48c52060f94a82e6ab30641b47afbd42d99d1f46e806b007b90c36fb3079869ba57ef9d41c59ffce0d648cb8ef2088608474a59
diff --git a/x11-libs/xview/files/xview-3.2-impl-dec.patch b/x11-libs/xview/files/xview-3.2-impl-dec.patch
new file mode 100644
index 000000000..0296a9aeb
--- /dev/null
+++ b/x11-libs/xview/files/xview-3.2-impl-dec.patch
@@ -0,0 +1,30 @@
+ lib/libxview/misc/hashfn.c |    1 +
+ lib/libxview/win/win_env.c |    3 +++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/lib/libxview/misc/hashfn.c b/lib/libxview/misc/hashfn.c
+index f127e2b..a7b27b9 100644
+--- a/lib/libxview/misc/hashfn.c
++++ b/lib/libxview/misc/hashfn.c
+@@ -17,6 +17,7 @@ static char     sccsid[] = "@(#)hashfn.c 20.12 93/06/28";
+ #define hashfn_c
+ 
+ #include <xview_private/hashfn.h>
++#include <stdlib.h>
+ 
+ /*
+  * hashfn_new_table(size, hash_fn, cmp_fn) -- create a new hash table object
+diff --git a/lib/libxview/win/win_env.c b/lib/libxview/win/win_env.c
+index d8e7fcc..72f1def 100644
+--- a/lib/libxview/win/win_env.c
++++ b/lib/libxview/win/win_env.c
+@@ -18,6 +18,9 @@ static char     sccsid[] = "@(#)win_env.c 20.16 93/06/28";
+ #include <xview/rect.h>
+ #include <xview/win_env.h>
+ #include <xview/win_struct.h>
++#include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
+ 
+ /*
+  * Public routines
diff --git a/x11-libs/xview/metadata.xml b/x11-libs/xview/metadata.xml
index 59d99c304..04b998aab 100644
--- a/x11-libs/xview/metadata.xml
+++ b/x11-libs/xview/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/xview/xview-3.2-r7.ebuild b/x11-libs/xview/xview-3.2-r7.ebuild
new file mode 100644
index 000000000..6ca59a3a7
--- /dev/null
+++ b/x11-libs/xview/xview-3.2-r7.ebuild
@@ -0,0 +1,108 @@
+## Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/x11-libs/xview/Attic/xview-3.2-r6.ebuild,v 1.6 2008/12/21 09:03:33 ssuominen dead $
+
+EAPI=4
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_PN="${P}p1.4"
+
+DESCRIPTION="The X Window-System-based Visual/Integrated Environment for Workstations"
+HOMEPAGE="http://physionet.caregroup.harvard.edu/physiotools/xview/"
+# We usr the debian tarball so that the debian patches apply
+SRC_URI="
+	mirror://debian/pool/main/x/xview/xview_3.2p1.4.orig.tar.gz
+	mirror://debian/pool/main/x/xview/xview_3.2p1.4-28.debian.tar.gz"
+
+LICENSE="XVIEW"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux -*"
+IUSE="static-libs"
+
+RDEPEND="
+	media-fonts/font-bh-75dpi
+	media-fonts/font-sun-misc
+	x11-libs/libXpm
+	x11-misc/xbitmaps
+	x11-proto/xextproto"
+
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	append-flags -m32
+	append-ldflags -m32
+
+	EPATCH_OPTS="-p1"
+
+	epatch \
+		"${FILESDIR}"/${P}-impl-dec.patch \
+		"${WORKDIR}"/debian/patches/{debian-changes-3.2p1.4-26,display_setting}
+
+	# 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:' config/XView.cf Build-LinuxXView.bash || die
+
+	# Nasty hacks to force CC and CFLAGS
+	sed \
+		-e "s:^\(IMAKEINCLUDE=.*\)\"$:\1 -DCcCmd=$(tc-getCC)\":" \
+		-e "s:usr/lib/X11/config:usr/$(get_libdir)/X11/config:" -i Build-LinuxXView.bash || die
+	sed -e "s:\(.*STD_DEFINES =.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.obj || die
+	sed -e "s:\(.*define LibXViewDefines .*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i config/XView.cf || die
+	sed -e "s:^\(MORECCFLAGS.*\)$:\1 -D_GNU_SOURCE ${CFLAGS}:" -i clients/olvwm-4.1/Imakefile
+	sed -e "s:\(-Wl,-soname\):${LDFLAGS} \1:g" -i config/XView.rules || die
+}
+
+src_compile() {
+	export OPENWINHOME="/usr"
+	export X11DIR="/usr"
+	export MANDIR="/usr/share/man"
+
+	# 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 MANDIR="/usr/share/man"
+	export DESTDIR="${ED}"
+
+	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 "${ED}"/usr
+
+	use static-libs || \
+		find "${ED}" -type f -name "*.a" -delete
+
+	cd "${S}"/doc
+	dodoc README xview-info olgx_api.txt olgx_api.ps sel_api.txt dnd_api.txt whats_new.ps
+	rm -rf "${ED}"/usr/X11R6/share/doc/xview "${ED}"/usr/X11R6/share/doc "${ED}"/usr/bin || die
+}