Using python_get_library -l

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

diff --git a/sci-chemistry/viewmol/ChangeLog b/sci-chemistry/viewmol/ChangeLog
index bf2590d77984df9c61be64acb0ef668284eb49e7..582bfc512822a5ed7251f76a1c94d14af81a11b3 100644 (file)
--- a/sci-chemistry/viewmol/ChangeLog
+++ b/sci-chemistry/viewmol/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/viewmol
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/ChangeLog,v 1.11 2010/04/25 11:31:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/ChangeLog,v 1.12 2010/04/26 07:31:35 jlec Exp $
+
+  26 Apr 2010; Justin Lecher <jlec@gentoo.org> viewmol-2.4.1-r1.ebuild:
+  Using python_get_library -l
 
   11 Mar 2010; Justin Lecher <jlec@gentoo.org>
   -viewmol-2.4.1.ebuild:

diff --git a/sci-chemistry/viewmol/Manifest b/sci-chemistry/viewmol/Manifest
index 67f30e48a39aa9bf98ed322fffb6168f3941f358..c91756f4def4de4e527d599f73412108b48e0708 100644 (file)
--- a/sci-chemistry/viewmol/Manifest
+++ b/sci-chemistry/viewmol/Manifest
@@ -7,13 +7,13 @@ AUX 2.4.1-look-for-python-in-right-place.patch 866 RMD160 cc62c43ef5a9a84b389b3a
 AUX 2.4.1-remove-icc-check.patch 1214 RMD160 b6e1f7fe33b5d21f9fcffb5da63563b8f7236cdd SHA1 4748df9fe707ad8b200de2a705e0ddab814a3b6e SHA256 4c0f638a44ee74093103a8f3b9e94252b31c0eff875596aade43eb7c2faf06c7
 AUX 2.4.1-use-root-for-app-defaults.patch 827 RMD160 109cf436c73bb732f89c16f206892b2297a20ee7 SHA1 17ce44db692b61c635719f32bc90d8a36f95bb06 SHA256 c7e82343c254a38e61fee72e5e86ecd86339e56e783255a5d882bcff38937094
 DIST viewmol-2.4.1.src.tgz 2229379 RMD160 d63d1a6aa2ab9212874cf9bae82a238a440aba47 SHA1 8e6c55bd1381db076706e19df44fc8e7d3a6b9aa SHA256 dfed3eed6441d89c4bf2be1c13cbe263341c8880edf1742d446fc0f8f4a99e19
-EBUILD viewmol-2.4.1-r1.ebuild 2254 RMD160 3412d717af0f393765ff8a6d804f03b2aba3c1ef SHA1 1a6ce33f2e24068053bcc9500a0161fa5255f8d8 SHA256 d4c293e59d91091720b729d82a8639f71b146a52c3240efd884b46fbdaec217e
-MISC ChangeLog 1828 RMD160 b845cc2e1f1bbd585abe6bf115d9bfda79803a48 SHA1 fab18a7d064ceec2984009c5793a1a1a3ab825f8 SHA256 d6d1389478794402e6613b90c0a036ffe4ffbeafeae57c570de6095faac29667
+EBUILD viewmol-2.4.1-r1.ebuild 2259 RMD160 b1d0922ee5f834fc9e79012bb66a44fe695fba8c SHA1 53c79fe862d9dd822feeb4f03c41ba2a0344663b SHA256 1e6b12ee50f36a52224153568ada03178039e1067cf384f03222f6276a413608
+MISC ChangeLog 1931 RMD160 b7017311bdb62d3af9b4f55916a70819ac86412a SHA1 af378f85e3089c57c75be1d1635189a411012383 SHA256 526b3c73e2a624baefe831e1c40b2e123206f3313239d0e5b13cb4b32f60e1ad
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvUKBcACgkQgAnW8HDreRYIugCfZBaU9Fysq0tnmIk/orEhwGpf
-G7UAn29SO2KSL5eGS6BJXL+Q9iHP0//V
-=Iz7J
+iEYEARECAAYFAkvVQV0ACgkQgAnW8HDreRZdBgCgpmauyrTGiCp1vG3FZSmD4O3Y
+Be8AoIziga8pTgsQ74S4MREy6aGg2Pt8
+=x4MY
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild b/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild
index 78b534983ed06b54df6cb35af5667b525c721edd..e3545ba2fd58a58d61171fa2d3429fe48d5fbc11 100644 (file)
--- a/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild
+++ b/sci-chemistry/viewmol/viewmol-2.4.1-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/viewmol/viewmol-2.4.1-r1.ebuild,v 1.3 2010/04/25 11:00:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/viewmol/viewmol-2.4.1-r1.ebuild,v 1.4 2010/04/26 07:31:36 jlec Exp $
 
 EAPI="3"
 
@@ -64,7 +64,7 @@ src_prepare() {
        SCANDIR=
        INCLUDE=\$(TIFFINCLUDE) -I\$(PNGINCLUDE) -I\$(PYTHONINCLUDE)
        LIBRARY=\$(LIBTIFF) \$(LIBPNG) -L\$(LIBPYTHON)
-       LIBS=-L${EPREFIX}/$(get_libdir) -l\${PYTHONVERSION} -ltiff -lpng -lz -lGLU -lGL -L${EPREFIX}/usr/X11R6/lib -lXm -lXmu -lXp -lXi -lXext -lXt -lX11 -lpthread -lutil -ldl -lm
+       LIBS=-L${EPREFIX}/$(get_libdir) $(python_get_library -l) -ltiff -lpng -lz -lGLU -lGL -L${EPREFIX}/usr/X11R6/lib -lXm -lXmu -lXp -lXi -lXext -lXt -lX11 -lpthread -lutil -ldl -lm
        EOF
 
        cp .config.$(uname -s) makefile