Version bump. Also removed some of the old ebuilds.

Package-Manager: portage-2.1.1_pre5-r3

4 files changed, 16 insertions, 234 deletions

diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index fed65f2be413..ea3851509706 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,7 +1,3 @@
-AUX vmd-1.8.3-config-gentoo.patch 2849 RMD160 6bfdf7aa6f19839578b9dd08833f5af9a934514a SHA1 bbb8f6045d0a2b7a4f70fdc86aee2fbff1a4cc7a SHA256 ee812af9c130d93b795c3f6967a1cc84a03fd56c16fcf9308636c3285a86ed73
-MD5 c2f7407b24ab8fee80f913a2b31e79f5 files/vmd-1.8.3-config-gentoo.patch 2849
-RMD160 6bfdf7aa6f19839578b9dd08833f5af9a934514a files/vmd-1.8.3-config-gentoo.patch 2849
-SHA256 ee812af9c130d93b795c3f6967a1cc84a03fd56c16fcf9308636c3285a86ed73 files/vmd-1.8.3-config-gentoo.patch 2849
 AUX vmd-1.8.4-config-gentoo.patch 4246 RMD160 61aa7bff404a775e5e6be01c42654eeb69a7711f SHA1 51e80f1887cb7a00b554359c809a960b22851b57 SHA256 0be5b5d67a5198929b4c3db8c0dfa3a7a69150f02b075d7bafe0255825bdcbb9
 MD5 6325ce1d0cbfe7731240deef3d69efa5 files/vmd-1.8.4-config-gentoo.patch 4246
 RMD160 61aa7bff404a775e5e6be01c42654eeb69a7711f files/vmd-1.8.4-config-gentoo.patch 4246
@@ -14,12 +10,12 @@ AUX vmd-1.8.4-plugin-autopsf.patch 723 RMD160 6ccb492685cdeedc762f16e6f8ba010e28
 MD5 94569757919baac0e2b61400d356cb74 files/vmd-1.8.4-plugin-autopsf.patch 723
 RMD160 6ccb492685cdeedc762f16e6f8ba010e2833908a files/vmd-1.8.4-plugin-autopsf.patch 723
 SHA256 7230d8f5f4281b7b8615cc7ff60fc3b77432b3ec12cc507f3016566178b07fae files/vmd-1.8.4-plugin-autopsf.patch 723
-DIST vmd-1.8.3.src.tar.gz 8590337 RMD160 4ad1b58721005ef85f580f437c032c28f6d786f1 SHA256 36fb014004a765e54bbcd6608ef8738c808355268fd05dce618bc498d1f29c3e
+AUX vmd-1.8.5-config-gentoo.patch 4301 RMD160 1863fcea2d82944934d55453420cf823a5f91193 SHA1 00f24221840f29ba0f5591e137d7b5a12790727c SHA256 97b017327d08281017bece0b3ab776e275a449dca3d0688d9bd8ea85ad17ad22
+MD5 32a1ca03385a385a9b9cdf800e29d246 files/vmd-1.8.5-config-gentoo.patch 4301
+RMD160 1863fcea2d82944934d55453420cf823a5f91193 files/vmd-1.8.5-config-gentoo.patch 4301
+SHA256 97b017327d08281017bece0b3ab776e275a449dca3d0688d9bd8ea85ad17ad22 files/vmd-1.8.5-config-gentoo.patch 4301
 DIST vmd-1.8.4.src.tar.gz 12042149 RMD160 f49a68ae63a607cd37a58d894df2f22d7df55b85 SHA1 0a19265074bf8c2fa688485018204f452c8daf92 SHA256 29b046767f1efe90d5f3e3dbbdcd4988d5335d1db226405f5ddb9f171c811cac
