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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 41 insertions, 21 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/Manifest b/sci-chemistry/rasmol/Manifest
index 0727fea39940..47c86728547b 100644
--- a/sci-chemistry/rasmol/Manifest
+++ b/sci-chemistry/rasmol/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2.7.5-bundled-lib.patch 2106 RMD160 cf92b231c8987e36eed605f07da1686c72b5bd8a SHA1 d2f9df309d00d2d646d8d8fd03a66d612f4b7702 SHA256 b4049c48fa8a06e4d452dd87de08ec2ea1374b3fec48f3f47284d5c6925d613d
+AUX 2.7.5-bundled-lib.patch 2513 RMD160 ea8976ac0da2f77767cf78c10fc148033452a731 SHA1 0601835bbcaa22a1fed9f18f8c668daee84cd55b SHA256 86fc627ae39fbc6d85063436b1e05e19745fd4690e6df70fd6111f99c1b90505
 AUX ldflags.patch 423 RMD160 bb60fdfff87e4c511a3c8a4df983fff33c7dc1f5 SHA1 4ebfdb40b52606a52930a374d51d01ec3950dc3c SHA256 1530faa9739dc97d769f8c772de4510bc201b7cdb1e40ddea4e366c7a17b90ea
 AUX rasmol.sh.debian 966 RMD160 e3e750f854978c24e7b2357cf08d47f9d679b5e4 SHA1 2d9d1298b73af184a1f43636412ac335b9e2f775 SHA256 c3eb76b78d56501498b0fedb899eb69586ad98ceabdca14a4e49564bfbce7545
 DIST RasMol_2.7.2.1.1.tar.gz 4892830 RMD160 0030d3574dadfd9df97435d3456757dfe32d45b9 SHA1 6cb729f3866960af27fdc1675ace7bb286538b67 SHA256 aa1b5df8f47c073914d4e3f6db8d4b3b06cbb6ff8304f56c155cc4f95e29d527
 DIST RasMol_2.7.5.tar.gz 9766996 RMD160 100e40382986b002e21976b54f1af5240e43a919 SHA1 0e307d7a789d4cd201862c317b21d5d7e67730cf SHA256 aa7e7fd4b3c074e67697bd6adf7e86b9a4c60b605f5a319d6ecdd144b39f7fe9
 EBUILD rasmol-2.7.2.1.1-r1.ebuild 1573 RMD160 787ee2cdb1255c9127be2050fa771e4fe7eaa1b4 SHA1 6e53d1e74e734de7d1f232fabe046611b58576d0 SHA256 06c188883e12742de054a33a3daa2c78cbc9c762d14bccb5d10913b833d92e86
-EBUILD rasmol-2.7.5.ebuild 1722 RMD160 da45c22d828eb8b98889a7b682c2d5069dd3564b SHA1 e5b7b5fe1b1222c6a7b45f3d7962b5e198ab286a SHA256 18d4ef3cd50ed45b76c7c749be4701fbf86aa7c0374190d926ecbc787eea8723
-MISC ChangeLog 3905 RMD160 9d83942dc6fe9d4eb950afefe33d37365d6906e9 SHA1 01e962473bed3ca5f84914418c74e2e86f7973ae SHA256 69439564066a7369321bc628f02fd63d33c6dc15eb99d1c840bbe672b8151366
+EBUILD rasmol-2.7.5-r1.ebuild 1695 RMD160 af02cfb63ccb713ddb4c9893df956148b0cca217 SHA1 c921c7bf9267a06b6259e90e00c80fb91c492385 SHA256 2c5ce3cb2851ea81029a2badf8441436d719786918b2f84879fec15e04290816
+MISC ChangeLog 4159 RMD160 2279438be23e20a8ccbd2f78bb1b03d6ee932203 SHA1 e57632f4db73f0aeaa1d671f3882afecba988273 SHA256 dd59e2434f52d4730824c6bb84a96861791afc87e3c24ffd5c8ffa64882f5c13
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuTnPsACgkQgAnW8HDreRapYQCfaxLnRUw5hbMk2Dqm74Dw2rvU
-4n8AoIVYBwTaI07Ae9QrzTyqd481zdR4
-=L89+
+iEYEARECAAYFAkuzs/kACgkQgAnW8HDreRaOHgCgiwoeRp4lNYfPYa9k9VDYstDd
+vaEAmgMIlV0Qsw7xsHI2L4/rMzu71Ryw
+=MDVn
 -----END PGP SIGNATURE-----
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"
 }