diff options
| author |   David Seifert <soap@gentoo.org> | 2017-10-15 21:59:29 -0700 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2017-10-30 00:20:28 +0100 |
| commit | 36b43ceb873e20cc36cf55b6a2e09c3d01306e49 (patch) | |
| tree | bfcb4d639412573b3fd231d51db552b3113b21c5 /sci-chemistry/molmol/molmol-2k_p2-r4.ebuild | |
| parent | media-plugins/gkrellmpc: x86 stable (bug #626252) (diff) | |
| download | gentoo-36b43ceb873e20cc36cf55b6a2e09c3d01306e49.tar.gz gentoo-36b43ceb873e20cc36cf55b6a2e09c3d01306e49.tar.bz2 gentoo-36b43ceb873e20cc36cf55b6a2e09c3d01306e49.zip | |
sci-chemistry/molmol: Move patches to dist tarball
Package-Manager: Portage-2.3.11, Repoman-2.3.3
Diffstat (limited to 'sci-chemistry/molmol/molmol-2k_p2-r4.ebuild')
| -rw-r--r-- | sci-chemistry/molmol/molmol-2k_p2-r4.ebuild | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild index d4034a9d63c5..26a294922182 100644 --- a/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild +++ b/sci-chemistry/molmol/molmol-2k_p2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,8 @@ DESCRIPTION="Publication-quality molecular visualization package" HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html" SRC_URI=" ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz - ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz" + ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz + https://dev.gentoo.org/~soap/distfiles/${PN}-patches.tbz2" LICENSE="molmol" SLOT="0" @@ -45,12 +46,12 @@ pkg_setup() { src_prepare() { rm -rf tiff* # Patch from http://pjf.net/science/molmol.html, where src.rpm is provided - epatch "${FILESDIR}"/pjf_RH9_molmol2k2.diff + epatch "${WORKDIR}"/patches/pjf_RH9_molmol2k2.diff - epatch "${FILESDIR}"/prefix.patch + epatch "${WORKDIR}"/patches/prefix.patch eprefixify molmol - epatch "${FILESDIR}"/ldflags.patch + epatch "${WORKDIR}"/patches/ldflags.patch ln -s makedef.lnx "${S}"/makedef || die @@ -63,12 +64,12 @@ src_prepare() { -e "s:^CC.*:CC = $(tc-getCC):" \ -i "${S}"/makedef || die - epatch "${FILESDIR}"/cast.patch - epatch "${FILESDIR}"/libpng15.patch + epatch "${WORKDIR}"/patches/cast.patch + epatch "${WORKDIR}"/patches/libpng15.patch # patch from fink # fixes numerous bad bracings and hopefully the OGL bug 429974 - epatch "${FILESDIR}"/${P}-fink.patch + epatch "${WORKDIR}"/patches/${P}-fink.patch tc-export AR } |