Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 19 insertions, 250 deletions

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index 84cd14ad2c29..d44e0b369c88 100644
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/vmd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.62 2015/04/07 14:39:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.63 2015/04/08 09:33:09 jlec Exp $
+
+  08 Apr 2015; Justin Lecher <jlec@gentoo.org> -vmd-1.9.1-r3.ebuild:
+  Drop old
 
 *vmd-1.9.2 (06 Mar 2015)
 
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index 34d20db99433..fa6d5dd62d99 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -4,30 +4,27 @@ 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
 AUX vmd-1.9.2-format-security.patch 550 SHA256 4e3fa85105117ab4c259ae6e58fb38fee668fc3000b981369841f98740c0ba61 SHA512 81a71ee4c4c438d18f3a393ebad5c9a08f1a7bb95fa58b78a8798955a34ae2494f80fa074b973a1b595862080e9103d21e509443742cfe2bc3cf77f10c0e3c9d WHIRLPOOL 8a2b64514ba9876bdbc2c4afa9ae48b4742099c1cb39b3835f4e340e0b4330cf06f28f92320c15481d4d6ed27c8491dc899572c091a952fa17eb1b0356b01aed
-DIST vmd-1.9.1-gentoo-patches-2.tar.xz 79212 SHA256 1249957baea6fc8d4c05b008362b185b0851d70c6eeed8fbd44d41e7e77f23a8 SHA512 b313ed92652a93647790d668bd71233708fec3e9cead8b13b31dee1277f5ef6f0e8844f563ad51bc320b83a3cda126f8ab74fe4147218c65b594ee5624b46057 WHIRLPOOL 51b8a1486c286c002d893ec4e3aa8301ec7da6b9f2de31e880c7f9523a006a06712adecd5329269c892764761da691a36e1d6e5a730fc1a32c751b7658b96903
-DIST vmd-1.9.1.src.tar.gz 30748110 SHA256 54aa88e03d86d763383e7b98592a152c9d68e78383e13af0dd2aca09b002491f SHA512 a54cb08e8a9ce801c2ca986f746bff0a041a25d5cffebc8d4af50813b6c05d04a3209a27830d580287230edaf3048a78923ae54bf367ab69c3d81388ab1787bd WHIRLPOOL 26d2a855c0768583cd45aed105fdd8f1ef59d59b8ce11c1903f5fc2008ea05989b8a32a0d817725e711613f8abfc22bb5301f20ea8d597efe9c7913790b25bb7
 DIST vmd-1.9.2-gentoo-patches.tar.xz 14896 SHA256 91508b384cb0a8aab8d8cfc31c1e7e0bc4225dbd7cdb36fbaefcfe8baca9442c SHA512 0516b9e57b256ce822a64df420ebf3ab7391722757caeaa7e615526242043e9375fee8f4ee86fb4eb8de7a50d5cfc8f8d973ace5fa082e6f9010eb692cd6ee51 WHIRLPOOL 3f87d24ad0ca7eb60e0ae3d561da7c61e0caa9fe8bb71cd3a06731228926d4c16ee03699d80adf02e2c9b263f96ea8d5b096e64e3e94b0208b1cb618c8a8a7ca
 DIST vmd-1.9.2.src.tar.gz 34903084 SHA256 870ee1e483ad23eb7f3bb6ac816cb7be5df893879dddc0bda8423a011993ccdb SHA512 b232b743d4ea97dcf76e3005e1c8716d7138602edc078c4846026ab67759c8559af956182cb1acf3c85890db10b6f658ac9c269d432f2595612cf376d6d505ef WHIRLPOOL e2489b4bd8f28359ee959d6ebec3a9e775fbaf7a25baa1324c99dd04c7768e002924c671c11830ec6e9589ecc9de4864f2bcf3dfaf9eb36f5a1d03d5e5841f17
