From d950fa39dbe16d164ed0cb8e3036fd5d0d896a4c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Oct 2017 15:47:53 +0000 Subject: gentoo resync : 31.10.2017 --- sci-chemistry/molmol/molmol-2k_p2-r5.ebuild | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'sci-chemistry/molmol/molmol-2k_p2-r5.ebuild') diff --git a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild index 16e8b8553600..d788caa2005a 100644 --- a/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild +++ b/sci-chemistry/molmol/molmol-2k_p2-r5.ebuild @@ -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,10 +46,10 @@ 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}"/ldflags.patch - epatch "${FILESDIR}"/opengl.patch + epatch "${WORKDIR}"/patches/ldflags.patch + epatch "${WORKDIR}"/patches/opengl.patch ln -s makedef.lnx "${S}"/makedef || die @@ -61,14 +62,14 @@ 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 - epatch "${FILESDIR}"/wild.patch + epatch "${WORKDIR}"/patches/wild.patch tc-export AR } -- cgit v1.2.3