Fix tcl/tk slotting;drop old; Bump EAPI

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

4 files changed, 47 insertions, 90 deletions

diff --git a/sci-biology/ApE/ApE-2.0.7-r1.ebuild b/sci-biology/ApE/ApE-2.0.7-r1.ebuild
index e2ac6f6477f9..45922e13f202 100644
--- a/sci-biology/ApE/ApE-2.0.7-r1.ebuild
+++ b/sci-biology/ApE/ApE-2.0.7-r1.ebuild
@@ -1,56 +1,54 @@
-# 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-biology/ApE/ApE-2.0.7-r1.ebuild,v 1.1 2012/12/31 18:16:06 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ApE/ApE-2.0.7-r1.ebuild,v 1.2 2015/03/20 15:39:09 jlec Exp $
+
+EAPI=5
 
-EAPI=2
 inherit eutils
 
-DESCRIPTION="ApE - A Plasmid Editor"
+DESCRIPTION="A Plasmid Editor"
 HOMEPAGE="http://www.biology.utah.edu/jorgensen/wayned/ape/"
 SRC_URI="http://www.biology.utah.edu/jorgensen/wayned/ape/Download/Linux/ApE_linux_current.zip -> ${P}.zip"
 
 LICENSE="ApE"
-RESTRICT="mirror"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
-RDEPEND="dev-lang/tcl
-	 dev-lang/tk"
+RDEPEND="
+	dev-lang/tcl:0
+	dev-lang/tk:0"
 
-src_compile() {
-	echo
-	einfo "Nothing to compile."
-	echo
-}
+RESTRICT="mirror"
 
-src_install() {
+S="${WORKDIR}/ApE Linux/"
+
+src_compile() { :; }
 
-cat >> "${T}/ApE" << "EOF"
-#!/bin/bash
-cmdArgs=""
-
-# AppMain.tcl searches files relative to the directory where it resides.
-# Add absolute path to file here, if necessary.
-for rfpath in "$@"; do
-	afpath="$PWD/${rfpath}"
-	if test -r "${afpath}"; then
-	cmdArgs="${cmdArgs} \"${afpath}\"";
-else
-	cmdArgs="${cmdArgs} \"${rfpath}\"";
-fi
-done
-
-eval exec tclsh "\"/usr/share/ApE-2.0.7/AppMain.tcl\"" "${cmdArgs}"
-EOF
-
-exeinto /usr/bin
-doexe "${T}/ApE"
-insinto "/usr/share/${P}"
-doins -r "${WORKDIR}"/ApE\ Linux/*
-make_desktop_entry ${PN} \
-		ApE \
+src_install() {
+	cat >> "${T}/ApE" <<- "EOF"
+	#!/bin/bash
+	cmdArgs=""
+
+	# AppMain.tcl searches files relative to the directory where it resides.
+	# Add absolute path to file here, if necessary.
+	for rfpath in "$@"; do
+		afpath="$PWD/${rfpath}"
+		if test -r "${afpath}"; then
+			cmdArgs="${cmdArgs} \"${afpath}\"";
+		else
+			cmdArgs="${cmdArgs} \"${rfpath}\"";
+		fi
+	done
+
+	eval exec tclsh "\"/usr/share/ApE-2.0.7/AppMain.tcl\"" "${cmdArgs}"
+	EOF
+
+	dobin "${T}/ApE"
+	insinto "/usr/share/${P}"
+	doins -r "${WORKDIR}"/ApE\ Linux/*
+	make_desktop_entry ${PN} ${PN} \
 		"/usr/share/${P}/Accessory Files/Icons and images/monkey_icon.gif" \
-		"Application;Graphics;Science"
+		"Science"
 }
diff --git a/sci-biology/ApE/ApE-2.0.7.ebuild b/sci-biology/ApE/ApE-2.0.7.ebuild
deleted file mode 100644
index 292c8c4ba426..000000000000
--- a/sci-biology/ApE/ApE-2.0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ApE/ApE-2.0.7.ebuild,v 1.2 2012/04/25 08:38:13 je_fro Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="ApE - A Plasmid Editor"
-HOMEPAGE="http://www.biology.utah.edu/jorgensen/wayned/ape/"
-SRC_URI="http://www.biology.utah.edu/jorgensen/wayned/ape/Download/Linux/ApE_linux_current.zip -> ${P}.zip"
-
-LICENSE="ApE"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-lang/tcl
-	 dev-lang/tk"
-
-src_compile() {
-	echo
-	einfo "Nothing to compile."
-	echo
-}
-
-src_install() {
-
-cat >> "${T}/ApE" << EOF
-#!/bin/bash
-exec tclsh /usr/share/${P}/AppMain.tcl
-EOF
-
-exeinto /usr/bin
-doexe "${T}/ApE"
-insinto "/usr/share/${P}"
-doins -r "${WORKDIR}"/ApE\ Linux/*
-make_desktop_entry ${PN} \
-		ApE \
-		"/usr/share/${P}/Accessory Files/Icons and images/monkey_icon.gif" \
-		"Application;Graphics;Science"
-}
diff --git a/sci-biology/ApE/ChangeLog b/sci-biology/ApE/ChangeLog
index 2a00bdb14c8b..306632969092 100644
--- a/sci-biology/ApE/ChangeLog
+++ b/sci-biology/ApE/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/ApE
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ApE/ChangeLog,v 1.9 2012/12/31 18:16:06 je_fro Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ApE/ChangeLog,v 1.10 2015/03/20 15:39:09 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -ApE-2.0.7.ebuild,
+  ApE-2.0.7-r1.ebuild, metadata.xml:
+  Fix tcl/tk slotting;drop old; Bump EAPI
 
 *ApE-2.0.7-r1 (31 Dec 2012)
 
@@ -42,4 +46,3 @@
 
   09 Jul 2008; Jeff Gardner <je_fro@gentoo.org> +ApE-1.12.ebuild:
   Initial import, thanks to Marek Miller on bug #231231.
-
diff --git a/sci-biology/ApE/metadata.xml b/sci-biology/ApE/metadata.xml
index edcb27d6a975..4252fbfae02e 100644
--- a/sci-biology/ApE/metadata.xml
+++ b/sci-biology/ApE/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>je_fro@gentoo.org</email>
-		<name>Jeff Gardner</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer>
+    <email>je_fro@gentoo.org</email>
+    <name>Jeff Gardner</name>
+  </maintainer>
+  <longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-