-EBUILD vmd-1.8.3.ebuild 3615 RMD160 2bbeaf3e7ebb73ce89aa4c8d56269790f9900071 SHA1 52d65b2e66a0e0c5aa5fa5dfe3a68ced725f350d SHA256 afb3dc12dfbaab4cd9bcf14e3908b26d824a1d19dd932bdb6c5d9e887e059924
-MD5 7b4f1380ec72e3ec6ab436d3c557e33b vmd-1.8.3.ebuild 3615
-RMD160 2bbeaf3e7ebb73ce89aa4c8d56269790f9900071 vmd-1.8.3.ebuild 3615
-SHA256 afb3dc12dfbaab4cd9bcf14e3908b26d824a1d19dd932bdb6c5d9e887e059924 vmd-1.8.3.ebuild 3615
+DIST vmd-1.8.5.src.tar.gz 17106456 RMD160 70087a42ae20180f2ed18cc4492764ed24b19aa4 SHA1 c3da36d75262b75423ddd2a07c17415b9859504a SHA256 208d7829e4fc2744e30c778e1485b96d35018b1e0dbc02388630ce4a2733c30b
 EBUILD vmd-1.8.4-r1.ebuild 4003 RMD160 64ef2882391b5b051e1fea41ee4fd6e9e7607d4c SHA1 77dcb634ec0bcd6b82a1cd9c22b4e4a6624c0aa0 SHA256 4914216543216e69c2bffc4dca6539ed83119cf14e353dbfa1922923163dd728
 MD5 36562b0ecc187afe09e61581d116f694 vmd-1.8.4-r1.ebuild 4003
 RMD160 64ef2882391b5b051e1fea41ee4fd6e9e7607d4c vmd-1.8.4-r1.ebuild 4003
@@ -28,20 +24,24 @@ EBUILD vmd-1.8.4.ebuild 3744 RMD160 feaaa172c06211db51b474f60cc8abfc97aef4ea SHA
 MD5 e494359bcb14b7fe3f295f118c7c5f7b vmd-1.8.4.ebuild 3744
 RMD160 feaaa172c06211db51b474f60cc8abfc97aef4ea vmd-1.8.4.ebuild 3744
 SHA256 bcf706a28add41d94d5ac2120d448c8210203f67fada754161f116955bc24d8b vmd-1.8.4.ebuild 3744
-MISC ChangeLog 1229 RMD160 fa7f1f1acc169a70f18f1faf87d5a6f7ed17646a SHA1 d2844ac4d7f7e45a2789173630d82ba181d2efda SHA256 182f9841c7a11736c557e2dfcd13eb0e8379af462909710cf3433833abba270e
-MD5 49d306f9953121ef0e397b9ac10a070e ChangeLog 1229
-RMD160 fa7f1f1acc169a70f18f1faf87d5a6f7ed17646a ChangeLog 1229
-SHA256 182f9841c7a11736c557e2dfcd13eb0e8379af462909710cf3433833abba270e ChangeLog 1229
+EBUILD vmd-1.8.5.ebuild 4001 RMD160 f6d97a32ecac13dc262b0fc93f06a28e326c9026 SHA1 b91b9b6acd450c9c10d2872177e14c00334b7ed4 SHA256 1cae389c64b6af4b38d808f5d632c2a02ffcfb377197fa9602170ff6802dd58e
+MD5 7702b188243c81b9bfd2b0a1cb4b4c15 vmd-1.8.5.ebuild 4001
+RMD160 f6d97a32ecac13dc262b0fc93f06a28e326c9026 vmd-1.8.5.ebuild 4001
+SHA256 1cae389c64b6af4b38d808f5d632c2a02ffcfb377197fa9602170ff6802dd58e vmd-1.8.5.ebuild 4001
+MISC ChangeLog 1483 RMD160 7619c72ba2c678dda439ae0ea2b65f745403a0b0 SHA1 285e5f4177daf075017c253b286796e59c85db94 SHA256 9ca3c5efc5edd038499ff5bd71639de18f1dee1c7d5b0ffcee5ca59240f48edc
+MD5 0e94211cdcdab4d6f76585d714fc380b ChangeLog 1483
+RMD160 7619c72ba2c678dda439ae0ea2b65f745403a0b0 ChangeLog 1483
+SHA256 9ca3c5efc5edd038499ff5bd71639de18f1dee1c7d5b0ffcee5ca59240f48edc ChangeLog 1483
 MISC metadata.xml 272 RMD160 42331a21c1e7a31cfe105f705fe3073de14b6b14 SHA1 960809f50e770bf2df44dda2557cf62ab9190c13 SHA256 36ae23839abbf283daf51b7f9585af067c0504484f5ca61e2f08113912becb77
 MD5 df166a2ae1cb64196abc394d4fa522ed metadata.xml 272
 RMD160 42331a21c1e7a31cfe105f705fe3073de14b6b14 metadata.xml 272
 SHA256 36ae23839abbf283daf51b7f9585af067c0504484f5ca61e2f08113912becb77 metadata.xml 272