-EBUILD vmd-1.9.1-r3.ebuild 6762 SHA256 3c1951c01251f50f0b399e62bdd72dd39fbd743411db7ca3b1dac642ae0034f3 SHA512 1e4d2605ae2d02f51c8ff8c4d15c67d4f7c3638316596cc69a3fe3340fb4e4a9c71f766328b9d28afb6eefcb07111147c1b71b2a2132caf22cda76fa2edf34fc WHIRLPOOL aa4fa2290ca82c1626ba28c4cbd8afc18fae8b19ff2060c97e644edfb25aa9391b1632d1b724a681c035fb2883b2baf093121e679cbda647572e29f39b65295b
 EBUILD vmd-1.9.2.ebuild 7229 SHA256 b949c58eb6dbf7e19ce1a3ca114837c7b337009d8324508ec074c54700c2f70f SHA512 392d40e8a0fb26f2903762958668599b51e8200292fa6c57415bccfaedc138bd5dc58b3b07fb1d6823fbdc2266ba4e37b5b03f4671d99ca2f45bd99d03a6e2f7 WHIRLPOOL bc3d2df70a3db12ca2a001bd15f24d0ddbd949f6e2db197d0ad81cf578b059a90229f63cf21f63b31c1e36c7a7baebc058ea6e27d68da49ccce3e1fc46eac77c
-MISC ChangeLog 10480 SHA256 695aa2f6abeb0d7effe70b7271c034c9b0609d2e5bbbd679aaf46413a0ad61ef SHA512 b1b147a14a0ebcd9c581c43fa8eae3f9e563d8a35bdfae7d9dca5ea5669885e6257c3a397d62d68ce84bc4ff9bf3aeb8ce4fef9bba0aa77423c66b42dfc029b8 WHIRLPOOL fa6e4961a4e4102bce33a8bdff4a8c11b6daeaba93e9c27c9f7d80024b41aa50cf47bfefe9cae068d423b827ff5f85e854389b6ab2549c17b18f57df59364a53
+MISC ChangeLog 10561 SHA256 43dcbc4c773f1864d87465cc93d522278f76d612ec7db301263b7f6a2b6901d1 SHA512 39bd769e8ac9b833b98f60cb3315bd87efe537803e26ed8ccc2892dfbd95c21dc3f02c248642e7907aef71c325b27792bcef2a3240fcc0292f1ddfd3244e2e3c WHIRLPOOL a1f78f6771ec65e4d99c146404f173279797a043b8f117da81e8707817ab18a975c34d11358630781576834afa1b5e19aee39837c1f0e05228205b3532bd1ea8
 MISC metadata.xml 661 SHA256 67336d8710c6fac6860af86a69d7e31c5ae7cc5f384eb8484ce0f9a5bfca4889 SHA512 6c4ace927c71786b6f8f0ac46decfc2dc1dcd50bb87caa32bba32deabe8d2990b3f0ef2d9522f458d4812f260de8f3e55cf5e583718a243a79c733f6f33ea918 WHIRLPOOL cf16561f76efa5616965b81ddab08cfd0d5ef0c57b51c599bb46d785681eb019fd93ec1a92d0c79006615bc03949ccbd89f91032b775cf52b29df445dd6bad71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVI+w2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVJPXWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirgB0P/30MC8CyUfTppuravMc9h8bv
