Fix tcl/tk slotting;drop old; Bump EAPI

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 14 insertions, 60 deletions

diff --git a/sci-chemistry/imosflm/ChangeLog b/sci-chemistry/imosflm/ChangeLog
index cfdcce37ac17..b14a28557ba4 100644
--- a/sci-chemistry/imosflm/ChangeLog
+++ b/sci-chemistry/imosflm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/imosflm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.16 2014/04/08 13:12:57 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/ChangeLog,v 1.17 2015/03/20 15:32:49 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -imosflm-1.0.7.ebuild,
+  imosflm-1.0.5.ebuild, imosflm-1.0.7-r1.ebuild, metadata.xml:
+  Fix tcl/tk slotting;drop old; Bump EAPI
 
 *imosflm-1.0.7-r1 (08 Apr 2014)
 
diff --git a/sci-chemistry/imosflm/imosflm-1.0.5.ebuild b/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
index 3a006e5076c0..253ed8042083 100644
--- a/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
+++ b/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.5.ebuild,v 1.4 2012/07/05 14:33:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.5.ebuild,v 1.5 2015/03/20 15:32:49 jlec Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	dev-lang/tcl
+	dev-lang/tcl:0
 	>=dev-tcltk/itcl-3.3
 	>=dev-tcltk/itk-3.3
 	>=dev-tcltk/iwidgets-4
diff --git a/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild b/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild
index 505de7df3ab2..d2ff3195491d 100644
--- a/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild
+++ b/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild,v 1.1 2014/04/08 13:12:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.7-r1.ebuild,v 1.2 2015/03/20 15:32:49 jlec Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils multilib toolchain-funcs versionator
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	dev-lang/tcl
+	dev-lang/tcl:0=
 	>=dev-tcltk/itcl-3.3
 	>=dev-tcltk/itk-3.3
 	>=dev-tcltk/iwidgets-4
diff --git a/sci-chemistry/imosflm/imosflm-1.0.7.ebuild b/sci-chemistry/imosflm/imosflm-1.0.7.ebuild
deleted file mode 100644
index ebd39ad74c1b..000000000000
--- a/sci-chemistry/imosflm/imosflm-1.0.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/imosflm/imosflm-1.0.7.ebuild,v 1.2 2012/07/06 13:39:21 jlec Exp $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs versionator
-
-MY_PV="$(delete_all_version_separators ${PV})"
-
-DESCRIPTION="A new GUI for the Mosflm crystallographic data processing tool"
-HOMEPAGE="http://www.mrc-lmb.cam.ac.uk/harry/imosflm"
-SRC_URI="${HOMEPAGE}/ver${MY_PV}/downloads/${P}.zip"
-
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-lang/tcl
-	>=dev-tcltk/itcl-3.3
-	>=dev-tcltk/itk-3.3
-	>=dev-tcltk/iwidgets-4
-	>=dev-tcltk/tdom-0.8
-	>=dev-tcltk/tkimg-1.3
-	>=dev-tcltk/tktreectrl-2.1
-	dev-tcltk/anigif
-	dev-tcltk/combobox
-	dev-tcltk/tablelist
-	>=sci-chemistry/mosflm-7.0.9"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"/${PN}
-
-src_install(){
-	rm -rf lib/{*.so,anigif,combobox}
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins -r "${S}"/{src,bitmaps,lib}
-	fperms 775 /usr/$(get_libdir)/${PN}/src/imosflm
-
-	cat >> "${T}"/23imosflm <<- EOF
-	IMOSFLM_VERSION="${PV}"
-	EOF
-
-	doenvd "${T}"/23imosflm
-
-	make_wrapper imosflm /usr/$(get_libdir)/${PN}/src/imosflm
-}
diff --git a/sci-chemistry/imosflm/metadata.xml b/sci-chemistry/imosflm/metadata.xml
index 9ac9ffdb3a41..51fdedab1b38 100644
--- a/sci-chemistry/imosflm/metadata.xml
+++ b/sci-chemistry/imosflm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
+  <herd>sci-chemistry</herd>
 </pkgmetadata>