From 864f5853c1f73f49e181882a890a812ed89c62be Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Tue, 10 Feb 2015 02:23:31 +0000 Subject: [PATCH] Remove version with unsatisfiable dependencies Package-Manager: portage-2.2.15/cvs/Linux x86_64 --- sci-chemistry/vmd/ChangeLog | 7 +- sci-chemistry/vmd/Manifest | 25 +-- sci-chemistry/vmd/vmd-1.9.1-r1.ebuild | 232 -------------------------- 3 files changed, 6 insertions(+), 258 deletions(-) delete mode 100644 sci-chemistry/vmd/vmd-1.9.1-r1.ebuild diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog index e35da6bd4d43..65e0c55ad45d 100644 --- a/sci-chemistry/vmd/ChangeLog +++ b/sci-chemistry/vmd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-chemistry/vmd -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.59 2014/08/21 12:18:02 jlec Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.60 2015/02/10 02:23:22 patrick Exp $ + + 10 Feb 2015; Patrick Lauer -vmd-1.9.1-r1.ebuild: + Remove version with unsatisfiable dependencies *vmd-1.9.1-r3 (21 Aug 2014) diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest index c86b33d9f23a..889c425bc8ce 100644 --- a/sci-chemistry/vmd/Manifest +++ b/sci-chemistry/vmd/Manifest @@ -1,33 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX vmd-1.9.1-cuda-device_ptr.patch 934 SHA256 8d32ebe81adb4ec0186ceba08743c0b6a25c76b3c58edaefa85df38328aaa87e SHA512 274756fe17fdcc39ce471c3187f3076407d34b64e49b0006ee30525a952277b2b5c713fffa8786162dc542eef2b021f2bf7339736cf9e81b673d5146114829ed WHIRLPOOL 400959a0b52ce0026308bf2c251de9e0c87ee65c8c10844a7cd2f21b319623868316970247984a22b19dcd17a15e8cdf6959b60c5575a05f3709191a55eb4fb2 AUX vmd-1.9.1-tcl8.6.patch 1218 SHA256 41c1c3edf77f8ffcf8b7533625471d2dc384ca9a86ab9ba6be8d083718836b33 SHA512 ef729ddadbb865024abd6a532c328fe33e667faf0a6f9b09e3fcac852c2d88713b9efce772c42549fd62e9194634e3467d76700d0d317a1bd852be7baee8c125 WHIRLPOOL 9c122bb56fa66a1dffc6aa27d3e28bcf4848c3baf8a34a048fce3c2888a5ddfc6a92a5e8f9f1fa113b19c4b7d622d290be0e5cdafaae9d0a72402ef26143aa9f DIST vmd-1.9.1-gentoo-patches-2.tar.xz 79212 SHA256 1249957baea6fc8d4c05b008362b185b0851d70c6eeed8fbd44d41e7e77f23a8 SHA512 b313ed92652a93647790d668bd71233708fec3e9cead8b13b31dee1277f5ef6f0e8844f563ad51bc320b83a3cda126f8ab74fe4147218c65b594ee5624b46057 WHIRLPOOL 51b8a1486c286c002d893ec4e3aa8301ec7da6b9f2de31e880c7f9523a006a06712adecd5329269c892764761da691a36e1d6e5a730fc1a32c751b7658b96903 DIST vmd-1.9.1-gentoo-patches.tar.xz 79240 SHA256 60fe1b017b1aed5cdd4a417d4a2dbd20f75eae24c83d1da68c504a31bfbdbcd8 SHA512 37856d5e00d3d4452324865190aef4ac05a7a49cbddffe83f568d3190b521f17e6e1e5323dee3127aadfb446ec0871bfd06dff47d640ed862547710ec4b0a421 WHIRLPOOL b3eebffe24a96ad1c7ce9ebc565e1b88d6f52894569a6d72c22e87fb3d6975d14779bd8c4305e3e9f2ecf9d981503b8bcea78a476a1a66eb37b78c759b3bdf60 DIST vmd-1.9.1.src.tar.gz 30748110 SHA256 54aa88e03d86d763383e7b98592a152c9d68e78383e13af0dd2aca09b002491f SHA512 a54cb08e8a9ce801c2ca986f746bff0a041a25d5cffebc8d4af50813b6c05d04a3209a27830d580287230edaf3048a78923ae54bf367ab69c3d81388ab1787bd WHIRLPOOL 26d2a855c0768583cd45aed105fdd8f1ef59d59b8ce11c1903f5fc2008ea05989b8a32a0d817725e711613f8abfc22bb5301f20ea8d597efe9c7913790b25bb7 -EBUILD vmd-1.9.1-r1.ebuild 6833 SHA256 e48c5921f1904762723b10571afba42fffe4ecca6b61f261023d6df7a5c8f87f SHA512 dabb746625723b911b37c7e83b05e75fd82ced407831a4676a89d8ca2697305e06627e6707d254fd68c01c495e84e12af22e07ddb685fb715b7a4722cda2456d WHIRLPOOL c382fa4ba2db0d65c6fcc424f059d8cd2f8934d27a7f6d552db3fe12d2a408908f63286e38a441248e4c55ee5cc7444086879abaf45925a23fdcd44ddaa0f8b1 EBUILD vmd-1.9.1-r2.ebuild 6639 SHA256 6c1ab354435510fd2366cb82cd75d9f9b14d2c449d69d96931f3abf6a00b9ae4 SHA512 5a42a368681740aa78519ca1ed181510a907ce54860565dfa73749b8ac142612847d3a63ad3a450c41d0a551681344ad392c4cafaa5731de29b820deecfac973 WHIRLPOOL b007a651ad42a42d1e7603ab88e901e9a1546d695f55c1c7e9b0dda19f6343c2dcb85a44cbadb049a1c40f0b380e1002cb3de77a3c6911a18400a665b9c6ddd0 EBUILD vmd-1.9.1-r3.ebuild 6762 SHA256 3c1951c01251f50f0b399e62bdd72dd39fbd743411db7ca3b1dac642ae0034f3 SHA512 1e4d2605ae2d02f51c8ff8c4d15c67d4f7c3638316596cc69a3fe3340fb4e4a9c71f766328b9d28afb6eefcb07111147c1b71b2a2132caf22cda76fa2edf34fc WHIRLPOOL aa4fa2290ca82c1626ba28c4cbd8afc18fae8b19ff2060c97e644edfb25aa9391b1632d1b724a681c035fb2883b2baf093121e679cbda647572e29f39b65295b EBUILD vmd-1.9.1.ebuild 6488 SHA256 697574cd3122ead061f2a84b72421c3a17b1ad47cb284bb1cad7f01e87765fd6 SHA512 8a29afac2d5139778c2d26bd2e92d0c5a1ec5a6ccb5816e6b370ac14a1bf4c88ea982cb06b9684b6962498480f52e25cdf654b2849d4879b5c7c389a95349424 WHIRLPOOL 3b9bc58373a4eab84afac1d0ae455143145500e6b6ff4c21257c834ce92c8b880daab443ffb929c4df6a5cf3acf9d788129e373ea3db01f287e751475d7cd193 -MISC ChangeLog 10116 SHA256 dc1e4bdbaee853ed8fdd7831a506a1ff41203b6dd717d58ca134781c57c5ca08 SHA512 f885a27abd4d21d4e11a6f7b832c292ef9e94b24c545862b465218afac0696aba3e4b5909059cd17b69129d8ac2e358c4589f16788c36a9a98f2463b3c8ecc05 WHIRLPOOL 7b6425ec3c933ce239e6e6fddcaaee116912b86b1f1f3fd777f26509dd1d2a4a7ec7854583218f6c46299e086efbbe785c6c93d3dedec1123f056ec9424b3eb5 +MISC ChangeLog 10241 SHA256 cc150b1661cc51a6a299b01015a86f53dcb621449fff26bfc63b442f6f5c3e75 SHA512 685c018303355904b791e66a7fb7467d3e6122e8bf23c1038a3196a3aeced3631e0f804a9db24c763bb01c3311aa64340008eff5af59c65a9a0b970157f72615 WHIRLPOOL bbadeb852dc72d3f6cbf8e22ff26731846fdbee492929d33a713016b125778d2ddedc451ff40443327258feeba7546744d62ceb0927d7b050f1e3181e7f962d5 MISC metadata.xml 597 SHA256 d2521313b36b55be1e391d0efaeb3bdb469f612c0bf00913e2f0fe83fecca3d6 SHA512 84119dffe17d4e4b12019e51df2d9dd1fc42d26f86238387f67f08e774deec21f838fd1f28eba8c69faa88002be00af97dc4b1a67d90d81d6196b91699d7e7f5 WHIRLPOOL 9eae5538aa93b3496a6dd2bfa7b1fa1a1e6da89b9e4a02e3bd383373f7031b95aa85200d40eaedd4f5121f724f9cd1e52171052e42deb81b1c201d12ad8d2164 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCgBmBQJT9eN7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirbUQQAIX2dT5kqmTgUNQJ2YYHnMju -zDDl8PTdGXtYC5SQCf5GkATNxoFWkBTmDiMcW4X1wjpOAnEMFn3fSjnKrINTxyaI -QeR5GwU44lAAIFH0rsvsS92ZcnbzO3/RI2sI36JPRubePIoMz0/3l8adHNvQviIk -aJGbJ+ozHwRheGizmGxbESjjHWwmpmcsmgWpeq2N9lFUCClaPZdd9IC6aI37Lhmn -HcS1aG1l05gN2mNuix7qvcom77qsV7yXy0DzJOHLDbXqYoTbNYszVNx/fnDXxecF -+CqeVAVATJrpGDrS5yJXF5EOv8h82+KGOvUCy44wqnC/z4z4ZSLNOvPfDH0LSNTK -NE59vpb13Rz+oF/CHoXNX4wqO5kzedkcOsY4L+dFvkjDnTmA4u44n4GelsgnXfj3 -/6rbHeHYjRvAcw4V/bgHCcKMT4mCU+k3NBP6JtBg++0w5hvrLczavl55NAVKokhe -0bw4qd+Nn+oBTS4t0r0cvjkfL6Rt8EGrovTuBS2eFv+xcJFPd2BFRM8MgSl0ZUq/ -AlQcBCjErXQ5zE8dCAdxynqf6b7XbjLZKU/cxsEtt8zAe0ljhTbB8hMhhESBz4na -dYTYu22Qq707nY3kz9Sg8CgwGTH3MB5XvneXIgoiKE9Rg4stYLSJy33c2WeVrKj2 -FjyphdaR3okAUpvSTDzm -=bh3U ------END PGP SIGNATURE----- diff --git a/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild deleted file mode 100644 index 070de6ccd85e..000000000000 --- a/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.9.1-r1.ebuild,v 1.5 2013/03/01 08:23:03 jlec Exp $ - -EAPI=5 - -PYTHON_DEPEND="2" - -inherit eutils multilib prefix python toolchain-funcs - -DESCRIPTION="Visual Molecular Dynamics" -HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/" -SRC_URI=" - http://dev.gentoo.org/~jlec/distifles/${P}-gentoo-patches-2.tar.xz - ${P}.src.tar.gz" - -SLOT="0" -LICENSE="vmd" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="cuda msms povray tachyon xinerama" - -RESTRICT="fetch" - -# currently, tk-8.5* with USE=truetype breaks some -# tk apps such as Sequence Viewer or Timeline. -CDEPEND=" - =dev-lang/tk-8.5*[-truetype] - dev-lang/perl - dev-python/numpy - sci-libs/netcdf - virtual/opengl - >=x11-libs/fltk-1.1.10-r2:1 - x11-libs/libXft - x11-libs/libXi - cuda? ( - >=dev-util/nvidia-cuda-toolkit-3.1 - || ( - sys-devel/gcc:4.4 - sys-devel/gcc:4.5 ) - ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${CDEPEND} - dev-lang/swig" -RDEPEND="${CDEPEND} - sci-biology/stride - sci-chemistry/surf - x11-terms/xterm - msms? ( sci-chemistry/msms-bin ) - povray? ( media-gfx/povray ) - tachyon? ( media-gfx/tachyon )" - -VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD" -# Binary only plugin!! -QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so" -QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil" -QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil" - -pkg_nofetch() { - elog "Please download ${P}.src.tar.gz from" - elog "${VMD_DOWNLOAD}" - elog "after agreeing to the license and get" - elog "http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches-2.tar.xz" - elog "Place both in ${DISTDIR}" -} - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - cd "${WORKDIR}"/plugins - - epatch "${WORKDIR}"/${P}-gentoo-plugins.patch - - [[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile) - - sed \ - -e "s:CC = gcc:CC = $(tc-getCC):" \ - -e "s:CXX = g++:CXX = $(tc-getCXX):" \ - -e "s:COPTO =.*\":COPTO = -fPIC -o\":" \ - -e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o\":" \ - -e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \ - -e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \ - -e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \ - -e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \ - -e "s:-ltcl8.5:-ltcl:" \ - -i Make-arch || die "Failed to set up plugins Makefile" - - sed \ - -e '/^AR /s:=:?=:g' \ - -e '/^RANLIB /s:=:?=:g' \ - -i ../plugins/*/Makefile || die - - tc-export AR RANLIB - - sed \ - -e "s:\$(CXXFLAGS)::g" \ - -i hesstrans/Makefile || die - - # prepare vmd itself - cd "${S}" - - epatch "${WORKDIR}"/${P}-gentoo-base.patch - - # PREFIX - sed \ - -e "s:/usr/include/:${EPREFIX}/usr/include:g" \ - -i configure || die - - sed \ - -e "s:gentoo-bindir:${ED}/usr/bin:g" \ - -e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \ - -e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \ - -e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:gentoo-gcc:$(tc-getCC):g" \ - -e "s:gentoo-g++:$(tc-getCXX):g" \ - -e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \ - -e "s:gentoo-cflags:${CFLAGS}:g" \ - -e "s:gentoo-cxxflags:${CXXFLAGS}:g" \ - -e "s:gentoo-nvflags: -O3 -v:g" \ - -e "s:gentoo-ldflags:${LDFLAGS}:g" \ - -e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \ - -e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \ - -e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \ - -e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \ - -e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \ - -i configure || die - -# local NUMPY_INCLUDE="numpy/core/include" -# sed -e "s:gentoo-python-include:${EPREFIX}$(python_get_includedir):" \ -# -e "s:gentoo-python-lib:${EPREFIX}$(python_get_libdir):" \ -# -e "s:gentoo-python-link:$(PYTHON):" \ -# -e "s:gentoo-numpy-include:${EPREFIX}$(python_get_sitedir)/${NUMPY_INCLUDE}:" \ -# -i configure || die "failed setting up python" - - if use cuda; then - local gcc_bindir - if has_version sys-devel/gcc:4.5; then - gcc_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/4.5*)" - elif has_version sys-devel/gcc:4.4; then - gcc_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/4.4*)" - else - ewarn "Please install gcc with a version between 4.4* and 4.5*" - fi - - sed \ - -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \ - -e "/^\$arch_nvccflags/s:=:= \"--compiler-bindir=${gcc_bindir} \" . \n:1" \ - -i configure || die - fi - - sed \ - -e "s:LINUXPPC:LINUX:g" \ - -e "s:LINUXALPHA:LINUX:g" \ - -e "s:LINUXAMD64:LINUX:g" \ - -e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \ - -e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \ - -e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \ - -i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script" -} - -src_configure() { - local myconf="OPENGL FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT" - rm -f configure.options && echo $myconf >> configure.options - - use cuda && myconf+=" CUDA" -# use mpi && myconf+=" MPI" -# use tachion && myconf+=" LIBTACHYON" - use xinerama && myconf+=" XINERAMA" - - export \ - PYTHON_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" \ - PYTHON_LIBRARY_DIR="${EPREFIX}$(python_get_libdir)" \ - PYTHON_LIBRARY="$(python_get_library -l)" \ - NUMPY_INCLUDE_DIR="${EPREFIX}$(python_get_sitedir)/numpy/core/include" \ - NUMPY_LIBRARY_DIR="${EPREFIX}$(python_get_sitedir)/numpy/core/include" - - ./configure LINUX \ - ${myconf} || die -} - -src_compile() { - # build plugins - cd "${WORKDIR}"/plugins - - emake \ - TCLINC="-I${EPREFIX}/usr/include" \ - TCLLIB="-L${EPREFIX}/usr/$(get_libdir)" \ - NETCDFLIB="$(pkg-config --libs-only-L netcdf) ${EPREFIX}/usr/$(get_libdir)/libnetcdf.so" \ - NETCDFINC="$(pkg-config --cflags-only-I netcdf) ${EPREFIX}/usr/include" \ - NETCDFLDFLAGS="$(pkg-config --libs netcdf)" \ - LINUX - - # build vmd - cd "${S}"/src - emake -} - -src_install() { - # install plugins - cd "${WORKDIR}"/plugins - emake \ - PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \ - distrib - - # install vmd - cd "${S}"/src - emake install - - # install docs - cd "${S}" - dodoc Announcement README doc/ig.pdf doc/ug.pdf - - # remove some of the things we don't want and need in - # /usr/lib - cd "${ED}"/usr/$(get_libdir)/vmd - rm -fr doc README Announcement LICENSE || \ - die "failed to clean up /usr/lib/vmd directory" - - # adjust path in vmd wrapper - sed \ - -e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \ - -e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \ - || die "failed to set up vmd wrapper script" - - # install icon and generate desktop entry - insinto /usr/share/pixmaps - doins "${WORKDIR}"/vmd.png - eprefixify "${WORKDIR}"/vmd.desktop - domenu "${WORKDIR}"/vmd.desktop -} -- 2.26.2