-8m5jwNcXAPQyyRxFn1sjjQnBtOM7ei0ytGi9yLzjND5mP2mKXE9C3PCeh9KYoCiM
-SmwQX1yG1L54Wqhwve+U1wXnsc6WoXlRAuzZ5PyKkovTFwEOYZOkdt2nMRAV1gnD
-S7oUWAQWYzh+JtctFceIvaOoad+EfP6mf/RtcadCcE2CX+zb4+7ZrwI+t6AcS8xg
-pz4kEXHfW1luP9RZTpMzH5xqTmc4ccCSlXYMy2hyJbxN6jKajRLjD50OEXmQ7hPD
-SxSjC480DKvcqliQqI5Sds+x0uxSw1yCtuS4QlsvwPgk7fXFyxsO/12WsT5vOdsn
-C+U/q9rvN/XSdj7A5gM5J0yab4vhVoJD6zOZOxDyA6TK7S+keG0S6JlPwmP8TY20
-UI/9nM0NqwMYXJXJNTNhR8HDroacv/wseRTzaCbxNNWKzcV5gvtn5ADucNKMjxyL
-F1b/uoj9Z2HZEmlWFHkCGlbIjSrwZfcoJj8mH3EPeKgin3R6fcJ4/A4ne20jppfh
-HZ6jO2C8enyvOA67AJW5k3Qh4srOEjUCR4HI7iD3oDNH2qGVy4T3fctcyWcdHhqA
-7Q00xLly9urqaBTKRq697MuJp4vDq1vEscAeVtsUIJwwMHuDTMYTZZEnLKe7crDJ
-8PKuNP4SwVhYsx0B9SSQ
-=QepP
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirTJIP/RO8fYeGDCEaJ7W+9TBljy+l
+l9tJkt8Lskk98fT2uRVlVFd2puYmJKXr25xrXQMcUFmqGGIPTrMwb8z+0vVUKdpR
+NWUZji7ptjWvAm2GoHY62zFyZnZKoexq8EaweZkqZ9MlMIbOG94bUZ6xZEv6hIJZ
+yPHA6NescVKxbK3Ov53wWhjUsqSLx3VQhssXEeg1yccm59nKYZcWSTGIADAqJai3
+0D/nq5a+bxl6rxDQv1bigwyZAjmVMT0F5DqdEvEOKV+MSSgPxS1AvSpWndFn3H0O
+Y83rC+24GdowzLSo/E5FvUFaBDLRkyrjxyFZiCRdxyz9L8UY1rDf2n8WqQeyTAyd
+m7hmZbfMQnN4x/cEjaVNQvlRbjEkOJ9rvHnsXUwJgGid2JfX9fZUcioO4h72dM9P
+jwvSXV/s1CclIxgdan+Tne0Rvv6bDeERtzU3oS/aEwWPUmBjSIK23fz+DUUj2xtC
+BB5HD0xX+/RcqNP2swIgm/h3tqqoKEZXFJGie3uF37eGgYHZoE+4B6RlHhkHjQBC
+RGI7J7x00xMLK3A8vdALcCD7NCkNU4xoEmb8QI/IGSzMIh9aPRQHxdgW5moJDAWk
+jMoRaMjRETzmgb7GsQ1P02vuDiByGmsJ0bcd4Q388JBkPxVv2QBeNwPZNSU7x+i3
+UfpugR+a1NqSNaEWTSZZ
+=AAjH
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/vmd/vmd-1.9.1-r3.ebuild b/sci-chemistry/vmd/vmd-1.9.1-r3.ebuild
deleted file mode 100644
index 936ca0f69bd5..000000000000
--- a/sci-chemistry/vmd/vmd-1.9.1-r3.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/08/21 12:18:02 jlec Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="2"
-
-inherit cuda 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*:0=[-truetype] >=dev-lang/tk-8.6.1 )
-	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-4.2.9-r1 )
-	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() {
-	use cuda && cuda_sanitize
-
-	epatch "${FILESDIR}"/${P}-cuda-device_ptr.patch
-
-	cd "${WORKDIR}"/plugins
-
-	epatch \
-		"${WORKDIR}"/${P}-gentoo-plugins.patch \
-		"${FILESDIR}"/${P}-tcl8.6.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::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
-		sed \
-			-e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
-			-e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \
-			-i configure src/Makefile || die
-		sed \
-			-e '/compute_/d' \
-			-i configure || die
-		sed \
-			-e 's:-gencode .*code=sm_..::' \
-			-i src/Makefile || 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
-	sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
-	domenu "${WORKDIR}"/vmd.desktop
-}