-MD5 369e1a4fc4a190880b7bcd1847da843f files/digest-vmd-1.8.3 244
-RMD160 99396b8dda8d7fc4a45c128cde3773103be4c5a4 files/digest-vmd-1.8.3 244
-SHA256 afb2b7701f35aeaedd2191351e44ba399d7c2b449edfd8b3d9adac47fd266734 files/digest-vmd-1.8.3 244
 MD5 6938330c3067d798a3014e5b9808d45d files/digest-vmd-1.8.4 247
 RMD160 64861c785c0dc69121006bec5a4ee50b2680c15d files/digest-vmd-1.8.4 247
 SHA256 778a381e0c4131689eb531ef9eb3e2658318510fd68ee09d5f014c33159fd466 files/digest-vmd-1.8.4 247
 MD5 6938330c3067d798a3014e5b9808d45d files/digest-vmd-1.8.4-r1 247
 RMD160 64861c785c0dc69121006bec5a4ee50b2680c15d files/digest-vmd-1.8.4-r1 247
 SHA256 778a381e0c4131689eb531ef9eb3e2658318510fd68ee09d5f014c33159fd466 files/digest-vmd-1.8.4-r1 247
+MD5 147e30ebf64237e28be760bc5504caaf files/digest-vmd-1.8.5 247
+RMD160 6841d16295791a86c1e65c14593aec2bc3156cc4 files/digest-vmd-1.8.5 247
+SHA256 d4d4f88e2ab30537dc0995069a237ba823ac798e6d37a84ad7bbf7aecfd179d7 files/digest-vmd-1.8.5 247
diff --git a/sci-chemistry/vmd/files/digest-vmd-1.8.3 b/sci-chemistry/vmd/files/digest-vmd-1.8.3
deleted file mode 100644
index 3a9d77d8371e..000000000000
--- a/sci-chemistry/vmd/files/digest-vmd-1.8.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8fb3fa55a54bcc3e41dbbd53c1c2cc59 vmd-1.8.3.src.tar.gz 8590337
-RMD160 4ad1b58721005ef85f580f437c032c28f6d786f1 vmd-1.8.3.src.tar.gz 8590337
-SHA256 36fb014004a765e54bbcd6608ef8738c808355268fd05dce618bc498d1f29c3e vmd-1.8.3.src.tar.gz 8590337
diff --git a/sci-chemistry/vmd/files/vmd-1.8.3-config-gentoo.patch b/sci-chemistry/vmd/files/vmd-1.8.3-config-gentoo.patch
deleted file mode 100644
index 879e00f9b678..000000000000
--- a/sci-chemistry/vmd/files/vmd-1.8.3-config-gentoo.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur vmd-1.8.3/configure vmd-1.8.3-patched/configure
---- vmd-1.8.3/configure	2005-02-16 05:44:22.000000000 +0000
-+++ vmd-1.8.3-patched/configure	2005-12-18 20:49:49.000000000 +0000
-@@ -13,10 +13,10 @@
- $install_name = "vmd";
- 
- # Directory where VMD startup script is installed, should be in users' paths.
--$install_bin_dir="/usr/local/bin";
-+$install_bin_dir="gentoo-bindir";
- 
- # Directory where VMD files and executables are installed
--$install_library_dir="/usr/local/lib/$install_name";
-+$install_library_dir="gentoo-libdir/$install_name";
- 
- 
- # optionally override hard-coded defaults above with environment variables
-@@ -371,8 +371,8 @@
- 
- ################ Plugin options
- #
--$plugin_dir	= "../plugins";
--$molfile_dir = "$plugin_dir/$config_arch/molfile";
-+$plugin_dir	= "gentoo-plugindir";
-+$molfile_dir = "$plugin_dir/compile/lib_LINUX/molfile";
- $plugin_include = "-I$plugin_dir/include -I$molfile_dir";
- $plugin_library = "-L$molfile_dir";
- $plugin_libs    = "-lmolfile_plugin";
-@@ -472,8 +472,8 @@
- ################ FLTK GUI
- $fltk_defines     = "-DVMDGUI -DVMDFLTK";
- $fltk_dir         = "$vmd_library_dir/fltk";
--$fltk_include     = "-I$fltk_dir/include";
--$fltk_library     = "-L$fltk_dir/$config_arch";
-+$fltk_include     = "-Igentoo-fltk-include";
-+$fltk_library     = "-Lgentoo-fltk-libs";
- $fltk_libs        = "-lfltk -lX11";
- #@fltk_cc          = ('forms_ui.c');
- @fltk_ccpp        = ( 'ColorFltkMenu.C',
-@@ -805,9 +805,9 @@
- ###################
- $python_defines     = "-DVMDPYTHON";
- $python_dir         = "$vmd_library_dir/python";
--$python_include     = "-I$python_dir/lib_$config_arch/include/python2.2";
--$python_library     = "-L$python_dir/lib_$config_arch/lib/python2.2/config";
--$python_libs        = "-lpython2.2 -lpthread";
-+$python_include     = "-Igentoo-python-include";
-+$python_library     = "-Lgentoo-python-lib";
-+$python_libs        = "-lgentoo-python-link -lpthread";
- @python_h           = ('PythonTextInterp.h',
-                        'VMDTkinterMenu.h',
- 		       'py_commands.h',
-@@ -1335,8 +1335,8 @@
-     $opengl_libs        = "-lGL -lGLU"; 
-     # $opengl_libs      = "-L/usr/X11R6/lib -lGL -lGLU -lXext -lX11";
- 
--    $arch_cc          = "gcc";
--    $arch_ccpp        = "g++";
-+    $arch_cc          = "gentoo-gcc";
-+    $arch_ccpp        = "gentoo-g++";
-     # test hack to statically link libstd++
-     # $arch_ccpp        = "gcc";
-     $arch_depend_flag = "-MM";
-@@ -1345,8 +1345,8 @@
-     $arch_shcppopts   = "-fPIC";
-     $arch_shldopts    = "";
- 
--    $arch_opt_flag    = "-fno-for-scope -Wall -Wno-deprecated -O3 -march=i586 -fomit-frame-pointer";
--    $arch_copts       = "-Wall -Wno-deprecated -O3 -march=i586 -fomit-frame-pointer";
-+    $arch_opt_flag    = "gentoo-cflags";
-+    $arch_copts       = "gentoo-cflags";
- 
-     if ($config_static) {
-       $arch_lopts       = "-static";
diff --git a/sci-chemistry/vmd/vmd-1.8.3.ebuild b/sci-chemistry/vmd/vmd-1.8.3.ebuild
deleted file mode 100644
index efed936daa8e..000000000000
--- a/sci-chemistry/vmd/vmd-1.8.3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.8.3.ebuild,v 1.2 2006/03/21 08:37:58 spyderous Exp $
-
-inherit eutils toolchain-funcs python
-
-DESCRIPTION="Visual Molecular Dynamics"
-LICENSE="vmd"
-HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
-SRC_URI="${P}.src.tar.gz"
-
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="hardened"
-
-RESTRICT="fetch"
-
-DEPEND="app-shells/tcsh
-	|| ( x11-libs/libXft virtual/x11 )
-	virtual/opengl
-	x11-libs/fltk
-	=dev-lang/tcl-8.4*
-	=dev-lang/tk-8.4*
-	>=dev-lang/python-2.3
-	hardened? ( sys-apps/paxctl )"
-
-
-VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
-
-pkg_nofetch() {
-	echo
-	einfo "Please download ${SRC_URI} from"
-	einfo "${VMD_DOWNLOAD}"
-	einfo "after agreeing to the license and then move it to "
-	einfo "${DISTDIR}"
-	echo
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# apply LINUX-arch patches to gamess makesfiles
-	epatch "${FILESDIR}"/${P}-config-gentoo.patch
-
-
-	# prepare the plugins 
-
-	cd "${WORKDIR}"/plugins
-
-	sed -e "s/CC = gcc/CC = $(tc-getCC)/" \
-	    -e "s/CXX = g++/CXX = $(tc-getCXX)/" \
-		-e "s/COPTO = -o /COPTO = -fPIC -o /" \
-		-e "s/LOPTO = -o /LOPTO = -fPIC -o /" \
-		-e "s/CCFLAGS = -O2 -Wall/CCFLAGS = ${CFLAGS}/" \
-		-e "s/CXXFLAGS = -O2 -Wall/CXXFLAGS = ${CXXFLAGS}/" \
-	    -i Make-arch || die "Failed to set up plugins Makefile"
-
-	# prepare vmd itself
-
-	cd "${S}"
-
-	sed -e "s:gentoo-bindir:${D}/usr/bin:" \
-		-e "s:gentoo-libdir:${D}/usr/$(get_libdir):" \
-		-i configure || die "failed to adjust install paths"
-
-
-	sed -e "s:gentoo-gcc:$(tc-getCC):" \
-		-e "s:gentoo-g++:$(tc-getCXX):" \
-		-e "s:gentoo-cflags:${CFLAGS}:" \
-		-i configure || die "Failed to adjust C compiler/flags"
-
-
-	sed -e "s:gentoo-plugindir:${WORKDIR}/plugins:" \
-		-i configure || die "Failed to set up linking to plugin files"
-
-	sed -e "s:gentoo-fltk-include:/usr/include/fltk-1.1:" \
-		-e "s:gentoo-fltk-libs:/usr/$(get_libdir)/fltk-1.1:" \
-		-i configure || die "failed setting up fltk"
-
-
-	# get installed python version
-	python_version
-	local PY="python${PYVER}"
-
-	sed -e "s:gentoo-python-include:/usr/include/${PY}:" \
-		-e "s:gentoo-python-lib:/usr/$(get_libdir)/${PY}:" \
-		-e "s:gentoo-python-link:${PY}:" \
-		-i configure || die "failed setting up python"
-
-	sed -e "s:LINUXPPC:LINUX:g" \
-		-e "s:LINUXALPHA:LINUX:g" \
-		-e "s:LINUXAMD64:LINUX:g" \
-		-i ${S}/bin/vmd || die "failed setting up vmd wrapper script"
-
-	local myconfig="LINUX OPENGL FLTK TK TCL PTHREADS PYTHON"
-
-	rm -f configure.options && echo $myconfig >> configure.options
-
-	./configure &> /dev/null || die "failed to configure"
-
-}
-
-src_compile() {
-	# build plugins
-	cd "${WORKDIR}"/plugins
-	make LINUX || die "failed to build plugins"
-
-	# build vmd
-	cd "${S}"/src
-	make || die "failed to build vmd"
-}
-
-src_install() {
-	# install plugins
-	cd "${WORKDIR}"/plugins
-	PLUGINDIR=${D}/usr/$(get_libdir)/${PN}/plugins make distrib || \
-		die "failed to install plugins"
-
-	# install vmd 
-	cd "${S}"/src
-	make install || die "failed to install vmd"
-
-	# 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 "${D}"/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:${D}::" -i "${D}"/usr/bin/${PN} \
-		|| die "failed to set up vmd wrapper script"
-
-	# adjust paxctl settings on hardened systems
-	if use hardened; then
-		/sbin/paxctl -pemrxs ${D}/usr/$(get_libdir)/${PN}/${PN}_LINUX
-	fi
-}
-