Removed unneeded patch for ldflags, removed unneeded linking against libforms, #312369

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 35 insertions, 15 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index 5bfc80b5a4f7..f5aafb828204 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-chemistry/rasmol
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.15 2010/03/07 12:32:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.16 2010/03/31 20:43:32 jlec Exp $
+
+*rasmol-2.7.5-r1 (31 Mar 2010)
+
+  31 Mar 2010; Justin Lecher <jlec@gentoo.org>
+  files/2.7.5-bundled-lib.patch, -rasmol-2.7.5.ebuild,
+  +rasmol-2.7.5-r1.ebuild:
+  Removed unneeded patch for ldflags, removed unneeded linking against
+  libforms, #312369
+
 
   07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
   files/2.7.5-bundled-lib.patch, rasmol-2.7.5.ebuild:
diff --git a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch b/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
index 139748b738e0..10705165ad47 100644
--- a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
+++ b/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
@@ -1,6 +1,17 @@
---- Imakefile	2009-07-20 16:08:43.000000000 +0200
-+++ Imakefile.new	2009-07-25 14:07:08.000000000 +0200
-@@ -276,17 +276,10 @@
+diff --git a/src/Imakefile b/src/Imakefile
+index 03be00e..a0c68f9 100755
+--- a/src/Imakefile
++++ b/src/Imakefile
+@@ -176,7 +176,7 @@ XFORMSLIB_DIR = /usr/local
+ #endif
+ endif
+ XFORMSLIB_INCLUDE_DIR = $(XFORMSLIB_DIR)/include
+-XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib -lforms
++XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib
+ #endif
+ #endif
+ #endif
+@@ -281,17 +281,10 @@ RASMOLDIR = $(USRLIBDIR)/rasmol/
  
  #ifndef USE_XFORMSLIB
  DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \
@@ -20,7 +31,7 @@
  #endif
  
  
-@@ -312,11 +305,11 @@
+@@ -317,11 +310,11 @@ OBJS = rasmol.o molecule.o abstree.o cmndline.o command.o transfor.o \
  # Additional RS6000 AIX MITSHM Library
  # LDLIBS = -lm -lXi -lXextSam $(XLIB)
  
@@ -29,15 +40,15 @@
 -			$(CQRLIB_LDLIB) \
 -			$(CVECTOR_LDLIB) \
 -			$(NEARTREE_LDLIB) $(XFORMSLIB_LDLIB)
-+LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) -lforms $(GTKLIBS) \
++LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(GTKLIBS) \
 +			-lcbf \
 +			-lCQRlib \
 +			-lCVector \
-+			-lCNearTree -lforms -lgfortran
++			-lCNearTree -lgfortran
  
  
  #
-@@ -420,11 +413,11 @@
+@@ -425,11 +418,11 @@ $(NEARTREE_DIR):
  $(NEARTREE_DIR)/CNearTree.c: $(NEARTREE_DIR)
  #endif		  
  
@@ -54,9 +65,11 @@
  
  
  gtkwin.c: gtkui.h
---- Makefile.in	2009-07-14 18:39:18.000000000 +0200
-+++ Makefile.in.new	2009-07-25 14:08:11.000000000 +0200
-@@ -165,7 +165,7 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index fc6d0af..bad90fc 100755
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -165,7 +165,7 @@ $(CBFLIBDIR)/lib/libcbf.a: $(CBFLIBDIR)
  
  all:		postdownload rasmol rastxt
  
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild
index 472851be81ad..8f12b9d12608 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.ebuild,v 1.2 2010/03/07 12:32:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5-r1.ebuild,v 1.1 2010/03/31 20:43:32 jlec Exp $
 
 EAPI="3"
 
@@ -24,7 +24,6 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXi
 	x11-libs/vte
-	>=x11-libs/xforms-1.0.91
 	dev-libs/cvector
 	sci-libs/cbflib
 	sci-libs/cqrlib
@@ -51,8 +50,6 @@ src_prepare() {
 	eprefixify Imakefile
 
 	xmkmf -DGTKWIN ${myconf}|| die "xmkmf failed with ${myconf}"
-
-	epatch "${FILESDIR}"/ldflags.patch
 }
 
 src_compile() {
@@ -62,6 +59,7 @@ src_compile() {
 		DEPTHDEF=-DTHIRTYTWOBIT \
 		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
 		|| die "make failed"
 }