[gentoo-commits] proj/sci:master commit in: x11-libs/xview/files/, x11-libs/xview/

[Justin Lecher]

commit:     62d00614d5e2db29124d91b30c4545e906d807f7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 31 10:10:29 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jul 31 10:10:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=62d00614

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)

---
 x11-libs/xview/ChangeLog                      |    9 ++-
 x11-libs/xview/files/xview-3.2-impl-dec.patch |   30 +++++++
 x11-libs/xview/metadata.xml                   |   10 +-
 x11-libs/xview/xview-3.2-r7.ebuild            |  108 +++++++++++++++++++++++++
 4 files changed, 151 insertions(+), 6 deletions(-)

diff --git a/x11-libs/xview/ChangeLog b/x11-libs/xview/ChangeLog
index c281a43..59416a1 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@g.o> +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@g.o> metadata.xml:
   Fixed herd entry in metadata.xml
 

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 0000000..0296a9a
--- /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 59d99c3..04b998a 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@g.o</email>
-    <name>Justin Lecher</name>
-  </maintainer>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@g.o</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 0000000..6ca59a3
--- /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
+}