From dec0294690748be9d184486ee22c8d23a1d17bea Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 20 Mar 2015 15:39:10 +0000 Subject: [PATCH] Fix tcl/tk slotting;drop old; Bump EAPI Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- sci-biology/ApE/ApE-2.0.7-r1.ebuild | 74 ++++++++++++++--------------- sci-biology/ApE/ApE-2.0.7.ebuild | 43 ----------------- sci-biology/ApE/ChangeLog | 9 ++-- sci-biology/ApE/Manifest | 29 +++++++++-- sci-biology/ApE/metadata.xml | 11 ++--- 5 files changed, 72 insertions(+), 94 deletions(-) delete mode 100644 sci-biology/ApE/ApE-2.0.7.ebuild 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 -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 +ApE-1.12.ebuild: Initial import, thanks to Marek Miller on bug #231231. - diff --git a/sci-biology/ApE/Manifest b/sci-biology/ApE/Manifest index 6c96422ed257..d3a8a56ec1a3 100644 --- a/sci-biology/ApE/Manifest +++ b/sci-biology/ApE/Manifest @@ -1,5 +1,26 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + DIST ApE-2.0.7.zip 318454 SHA256 9d718562ef250b68dfad1de7d4179540fc04c001b0fdc5e9bd70f3605561bc32 SHA512 073e3f96badf4888c10a7c7eb453a3775d5bb9136b0bd836d37d1be784847f887e0c68b37325f430eebfb90c2d94021f10d4e8ede92de89b1ab1ddc1ffdbc254 WHIRLPOOL d13e8a997c36f8e7ac951a17c195a714a243292f9a99f524758b09b1fdc9f436b11cf1124ac1a3527ff70aa8cc6dc9ac516a910246f9f6e4f8376c78e8b44013 -EBUILD ApE-2.0.7-r1.ebuild 1307 SHA256 b42262d02891f5f92874f33e24bd088d85498800a8d76cec2be82ec8bbac2ab5 SHA512 a4e2fabee2a26645b101cff3c7a45d8ef45a33e4ff29d83f06176498e54eb79f2e8fe240e33c286c820b714b1566f6f9b94324be76eb2bc57900f8fdbbaa56ae WHIRLPOOL 77fe1133f4d91ebef72d3e7d303419d597b3de00f59e1ac14f7b37f4836e092e15817d62cdb640586cb504511804d0906b00dae21b51a9553faf3a105388b601 -EBUILD ApE-2.0.7.ebuild 974 SHA256 ddc459934274024b0c5b0b46b64adaaae92ab44d2aa5cde3f0ff54d20f2cf322 SHA512 a1cf1ac67727074ddb2ddbc3cba5287497391b8b3fd50db23a5750b4ee7bcb578925bbb375f61a0bd481543df5fdc91dc1bee9de57def60658dc88984601e73e WHIRLPOOL f55aef448d6805dfddc10bad5582ddada1777387da9483b3d86024bbeacee94b144198a0d722cfa753cf17b1cc340aba0cac90c827d37d7b794c3f23a8f63f07 -MISC ChangeLog 1537 SHA256 ccca3f578761c39feb238516b8e08a0d2d6a3e62015e75af11ad147f6d67c49e SHA512 110963be93e50ce8b4bbd028cbd473575ed5f35ba065a628a9eb03abeda8a5031dc138d244c6816a60050681cd028f220b5f69f6a95fdaf4d40b3e7574850f4f WHIRLPOOL c5c646abb34fb1b2e152f8b8c395007aef23487150fe9d3d3b54810e3ef8142e7bbb3951a0dbcbb72b341090cb0df8d92960531dc41a1dd0388a85ecb3329abe -MISC metadata.xml 281 SHA256 d91256704dd7de0642182be6f861a9cdce239252bcd7567364dca852ef907b35 SHA512 022267f2d654ed7d2fba287ba8902ac9b3e91ac7c07f9c0cc5d865188b6efea3779faecca948eab9bfd08d8b2730806ef6bbcf5a8668a92b36ab758b6234692c WHIRLPOOL 4d2c7ea92b26d389e8c93c511ec33a187d762308ee9080a3038f2086407a838b344c702a4102bf97c088627f37f48f19f4c13e8f055b31d865761c3700c93c3a +EBUILD ApE-2.0.7-r1.ebuild 1278 SHA256 2ab73e0804d4e0e45ee5c263716e9e6a6b18305442d8776bdf803c2ac4376dd2 SHA512 b5949624c76645839639cb45169686d1ce5fec71846461962231607581c0bc1ef97778792694ac6d304e44bb67e718d830d49d6eef42e2cac44e3ba717671234 WHIRLPOOL d07b6e1faed61c8bc3983f64c3c411b1497451eac54f5d180e1ae461a0a4bd7bf3d9e029e505f73ed79c5ce7c5162a23dbd5f5846829ce7f51437266db8beaff +MISC ChangeLog 1681 SHA256 ed4f99c5e1c819ad466daf75129d3f88c11997a4692a9a4f6287fa2a7d627578 SHA512 d0f2f54e7cdf3778d6afa724899360a2148ecc26d1e4147fd406e28bf595764edefcf021232a2a7e0fc8531596ce190abd0348258975e72716ab0cbae8b24cbe WHIRLPOOL 858889149946910622afde6a802553fbc50a9d75b800406a84beb0ba73df373a5782637f4c46e60daed246c8e364c5b8f002245f15f5a47445131103a6c8bdd0 +MISC metadata.xml 287 SHA256 279a139a6357b4c627fbd01b4e60f6dbc6345a0a6fe3886750126e42d441410f SHA512 1edc829691774b400dc512c2b0954bc98a76f436e1f4771be88c5a779d71d6ba4e9223d691e496293e6fea48866cfe0ee5d1b876b28fcfecaf2c8e347e20c177 WHIRLPOOL 9b0b9bafcef63fb9252a522ce3cb1ae799c0158eb72aaae68959bf26f90b0cee65fed7b5de5fd4839bb53f7c855a01a48603b070238e1e4426ec01fc963d6892 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCgBmBQJVDD8eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirlygQAIEPqc113u4zNdYsJnLF6sHK +mliI8C7W8I52hXguP9tersoo4mEDkH3XwPEZ8QdlPyRF9y97KdYZDy30FLR0TFDg +jsBH5+KUNOP9lHiUS+ekAiEg2WBAs/OQ7jGfUCJQMkSH97aW1JT+V2sUPgf81iv1 +jWeCWU0pFw3bEssTDU/WcfILZ+gpriAPbQgnJ9KM59xvYxepeMU4rZT8i8go3g9K +W7ilA+WQ9r1GAxVn9DU361Te7WhTuG974BV8JaQuC3Mow2Jxk7BeQ2POmfj6gIMH +XiPzbzGV8F+6ngged4fmimKES6/ROCvnOHF/pmKDherPBYDRce7BNvtg+UVdw1g7 +8kUGvKujm/YzPMNv3jbxqEGN1mdi0OOrdnPVFuvWrFPJmxp0z8/jy5ZVMCzTIkCz +nVBCZ5ZNtQ5SSG3gqHx5gdqOpFCAV45uOE1NtbMviMTd5ws6hQYxnVOlgFnK4wKa +jlu/xx/auZUtxwupCNBAqJGm8spL38ppNAvcbxPqPuenvZPSY+xLl3Tq6qUT5zRG +yXiS47jMnpn00F93maUcDbCd/uD0Yo8UU1vypJi0XxC23MyrVgEhbVdnot1zPDOq +iRT0o1TcHb5lyONQzKvCX+FS58bc5u7DNNbL8XGUS6cOyITSHrPOPbOzpz7rTgSN +lkJgB7QuZ5bS7Qrs16Af +=bbvk +-----END PGP SIGNATURE----- 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 @@ - - je_fro@gentoo.org - Jeff Gardner - - + + je_fro@gentoo.org + Jeff Gardner + + - -- 2.26.2