Prefix cleaning, keyworded for *-linux, tested by me

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

4 files changed, 19 insertions, 14 deletions

diff --git a/sci-chemistry/rasmol/ChangeLog b/sci-chemistry/rasmol/ChangeLog
index 98414c38f92e..5bfc80b5a4f7 100644
--- a/sci-chemistry/rasmol/ChangeLog
+++ b/sci-chemistry/rasmol/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2010/02/03 22:35:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/ChangeLog,v 1.15 2010/03/07 12:32:53 jlec Exp $
+
+  07 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  files/2.7.5-bundled-lib.patch, rasmol-2.7.5.ebuild:
+  Prefix cleaning, keyworded for *-linux, tested by me
 
 *rasmol-2.7.5 (03 Feb 2010)
 
diff --git a/sci-chemistry/rasmol/Manifest b/sci-chemistry/rasmol/Manifest
index 9b32dd94bfb5..0727fea39940 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 2038 RMD160 3f2f4aec8397087ce8c4bbfec4c293d09dfd41f6 SHA1 c517302d0fe1216985cf63316c7aec3528a23878 SHA256 707c8675880de57a2fd2019a5f8013e661be2c7c1c6346df86c380f08938dbf7
+AUX 2.7.5-bundled-lib.patch 2106 RMD160 cf92b231c8987e36eed605f07da1686c72b5bd8a SHA1 d2f9df309d00d2d646d8d8fd03a66d612f4b7702 SHA256 b4049c48fa8a06e4d452dd87de08ec2ea1374b3fec48f3f47284d5c6925d613d
 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 1692 RMD160 e80bbbe31ce93867171c2319495d7b8230ad2860 SHA1 4342ea6b4436c23ebc679bccfb2ed2f0afa0f7c7 SHA256 c8535e88118f2e0e8749ca5bbd18fc40a71d4bac794e081673f240c23d3981f4
-MISC ChangeLog 3741 RMD160 79ee38b56c629d1f238fc72e659e439a5942709f SHA1 7f99530a6ec903b2409b090e2fc44e452cd66b5c SHA256 c65a573bde9a5e876e9519069ed7829717e32a0bc63089330926484a3d4fb7f5
+EBUILD rasmol-2.7.5.ebuild 1722 RMD160 da45c22d828eb8b98889a7b682c2d5069dd3564b SHA1 e5b7b5fe1b1222c6a7b45f3d7962b5e198ab286a SHA256 18d4ef3cd50ed45b76c7c749be4701fbf86aa7c0374190d926ecbc787eea8723
+MISC ChangeLog 3905 RMD160 9d83942dc6fe9d4eb950afefe33d37365d6906e9 SHA1 01e962473bed3ca5f84914418c74e2e86f7973ae SHA256 69439564066a7369321bc628f02fd63d33c6dc15eb99d1c840bbe672b8151366
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktp+jkACgkQgAnW8HDreRamNQCcCLRAe+OC/AG8SG4NOPB4vHGg
-ioEAn0tMeGuIxIrMOlA0nDE4p9h0o9Ty
-=RMR1
+iEYEARECAAYFAkuTnPsACgkQgAnW8HDreRapYQCfaxLnRUw5hbMk2Dqm74Dw2rvU
+4n8AoIVYBwTaI07Ae9QrzTyqd481zdR4
+=L89+
 -----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 7d5ad5f49baf..139748b738e0 100644
--- a/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
+++ b/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch
@@ -8,7 +8,7 @@
 -          -I$(CQRLIB_INCLUDE_DIR) \
 -          -I$(CVECTOR_INCLUDE_DIR) \
 -          -I$(NEARTREE_INCLUDE_DIR)
-+          -D_USE_RASMOL_H_ $(GUIOPTION) -IEPREFIX/usr/include -IEPREFIX/usr/include/cbflib
++          -D_USE_RASMOL_H_ $(GUIOPTION) -I@GENTOO_PORTAGE_EPREFIX@/usr/include -I@GENTOO_PORTAGE_EPREFIX@/usr/include/cbflib
  #else
  DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \
 -	-D_USE_RASMOL_H_ $(GUIOPTION) -I$(CBFLIB_INCLUDE_DIR) \
@@ -16,7 +16,7 @@
 -	-I$(CVECTOR_INCLUDE_DIR) \
 -	-I$(NEARTREE_INCLUDE_DIR) \
 -  	-I$(XFORMSLIB_INCLUDE_DIR)
-+	-D_USE_RASMOL_H_ $(GUIOPTION) -IEPREFIX/usr/include -IEPREFIX/usr/include/cbflib
++	-D_USE_RASMOL_H_ $(GUIOPTION) -I@GENTOO_PORTAGE_EPREFIX@/usr/include -I@GENTOO_PORTAGE_EPREFIX@/usr/include/cbflib
  #endif
  
  
diff --git a/sci-chemistry/rasmol/rasmol-2.7.5.ebuild b/sci-chemistry/rasmol/rasmol-2.7.5.ebuild
index c3b43c3d0cd2..472851be81ad 100644
--- a/sci-chemistry/rasmol/rasmol-2.7.5.ebuild
+++ b/sci-chemistry/rasmol/rasmol-2.7.5.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2010/02/03 22:35:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/rasmol-2.7.5.ebuild,v 1.2 2010/03/07 12:32:53 jlec Exp $
 
 EAPI="3"
 
-inherit toolchain-funcs eutils
+inherit eutils toolchain-funcs prefix
 
 MY_P="RasMol_${PV}"
 VERS="23Jul09"
@@ -15,7 +15,7 @@ SRC_URI="http://www.rasmol.org/software/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 RASLIC )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
@@ -40,14 +40,15 @@ S="${WORKDIR}/${P}-${VERS}"
 src_prepare() {
 	cd src
 
-	use amd64 && \
+	if use amd64 || use amd64-linux; then
 		mv rasmol.h rasmol_amd64_save.h && \
 		echo "#define _LONGLONG"|cat - rasmol_amd64_save.h > rasmol.h
+	fi
 
 	mv Imakefile_base Imakefile
 	epatch "${FILESDIR}"/${PV}-bundled-lib.patch
 
-	sed "s:EPREFIX:${EPREFIX}:g" -i Imakefile || die
+	eprefixify Imakefile
 
 	xmkmf -DGTKWIN ${myconf}|| die "xmkmf failed with ${myconf}"