6 files changed, 21 insertions, 186 deletions
diff --git a/sci-visualization/v_sim/ChangeLog b/sci-visualization/v_sim/ChangeLog
index 4559b702f..1a2d7c078 100644
--- a/sci-visualization/v_sim/ChangeLog
+++ b/sci-visualization/v_sim/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-visualization/v_sim
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> -v_sim-3.5.1.ebuild,
+  -v_sim-3.5.2.ebuild, v_sim-3.6.0.ebuild, metadata.xml:
+  Drop old; add missing multilib.eclass
+
   08 Jun 2011; Dongxu Li <dongxuli2011@gmail.com> +v_sim-3.6.0.ebuild:
   Version bump to 3.6.0, added USE flags: cube xsf. Added dependency of 
   sci-libs/etsf_io for USE=abinit, still need to fix sci-physics/abinit for proper abinit plugin support
diff --git a/sci-visualization/v_sim/Manifest b/sci-visualization/v_sim/Manifest
index cf5fd3e3e..cdc3233a9 100644
--- a/sci-visualization/v_sim/Manifest
+++ b/sci-visualization/v_sim/Manifest
@@ -1,3 +1 @@
-DIST v_sim-3.5.1.tar.bz2 2820832 RMD160 f97fa21f2fea92c759c7a595d1d55f4ea3831bee SHA1 b47b6e7611b891bc09799ca67167ce28040afc47 SHA256 8453adffdac1022cfe8e1aeee6117d5bb6a1e9e28f446c7ad6c0cdcc3e1884cd
-DIST v_sim-3.5.2.tar.bz2 2802637 RMD160 2f109591a0b6b424beb4391e4f3baaf54e56796d SHA1 d51aad9aa08f3ace4dc1a438ee4e45e90b767129 SHA256 22beab0f9f5e38d60cb13a8afa5f760ec7fd56cb9850c7b7d38a546448d62b15
-DIST v_sim-3.6.0.tar.bz2 2953739 RMD160 09f57f5bb752934a3500b5d377b1694a35aefa0b SHA1 f502f3bff7b1c5d475950a126aaa7dbd222ffc55 SHA256 bd922961839367da935fc8b2ad5c9085c59dfb957e251ead36a06338a9045ad6
+DIST v_sim-3.6.0.tar.bz2 2957840 SHA256 f5c600f990e64ff8466075a582a271a81c6aa1495d11b02a0a90aa48b76318f9 SHA512 9cea1aa2e1be0573c71685b0d2cce457ba6a4ec57ce1e13bf734b2089a21a0ec365daa0b45a8f288abe615f7f8b890167d91120fe64d35873d6a1a8f50905ed9 WHIRLPOOL d8e1f1454df346ddb1fde6f21a50c74a93bee28315af2175b927886e68c9b45903b27367352f72615bbbf583c0906050a9be850a86b53cf4c2bd3fd2ceafd9c8
diff --git a/sci-visualization/v_sim/metadata.xml b/sci-visualization/v_sim/metadata.xml
index 03c243c70..7064fe116 100644
--- a/sci-visualization/v_sim/metadata.xml
+++ b/sci-visualization/v_sim/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
-<maintainer>
-  <email>dongxuli2011@gmail.com</email>
-</maintainer>
-<use>
-	<flag name='abinit'>Add support for ABINIT file formats <pkg>sci-physics/abinit</pkg></flag>
-	<flag name='cube'>Add support plug-in support for Cube files (densities and structures)</flag>
-	<flag name='openbabel'>Add support for ABINIT file formats <pkg>sci-chemistry/openbabel</pkg></flag>
-	<flag name='xsf'>plug-in support for files that follow the XCrysDen format for structural positions and densities</flag>
-</use>
+  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>dongxuli2011@gmail.com</email>
+  </maintainer>
+  <use>
+    <flag name="abinit">Add support for ABINIT file formats <pkg>sci-physics/abinit</pkg></flag>
+    <flag name="cube">Add support plug-in support for Cube files (densities and structures)</flag>
+    <flag name="openbabel">Add support for ABINIT file formats <pkg>sci-chemistry/openbabel</pkg></flag>
+    <flag name="xsf">plug-in support for files that follow the XCrysDen format for structural positions and densities</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-visualization/v_sim/v_sim-3.5.1.ebuild b/sci-visualization/v_sim/v_sim-3.5.1.ebuild
deleted file mode 100644
index ee8253a54..000000000
--- a/sci-visualization/v_sim/v_sim-3.5.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Displays atomic structures such as crystals, gain boudaries, molecules"
-HOMEPAGE="http://www-drfmc.cea.fr/sp2m/L_Sim/V_Sim/index.en.html"
-SRC_URI="http://www-drfmc.cea.fr/sp2m/L_Sim/V_Sim/download/${P}.tar.bz2"
-
-LICENSE="CeCILL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~alpha"
-
-# doc:   Adds developer documentation (/usr/share/doc/${PF}/APIreference/)
-#        Example files are copied even when USE='-doc'
-# debug: Adds console debug messages. This is really verbose.
-IUSE="debug doc"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	dev-libs/glib:2
-	x11-libs/pango
-	media-libs/libpng
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	doc?  ( >=dev-util/gtk-doc-1.4-r1 )"
-
-src_prepare() {
-	# The author follows Debian conventions, hence the example files and docs
-	# end up in /usr/share/doc/${PN} instead of /usr/share/doc/${PF}. We
-	# correct this here.
-	sed -i -e "s@/doc/.\${package}.@/doc/${PF}@g" -e "s@/doc/\$PACKAGE@/doc/${PF}@g" configure \
-		|| die "sed failed on tweaking configure file"
-	# TODO: test if this can be done via --docdir
-
-	# The /share/ directories are #define in the code and must be adapted.
-	sed -i -e "s:/usr/local/:/usr/:g" src/visu_basic.c || die "sed failed on updating directories in visu_basic.c"
-}
-
-src_configure() {
-	if use doc ; then
-		gtkdocize
-	fi
-
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable debug debug-messages)
-}
-
-src_compile() {
-	HOME="${S}" emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	einfo "Example files are in /usr/share/doc/${PF}/examples"
-	einfo "(even with USE='-doc')"
-	einfo ""
-	einfo "The global v_sim config files are in /usr/share/${PN}/"
-	einfo "There are a few options which can only be configured in these files"
-	einfo "and not through the UI. For example, one can specify different"
-	einfo "colors for the box and the axes in the files, but in the UI one can"
-	einfo "only change them together."
-	einfo ""
-	einfo "V_sim uses by default its own weird gtk skin. You can edit the"
-	einfo "skin settings in /usr/share/${PN}/v_sim.rc"
-	einfo "You can change the skin file used in the config file v_sim.par:"
-	einfo "Go to the line 'config_skin[gtk]: V_Sim'. The argument may be:"
-	einfo "'V_Sim', 'none' or the path to your own rc file. The keyword "
-	einfo "'V_Sim' stands for the default rc file, /usr/share/v_sim/v_sim.rc"
-	einfo "If you choose 'none' or if you comment the line, your current"
-	einfo "gtk skin will be used."
-}
diff --git a/sci-visualization/v_sim/v_sim-3.5.2.ebuild b/sci-visualization/v_sim/v_sim-3.5.2.ebuild
deleted file mode 100644
index 478cacbfa..000000000
--- a/sci-visualization/v_sim/v_sim-3.5.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Displays atomic structures such as crystals, gain boudaries, molecules"
-HOMEPAGE="http://www-drfmc.cea.fr/sp2m/L_Sim/V_Sim/index.en.html"
-SRC_URI="http://www-drfmc.cea.fr/sp2m/L_Sim/V_Sim/download/${P}.tar.bz2"
-
-LICENSE="CeCILL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# doc:   Adds developer documentation (/usr/share/doc/${PF}/APIreference/)
-#        Example files are copied even when USE='-doc'
-# debug: Adds console debug messages. This is really verbose.
-IUSE="abinit blas debug doc netcdf openbabel"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	dev-libs/glib:2
-	x11-libs/pango
-	media-libs/libpng
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	abinit? ( sci-physics/abinit )
-	blas? ( virtual/blas )
-	sys-apps/sed
-	netcdf? ( sci-libs/netcdf )
-	openbabel? ( sci-chemistry/openbabel )
-	doc?  ( >=dev-util/gtk-doc-1.4-r1 )"
-
-src_prepare() {
-	# The author follows Debian conventions, hence the example files and docs
-	# end up in /usr/share/doc/${PN} instead of /usr/share/doc/${PF}. We
-	# correct this here.
-	sed -i -e "s@/doc/.\${package}.@/doc/${PF}@g" -e "s@/doc/\$PACKAGE@/doc/${PF}@g" configure \
-		|| die "sed failed on tweaking configure file"
-	# TODO: test if this can be done via --docdir
-
-	# The /share/ directories are #define in the code and must be adapted.
-	sed -i -e "s:/usr/local/:/usr/:g" src/visu_basic.c || die "sed failed on updating directories in visu_basic.c"
-}
-
-src_configure() {
-	if use doc ; then
-		gtkdocize
-	fi
-
-	econf \
-		$(use_with blas) \
-		$(use_with netcdf) \
-		$(use_with openbabel) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable debug debug-messages)
-}
-
-src_compile() {
-	HOME="${S}" emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	einfo "Example files are in /usr/share/doc/${PF}/examples"
-	einfo "(even with USE='-doc')"
-	einfo ""
-	einfo "The global v_sim config files are in /usr/share/${PN}/"
-	einfo "There are a few options which can only be configured in these files"
-	einfo "and not through the UI. For example, one can specify different"
-	einfo "colors for the box and the axes in the files, but in the UI one can"
-	einfo "only change them together."
-	einfo ""
-	einfo "V_sim uses by default its own weird gtk skin. You can edit the"
-	einfo "skin settings in /usr/share/${PN}/v_sim.rc"
-	einfo "You can change the skin file used in the config file v_sim.par:"
-	einfo "Go to the line 'config_skin[gtk]: V_Sim'. The argument may be:"
-	einfo "'V_Sim', 'none' or the path to your own rc file. The keyword "
-	einfo "'V_Sim' stands for the default rc file, /usr/share/v_sim/v_sim.rc"
-	einfo "If you choose 'none' or if you comment the line, your current"
-	einfo "gtk skin will be used."
-}
diff --git a/sci-visualization/v_sim/v_sim-3.6.0.ebuild b/sci-visualization/v_sim/v_sim-3.6.0.ebuild
index 23866174f..9e74775f6 100644
--- a/sci-visualization/v_sim/v_sim-3.6.0.ebuild
+++ b/sci-visualization/v_sim/v_sim-3.6.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Displays atomic structures such as crystals, gain boudaries, molecules"
 HOMEPAGE="http://www-drfmc.cea.fr/sp2m/L_Sim/V_Sim/index.en.html"