Update rasmol script to fall back to xdpyinfo if xwininfo isn't available. Depend on one of the two.

Package-Manager: portage-2.0.53

5 files changed, 91 insertions, 5 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index 249450d2121b..218e84f6ad09 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/rasmol
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.6 2005/12/15 15:12:50 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.7 2005/12/15 15:48:34 spyderous Exp $
+
+*rasmol-2.7.2.1.1-r1 (15 Dec 2005)
+
+  15 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  files/rasmol.sh.debian, +rasmol-2.7.2.1.1-r1.ebuild:
+  Update rasmol script to fall back to xdpyinfo if xwininfo isn't available.
+  Depend on one of the two.
 
   15 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
   rasmol-2.7.2.1.1.ebuild:
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
index 6fc47a7a8c49..3064f1557b68 100644
--- a/sci-chemistry/rasmol/Manifest
+++ b/sci-chemistry/rasmol/Manifest
@@ -1,5 +1,7 @@
-MD5 f0f96507fcfb5445d20237711d487101 ChangeLog 2522
+MD5 11205326d5cc46e2478f8d86510c1da3 ChangeLog 2774
 MD5 5bfaa68da594b02ca585dcfa3fd29426 files/digest-rasmol-2.7.2.1.1 69
-MD5 d141a35d345c54bb3694ed83ba91b40a files/rasmol.sh.debian 830
+MD5 5bfaa68da594b02ca585dcfa3fd29426 files/digest-rasmol-2.7.2.1.1-r1 69
+MD5 d8c294df4e1bf77e70d78f325604f316 files/rasmol.sh.debian 966
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 8395485449404c4d89f6ccb5143aa123 rasmol-2.7.2.1.1-r1.ebuild 1620
 MD5 941ae50b21f2abfc5070fa3f621da55a rasmol-2.7.2.1.1.ebuild 1570
diff --git a/sci-chemistry/rasmol/files/digest-rasmol-2.7.2.1.1-r1 b/sci-chemistry/rasmol/files/digest-rasmol-2.7.2.1.1-r1
new file mode 100644
index 000000000000..eb182a808893
--- /dev/null
+++ b/sci-chemistry/rasmol/files/digest-rasmol-2.7.2.1.1-r1
@@ -0,0 +1 @@
+MD5 6acb3e808c32333697d28675414abce2 RasMol_2.7.2.1.1.tar.gz 4892830
diff --git a/sci-chemistry/rasmol/files/rasmol.sh.debian b/sci-chemistry/rasmol/files/rasmol.sh.debian
index e86da961a295..e559e902267b 100644
--- a/sci-chemistry/rasmol/files/rasmol.sh.debian
+++ b/sci-chemistry/rasmol/files/rasmol.sh.debian
@@ -15,8 +15,10 @@ export RASMOLPATH
 
 RASMOL_VISUAL=8
 
-if [ -e /usr/bin/X11/xwininfo ]; then
+if [ -e /usr/bin/xwininfo ]; then
  RASMOL_VISUAL=`xwininfo -root | perl -ne 'chomp;print if s|\s+Depth:\s+||'` ;
+elif [ -e /usr/bin/xdpyinfo ]; then
+ RASMOL_VISUAL=` xdpyinfo | perl -ne 'chomp;print if s|\s+depth of root window:\s+(.*)\splanes|\1|'` ;
 fi
 
 if [ -e "/etc/rasmol/.rasmol.conf" ]; then
@@ -47,4 +49,4 @@ if [ $RASMOL_VISUAL == 24 ]; then
   RASMOL_VISUAL=32;
 fi
 
-$RASMOLPATH/rasmol.$RASMOL_VISUAL  $*
\ No newline at end of file
+$RASMOLPATH/rasmol.$RASMOL_VISUAL  $*
diff --git a/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild b/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
new file mode 100644
index 000000000000..9e0c81b9fe71
--- /dev/null
+++ b/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.2.1.1-r1.ebuild,v 1.1 2005/12/15 15:48:34 spyderous Exp $
+
+inherit toolchain-funcs
+
+MY_P="RasMol_${PV}"
+
+DESCRIPTION="Free program that displays molecular structure."
+HOMEPAGE="http://www.openrasmol.org/"
+SRC_URI="http://www.bernstein-plus-sons.com/software/${MY_P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+
+RDEPEND="|| ( ( x11-libs/libXext
+			x11-libs/libXi
+			|| ( x11-apps/xdpyinfo x11-apps/xwininfo )
+		)
+		virtual/x11
+	)"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/inputproto
+			x11-proto/xextproto
+			app-text/rman
+		)
+		virtual/x11
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Hack required for build
+	cd src
+	ln -s ../doc
+}
+
+src_compile() {
+	cd src
+	xmkmf || die "xmkmf failed"
+	make DEPTHDEF=-DEIGHTBIT CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		|| die "8-bit make failed"
+	mv rasmol rasmol.8
+	make clean
+	make DEPTHDEF=-DSIXTEENBIT CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		|| die "16-bit make failed"
+	mv rasmol rasmol.16
+	make clean
+	make DEPTHDEF=-DTHIRTYTWOBIT CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		|| die "32-bit make failed"
+	mv rasmol rasmol.32
+	make clean
+}
+
+src_install () {
+	newbin ${FILESDIR}/rasmol.sh.debian rasmol
+	insinto /usr/lib/${PN}
+	doins doc/rasmol.hlp
+	exeinto /usr/lib/${PN}
+	doexe src/rasmol.{8,16,32}
+	dodoc INSTALL PROJECTS README TODO doc/*.{ps,pdf}.gz doc/rasmol.txt.gz
+	doman doc/rasmol.1
+	insinto /usr/lib/${PN}/databases
+	doins data/*
+}