From e63c94069120d30371a421eab764a27ac89c57cc Mon Sep 17 00:00:00 2001 From: "Justin Lecher (jlec)" Date: Wed, 3 Jun 2009 14:04:58 +0200 Subject: ccp4-libs version cleanup --- sci-libs/ccp4-libs/ChangeLog | 4 + sci-libs/ccp4-libs/Manifest | 4 +- sci-libs/ccp4-libs/ccp4-libs-6.1.1-r2.ebuild | 195 ------------------------- sci-libs/ccp4-libs/ccp4-libs-6.1.1-r3.ebuild | 205 --------------------------- 4 files changed, 5 insertions(+), 403 deletions(-) delete mode 100644 sci-libs/ccp4-libs/ccp4-libs-6.1.1-r2.ebuild delete mode 100644 sci-libs/ccp4-libs/ccp4-libs-6.1.1-r3.ebuild (limited to 'sci-libs') diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog index cbab1593a..bf283fb9e 100644 --- a/sci-libs/ccp4-libs/ChangeLog +++ b/sci-libs/ccp4-libs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Jun 2009; Justin Lecher (jlec) + -ccp4-libs-6.1.1-r2.ebuild, -ccp4-libs-6.1.1-r3.ebuild: + cleaned up old versions + *ccp4-libs-6.1.1-r4 (03 Jun 2009) 03 Jun 2009; Justin Lecher (jlec) diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest index b441d2d76..31a354d1e 100644 --- a/sci-libs/ccp4-libs/Manifest +++ b/sci-libs/ccp4-libs/Manifest @@ -5,9 +5,7 @@ AUX pass-clipper-enablevals.patch 501 RMD160 23466922268a91570b0f64cf79809b988e3 DIST 6.1.1-090511-updates.patch.bz2 8915 RMD160 58114b0ba6d225078044a8a6f9245aab66c6b572 SHA1 15c327c0b218b542b0c3955a9e63d2c6de299f7e SHA256 c0dbbde05b72f2460ada22f556d4cfe1f286a448ceb1181fd48b758468e509ac DIST ccp4-6.1.1-core-src.tar.gz 246661086 RMD160 6722367727e4b6b1f8456f1458c9aac124923a89 SHA1 9141801e021f8a5107ed1e3989840e4de849b39c SHA256 56f971e05fe4543173451e48600813492fd0081b25d4a659cb0fed1fd2529407 DIST ccp4-6.1.1-src-patch-04_03_09.tar.gz 279642 RMD160 1a7c3b6cc846d315fc577e78b4aa00ab85a3d3d2 SHA1 29dbb84f3d63fc860694473ca99cf8bb71dae18a SHA256 eb806168235b55fbafdd72591ba94d35b78cc715a56a8b90979644d420ad672a -EBUILD ccp4-libs-6.1.1-r2.ebuild 5399 RMD160 8a755cfda81ea80d7da43456c8111a5462df492f SHA1 b424554967c59f6f716ac6ffa8013cfabef16edd SHA256 f46a9f6ef7d47b28c97f8d3ad00b3dc618db291ca88ccfd71c5cef9383cead5a -EBUILD ccp4-libs-6.1.1-r3.ebuild 5657 RMD160 2329b1d0d887c10e8802c251502c913d285c1dc3 SHA1 83e86921656e8153f25c9ebed074dffdc888fd49 SHA256 4c80100368aca56839101591cee5259d4defbed6251a7ec9c62395211233a2dc EBUILD ccp4-libs-6.1.1-r4.ebuild 5776 RMD160 3a36e4a2fff69e2a17028c39f8849a4cfd73c64e SHA1 7693f8aa4a3e6106876e68fcdf25fada3b2e61e5 SHA256 f541ab2ffa172978b11c91c11754be4c75bb63174e2c3a4a1990f7e8fa5ddd57 EBUILD ccp4-libs-6.1.1.ebuild 5211 RMD160 6f3705f7ab0c48bbda073eb7dc1a283b3dcaa39a SHA1 8b09909daae034fc393b49b5fda7e06a783bcd14 SHA256 e9b4a3183a8f753ced59968b261bb655c87d13ade8c9964c71f1f2948c42067e -MISC ChangeLog 1426 RMD160 d0bcf8ff9dd22ee4e575c3fbbeb5660bad75eb0a SHA1 0b24bed44194ce88a590ad67ff25d2cec2447525 SHA256 f17caa9906b6b7884e5ffde403f75b80498bfb6071a46b2ff2f46969c2a87404 +MISC ChangeLog 1568 RMD160 215c027e1aa713bfa2e423477011fbcc59b6e9ab SHA1 911f817e7bb9629a49141bd66318c91e72878d7c SHA256 d85ae3a087ff310404c2c63f24002f5ea881015a69c2b9608f4c794df21f11dd MISC metadata.xml 309 RMD160 b9d7f0a63f8fb51e9b4e2d6b4f4028541df5400c SHA1 26ee4b64e0e4d52b1afe00957d53b0cc2956da00 SHA256 04f156de856eae11c0cf8af213f74a9852213844cdd5133aa01dbe60371d57e7 diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.1-r2.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.1-r2.ebuild deleted file mode 100644 index fdac89102..000000000 --- a/sci-libs/ccp4-libs/ccp4-libs-6.1.1-r2.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit fortran eutils gnuconfig toolchain-funcs - -FORTRAN="g77 gfortran ifc" - -SRC="ftp://ftp.ccp4.ac.uk/ccp4" - -PATCH_TOT="0" -# Here's a little scriptlet to generate this list from the provided -# index.patches file -# -# i=1; while read -a line; do [[ ${line//#} != ${line} ]] && continue; -# echo "PATCH${i}=( ${line[1]}"; echo "${line[0]} )"; (( i++ )); done < -# index.patches -#PATCH1=( src/topp_ -#topp.f-r1.16.2.5-r1.16.2.6.diff ) -#PATCH2=( . -#configure-r1.372.2.18-r1.372.2.19.diff ) - -DESCRIPTION="Protein X-ray crystallography toolkit" -HOMEPAGE="http://www.ccp4.ac.uk/" -RESTRICT="mirror" -SRC_URI="${SRC}/${PV}/${P/-libs}-core-src.tar.gz" -for i in $(seq $PATCH_TOT); do - NAME="PATCH${i}[1]" - SRC_URI="${SRC_URI} - ${SRC}/${PV}/patches/${!NAME}" -done -LICENSE="ccp4" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -RDEPEND="virtual/lapack - virtual/blas - =sci-libs/fftw-2* - app-shells/tcsh - !& /dev/null - ccp_patch "${DISTDIR}/${p}" - popd >& /dev/null - done - einfo "Done." - echo - - einfo "Applying Gentoo patches ..." - # These two only needed when attempting to install outside build dir via - # --bindir and --libdir instead of straight copying after build - - # it attempts to install some libraries during the build - #ccp_patch "${FILESDIR}"/${P}-install-libs-at-install-time.patch - # hklview/ipdisp.exe/xdlmapman/ipmosflm can't find libxdl_view - # without this patch when --libdir is set - # Rotgen still needs more patching to find it - #ccp_patch "${FILESDIR}"/add-xdl-libdir.patch - - # it tries to create libdir, bindir etc on live system in configure - ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch - - # gerror_ gets defined twice on ppc if you're using gfortran/g95 - ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch - - einfo "Done." # done applying Gentoo patches - echo - - gnuconfig_update -} - -src_compile() { - # Build system is broken if we set LDFLAGS - unset LDFLAGS - - # GENTOO_OSNAME can be one of: - # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd - # linux_compaq_compilers linux_intel_compilers generic Darwin - # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers - if [[ "${FORTRANC}" = "ifc" ]]; then - if use ia64; then - GENTOO_OSNAME="ia64_linux_intel" - else - # Should be valid for x86, maybe amd64 - GENTOO_OSNAME="linux_intel_compilers" - fi - else - # Should be valid for x86 and amd64, at least - GENTOO_OSNAME="linux" - fi - - # Sets up env - ln -s \ - ccp4.setup-bash \ - "${S}"/include/ccp4.setup - - # We agree to the license by emerging this, set in LICENSE - sed -i \ - -e "s~^\(^agreed=\).*~\1yes~g" \ - "${S}"/configure - - # Fix up variables -- need to reset CCP4_MASTER at install-time - sed -i \ - -e "s~^\(setenv CCP4_MASTER.*\)/.*~\1"${WORKDIR}"~g" \ - -e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \ - "${S}"/include/ccp4.setup* - - # Set up variables for build - source "${S}"/include/ccp4.setup - - export CC=$(tc-getCC) - export CXX=$(tc-getCXX) - export COPTIM=${CFLAGS} - export CXXOPTIM=${CXXFLAGS} - # Default to -O2 if FFLAGS is unset - export FC=${FORTRANC} - export FOPTIM=${FFLAGS:- -O2} - - # Fix linking - export SHARE_LIB="ld -shared -soname libmmdb.so --whole-archive -o libmmdb.so libmmdb.a ../libccif.a; \ - ld -shared -soname libccp4c.so --whole-archive -o libccp4c.so libccp4c.a ../libccif.a; \ - ld -shared -soname libccp4f.so --whole-archive -o libccp4f.so libccp4f.a libmmdb.a libccp4c.a ../libccif.a -lstdc++ $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}')" - - # Can't use econf, configure rejects unknown options like --prefix - ./configure \ - --onlylibs \ - --with-shared-libs \ - --with-fftw=/usr \ - --with-warnings \ - --disable-cctbx \ - --disable-clipper \ - --tmpdir="${TMPDIR}" \ - ${GENTOO_OSNAME} || die "econf failed" - emake -j1 onlylib || die "emake failed" -} - -src_install() { - # Set up variables for build - source "${S}"/include/ccp4.setup - -# Only needed when using --bindir and --libdir - # Needed to avoid errors. Originally tried to make lib and bin - # in configure script, now patched out by dont-make-dirs-in-configure.patch -# dodir /usr/include /usr/$(get_libdir) /usr/bin - -# make install || die "install failed" - einstall || die "install failed" - - # Libs - for file in "${S}"/lib/*; do - if [[ -d ${file} ]]; then - continue - elif [[ -x ${file} ]]; then - dolib.so ${file} || die - else - insinto /usr/$(get_libdir) - doins ${file} || die - fi - done - - # Fix libdir in all *.la files - sed -i \ - -e "s:^\(libdir=\).*:\1\'/usr/$(get_libdir)\':g" \ - "${D}"/usr/$(get_libdir)/*.la - - # Data - insinto /usr/share/ccp4/data/ - doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} || die - dodoc "${S}"/lib/data/*.doc - newdoc "${S}"/lib/data/README DATA-README - - # Include files - insinto /usr/include - for i in ccp4 mmdb; do - doins -r "${S}"/include/${i} || die - done -} - -# Epatch wrapper for bulk patching -ccp_patch() { - EPATCH_SINGLE_MSG=" ${1##*/} ..." epatch ${1} -} diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.1-r3.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.1-r3.ebuild deleted file mode 100644 index 0a7461721..000000000 --- a/sci-libs/ccp4-libs/ccp4-libs-6.1.1-r3.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit fortran eutils gnuconfig toolchain-funcs - -FORTRAN="g77 gfortran ifc" - -SRC="ftp://ftp.ccp4.ac.uk/ccp4" - -UPDATE="04_03_09" -PATCHDATE="090511" - -MY_P="${P/-libs}" - -PATCH_TOT="0" -# Here's a little scriptlet to generate this list from the provided -# index.patches file -# -# i=1; while read -a line; do [[ ${line//#} != ${line} ]] && continue; -# echo "PATCH${i}=( ${line[1]}"; echo "${line[0]} )"; (( i++ )); done < -# index.patches -#PATCH1=( src/topp_ -#topp.f-r1.16.2.5-r1.16.2.6.diff ) -#PATCH2=( . -#configure-r1.372.2.18-r1.372.2.19.diff ) - -DESCRIPTION="Protein X-ray crystallography toolkit" -HOMEPAGE="http://www.ccp4.ac.uk/" -RESTRICT="mirror" -SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz - ${SRC}/${PV}/updates/${MY_P}-src-patch-${UPDATE}.tar.gz - http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2" - -for i in $(seq $PATCH_TOT); do - NAME="PATCH${i}[1]" - SRC_URI="${SRC_URI} - ${SRC}/${PV}/patches/${!NAME}" -done -LICENSE="ccp4" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" -RDEPEND="virtual/lapack - virtual/blas - =sci-libs/fftw-2* - app-shells/tcsh - !& /dev/null - ccp_patch "${DISTDIR}/${p}" - popd >& /dev/null - done - einfo "Done." - echo - - epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch - - einfo "Applying Gentoo patches ..." - # These two only needed when attempting to install outside build dir via - # --bindir and --libdir instead of straight copying after build - - # it attempts to install some libraries during the build - #ccp_patch "${FILESDIR}"/${P}-install-libs-at-install-time.patch - # hklview/ipdisp.exe/xdlmapman/ipmosflm can't find libxdl_view - # without this patch when --libdir is set - # Rotgen still needs more patching to find it - #ccp_patch "${FILESDIR}"/add-xdl-libdir.patch - - # it tries to create libdir, bindir etc on live system in configure - ccp_patch "${FILESDIR}"/${PV}-dont-make-dirs-in-configure.patch - - # gerror_ gets defined twice on ppc if you're using gfortran/g95 - ccp_patch "${FILESDIR}"/6.0.2-ppc-double-define-gerror.patch - - einfo "Done." # done applying Gentoo patches - echo - - gnuconfig_update -} - -src_compile() { - # Build system is broken if we set LDFLAGS - unset LDFLAGS - - # GENTOO_OSNAME can be one of: - # irix irix64 sunos sunos64 aix hpux osf1 linux freebsd - # linux_compaq_compilers linux_intel_compilers generic Darwin - # ia64_linux_intel Darwin_ibm_compilers linux_ibm_compilers - if [[ "${FORTRANC}" = "ifc" ]]; then - if use ia64; then - GENTOO_OSNAME="ia64_linux_intel" - else - # Should be valid for x86, maybe amd64 - GENTOO_OSNAME="linux_intel_compilers" - fi - else - # Should be valid for x86 and amd64, at least - GENTOO_OSNAME="linux" - fi - - # Sets up env - ln -s \ - ccp4.setup-bash \ - "${S}"/include/ccp4.setup - - # We agree to the license by emerging this, set in LICENSE - sed -i \ - -e "s~^\(^agreed=\).*~\1yes~g" \ - "${S}"/configure - - # Fix up variables -- need to reset CCP4_MASTER at install-time - sed -i \ - -e "s~^\(setenv CCP4_MASTER.*\)/.*~\1"${WORKDIR}"~g" \ - -e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \ - "${S}"/include/ccp4.setup* - - # Set up variables for build - source "${S}"/include/ccp4.setup - - export CC=$(tc-getCC) - export CXX=$(tc-getCXX) - export COPTIM=${CFLAGS} - export CXXOPTIM=${CXXFLAGS} - # Default to -O2 if FFLAGS is unset - export FC=${FORTRANC} - export FOPTIM=${FFLAGS:- -O2} - - # Fix linking - export SHARE_LIB="ld -shared -soname libmmdb.so --whole-archive -o libmmdb.so libmmdb.a ../libccif.a; \ - ld -shared -soname libccp4c.so --whole-archive -o libccp4c.so libccp4c.a ../libccif.a; \ - ld -shared -soname libccp4f.so --whole-archive -o libccp4f.so libccp4f.a libmmdb.a libccp4c.a ../libccif.a -lstdc++ $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}')" - - # Can't use econf, configure rejects unknown options like --prefix - ./configure \ - --onlylibs \ - --with-shared-libs \ - --with-fftw=/usr \ - --with-warnings \ - --disable-cctbx \ - --disable-clipper \ - --tmpdir="${TMPDIR}" \ - ${GENTOO_OSNAME} || die "econf failed" - emake -j1 onlylib || die "emake failed" -} - -src_install() { - # Set up variables for build - source "${S}"/include/ccp4.setup - -# Only needed when using --bindir and --libdir - # Needed to avoid errors. Originally tried to make lib and bin - # in configure script, now patched out by dont-make-dirs-in-configure.patch -# dodir /usr/include /usr/$(get_libdir) /usr/bin - -# make install || die "install failed" - einstall || die "install failed" - - # Libs - for file in "${S}"/lib/*; do - if [[ -d ${file} ]]; then - continue - elif [[ -x ${file} ]]; then - dolib.so ${file} || die - else - insinto /usr/$(get_libdir) - doins ${file} || die - fi - done - - # Fix libdir in all *.la files - sed -i \ - -e "s:^\(libdir=\).*:\1\'/usr/$(get_libdir)\':g" \ - "${D}"/usr/$(get_libdir)/*.la - - # Data - insinto /usr/share/ccp4/data/ - doins -r "${S}"/lib/data/{*.PARM,*.prt,*.lib,*.dic,*.idl,*.cif,*.resource,*.york,*.hist,fraglib,reference_structures} || die - dodoc "${S}"/lib/data/*.doc - newdoc "${S}"/lib/data/README DATA-README - - # Include files - insinto /usr/include - for i in ccp4 mmdb; do - doins -r "${S}"/include/${i} || die - done -} - -# Epatch wrapper for bulk patching -ccp_patch() { - EPATCH_SINGLE_MSG=" ${1##*/} ..." epatch ${1} -} -- cgit v1.2.3-65-gdbad