diff options
Diffstat (limited to 'sci-chemistry/rasmol')
| -rw-r--r-- | sci-chemistry/rasmol/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch | 4 | ||||
| -rw-r--r-- | sci-chemistry/rasmol/rasmol-2.7.5.ebuild | 11 |
3 files changed, 13 insertions, 8 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/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}" |