Fix tcl/tk slotting;drop old; Bump EAPI

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/sci-chemistry/imosflm/ChangeLog b/sci-chemistry/imosflm/ChangeLog
index cfdcce37ac17eee28ba76a5fc9ea4ef867099229..b14a28557ba41f99d290d01e6c5cca44830f6158 100644 (file)
--- 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/Manifest b/sci-chemistry/imosflm/Manifest
index 57defb5960ea1e59500c985992d66525af1abab1..e2cab31651e088aaf55bf3d79000bfa3e2054f48 100644 (file)
--- a/sci-chemistry/imosflm/Manifest
+++ b/sci-chemistry/imosflm/Manifest
@@ -1,24 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.0.4-impl-dec.patch 277 SHA256 061dd0d4faa772916ba4cd966da1ef49bc240c5254c9180237efac711d23108b SHA512 71f25c111febe4f384cb34522aee46e143721109d9ac114639d479504511f33a1bab5e64dc31dd7a4163deb6e1b2b06dc5c6078f298721de565798dde9f179d1 WHIRLPOOL 2f6665894a3bc056c2fce18bb9c66b58e07a42c00f3c74e2a2193193ebf6cbb60d0f69859db0b543aa665121dc84023e0487263fa0c906cbe9bd55431bf6d0d6
 AUX 1.0.4-tk.patch 1797 SHA256 01127c8dcfcb52561afa3160a4a4deca26bd8ccd0c88fd706722947cfdb6ec58 SHA512 ca4af4ebe1f16cf59566256fefe24c4b90530adfa5655328102304f0ca2582fb5a9a5859640ddb5a7cec334acc229b142f00dd303b238d8e86c9b0095f167076 WHIRLPOOL c58ffe7ee6fd2a3cca4d5307465fcc56680f1bc08d9d8b2ca25340994ea8f882559df35289f8e3bc010f9bb560259eecce36d72b81c45a1baf2fb0eef7215b09
 AUX 1.0.7-libpng16.patch 1227 SHA256 979c71276d101f4e1dca7eaf024d496752ea267f07626806a11bce6d68616e6a SHA512 c01fda4ca376dac1952277585f9afdeb3f693ec591faf8e1d3a7804540f9e11f069df19cfa19a583605c1d054b0d25b55ccf977f0fc935501e14f702f4c25573 WHIRLPOOL 28ac423fce098375f3607b17b130e64f0961d636330b712ce8bb48e16ee129dfdfcb57c6c4f41b9665361b1c88130f470d0e72e6cf8f9afede6023c53284631f
 DIST imosflm-1.0.5.zip 1003847 SHA256 cda472f1be4b2e900552644d77705c33356f90c3f3d5763b2b527ccc471c0d5f SHA512 e0b2298750c4932dbab5b851bf7c6091ca5e1438306f3e21c6eb6c29166c046410e05fa37a2a9fbcda838ced4407a33c11e7ba00230bb4ae702de3838bf08b7b WHIRLPOOL f6fe5ea0568f16183313959fee156011abb1c018a5885a09badbea4879822c5ca5a4080c17fceeff00b8b28df091f6ff8ba80559daeb595e754266c54d739f73
 DIST imosflm-1.0.7.zip 941784 SHA256 b067261b4d7ef2f1f7581ddeaa08252d29f889acf89ce190eb0d8b30aa94b107 SHA512 f3163e1f71c5b1e24d6b3fbd5a040bbcebae25485d1258eef4b2725821f5f96c1260adb2bcc3ab57179d7b9b9e538ddf0494ab9b5be259b98d138fddacec8c77 WHIRLPOOL bd2b6bcdcc241fde41fe2ba99bd1e2f47bc444c46ee36a5b332d5c018b81a9d649378110a8bffa48ffc67a19b04ede7e61846b53a250e5fe3058ec0313fda80c
-EBUILD imosflm-1.0.5.ebuild 1818 SHA256 f64fb0e4274e6f195f2fbdfffca9eee38e3e28a57bf845529b5afb34f9605d53 SHA512 6f88ea6a38e6c3c7844b1273753bcdf93e85de68f66f34aa1b3c1524771e8ff476b36383298827fa77a89c5152b5b24e424c9330e84183f4888fa06dcf21870d WHIRLPOOL 5d344f682064744401a3f1e02242a2cd37cb19b39fa8e85b88afd227b690c0182424f9871683b696518f42de9d835b987aee30341a1462feec91009d49b715ee
-EBUILD imosflm-1.0.7-r1.ebuild 1292 SHA256 65a5a6b0386efb3e51b7c4736f96278075c49e14d57895ec9499e01c42e4693e SHA512 7e118dd0fac6100ee3a185c2adcbc6d6bb028f5cd6d9ac4a410225f6fc1b80869f0cd7faad8329564472f6f1495d9305a9d705e5f0f013c7ea73460a74574a9b WHIRLPOOL 338cf07d2855265c74797ec9218832c5805adbd16ed8109669c64a95640409ae1faaacac0da13c59270e45fdc0fc15f6d1dc01c308a08f7b9f550299f94df1ab
-EBUILD imosflm-1.0.7.ebuild 1224 SHA256 7cc6e88218576fe5078e0a340fc3de0e060dc8a0bea9a865882bc20065a37f6a SHA512 eb2d89442fa20794b78383ba39d40a653761afca3f410780ee5d0cb897bce068d7c9dda91f9763c47c580e93d1059f8ff333534ce046381230e4e013ebf6fd5c WHIRLPOOL 962996006c5cc4715c416896c5ab31d032a05a1f3e05d5b8bbc72fcc3303b156597b5761a076a5d1f409560340de9cb87d914d820195948d6e834357d23f5fd7
-MISC ChangeLog 932 SHA256 3cdf2fe13ba85d7373bf16321eb79ebc9b03eca1e552551f37a200d590ab89a3 SHA512 f44a4725de3e42002d2f66b438ecbc76d11ce468c95dc31a92d6cae4232d5b0ca55f3a6b62326ed32fcadfdfdebc2c3dc21f6570636520df08d8af297aff4d3c WHIRLPOOL 17610a69ab5041b69b771581e48a423a8491ab2fedb7082ef3caf1d4655e6dd5ccdaa373fa87ca7f28358f8ffe1072ba59d444bf44674befbda85ed7225be2ef
-MISC metadata.xml 166 SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 SHA512 f3983c331d893184bb5ba6bb930df43e426752ee2a8522e47a475b2d95aac1aef32719a51b0aaef39fac94d32a7bdcf8d863d540b6267a01a94eaf97c86da2c1 WHIRLPOOL df036abf4d6d3e88512b68512aa4e083fe43dda216c6d74a9e28621241fd658a4c08f53d3fcd483af795439b5b641075d5a1b1316c0bbaaf11fd59fcb8cafa9c
+EBUILD imosflm-1.0.5.ebuild 1820 SHA256 73a3d6ef011f269adbba145e295fde0e6ce6806ed586760893586d9f1666f4b3 SHA512 c37427683743039aa57f22b53b389aad39965ddec697883331b7869e68d9740683dc40b0b309860a5b869c36a8e5020d24a8d4f61dfe7b1026f2211e0b237940 WHIRLPOOL 9e4911bd8e2940e004b3535dfa3eaf2c66dd9e28998b36922e957bd0c976daa3043873f5fe877ac136aa4608221ab02f81a1ff5ae47ae796fab4615ad6ac8a01
+EBUILD imosflm-1.0.7-r1.ebuild 1290 SHA256 161e4979aefd8387846ec4c1ebe2c9b0938c5203a5dc4ac0d91e7af7f071a727 SHA512 7c58a13e99e11af80f9590ab10b89263748ff8e9e8ff588229ef34038edab07274722b5c446436571597a10defbed9f2ae45fed7016b0e0aefd120ff2ad2b37f WHIRLPOOL dffd0c105c5a93fe66603de8b997c0cdb139614abdd7fea96fe6afd0d988bebd1ef9ed7bd81de722039d6eb8e70a03830f6a8722d6a1b366474995d830f1dac0
+MISC ChangeLog 1103 SHA256 b40d4ea6ddc48cc72e700623c11da30a63a05b9c46fb808462b74bff0d66a204 SHA512 cc7ccf56cf452123493b52f0edb5152ba6ec763ef29a96577d2948bccb72a18bd7ece82feaad3d412ca658d15f3d4345c16ce75ae21d7df9206a1d25e0646be2 WHIRLPOOL 4f71c235c516730630f4317d8b3ec22e54bf5239d25fd4491d9ac4456fa26acd6e9963690c5b7d50dcf5c7fb8db5394efeb6196b5c6140af2357d3380e8d20be
+MISC metadata.xml 168 SHA256 705462092174cd3e2e3ec1557a28108a746b7351f803d8ca6d1b925b3111c3ff SHA512 f0073fb277e20adb7781aa6ea7f8237bc2d350f0aa43f0f0cca33e02cf52b8fc117bd984c11721ac519a2637ea145976148ac1aba7335dc74c42f7b9531cbed3 WHIRLPOOL 07dd7a302e695440f5033889e5b20cada57beedf17ad33f95d45fb5c39da98bf206eaff13334c20c1c08140a9c5e6041341d29c58efc5ca59b112b60e1662318
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTQ/RzAAoJEEdUh39IaPFNDjkH/3lTdYHG5JacqlF+RLve8UbY
-eO4PUwDWmMU7JUEb7MYHg+ZKBE2kBTQybKINy9ALjNAOz+dX7leUGf6GB3QOxJDA
-og3lj9PGt6963ZZUPKEj8VlHuYboBWYW/Tqw73MeDBeXYPpIwpymG2FFYd/vwbYA
-L2+9UF4mH73M7Xrr6SACWJvN7V0DDbvWST4prctlcJo0G885o7RCr+pUfn8A0aLO
-anTFJjQW3hz/jhpoxs7u3RnQ6hq3yl8d4zTjIUVhSGl+sah2svDW9x/Ugw/1PKQN
-XOi1ciMD/Um3kPtgsYRrfw2y4XbkEGH6eSnFB974Pt4E4XHJpsLVwh6+hI3CK88=
-=tb9s
+iQJ8BAEBCgBmBQJVDD2iXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirU9oP/0OXLyzxCk1RTp17VCOabkSY
+LfuPefbXrnMCjqcWtJHdVZfIuB1In2rMjQ676V52O8fdxxFD4ELTBom4I74XVz7a
+7c32s4C+2fV8u4nlhkxJgZlBUoNezhcLr+EuDadR2CSeaVKKDLsrHEk7Ec6Ofgrl
+WdlOG3+BRJSTckOw1wgAW2PUpO6t8NL0JmS6iFqQPLHLB/ZK7uHEMi09IGdE47k7
+RXz+rUtI87JdeGsdPggtqu+5bEb4nX0gAZvrfKibzY7zQZZMtrMaTJeiaHtlyVVT
+NbOqRcaofq+8CUDc8QDCR6F6HkvXsuyTDWdOmPYk7Aju32Z3KIGAhwC1HcqH17Fi
+Blu+y7SXXNdEyI36JCNniNm59vVtGo7JKTEKIOlP2eVSMD1OwkKXhfp43gNPo8KU
+1FYxAc6ljyBuRMq5CnItEpMwNxK/pyrqM16N702uAVuiPlWnvM+NjjzJ/8JqhPdA
+ixVUK5xYhbTxTrwUUJqn15ogOepojrQktryp3gtsZLZ38uUHp92X+ewd+rlFKYjt
+WA5vA261wOpSew1t4fdq1pfnsk9peSmPw0HfH6t/jYs+ux6PJbMQK/Yc8Fpyi4cZ
+DW+CQ7HS0UTH67n71HDPFivvNaU7v6MELAe4H3bL1R6dhaZ6dltFyAZK/4aufIFA
+wDirbitgpLbInOugLVeb
+=m43K
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/imosflm/imosflm-1.0.5.ebuild b/sci-chemistry/imosflm/imosflm-1.0.5.ebuild
index 3a006e5076c0ab13bff0d31b5e8106b55b5a2fb1..253ed80420836061c0a6a4a18734e4a540ef934e 100644 (file)
--- 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 505de7df3ab280daae1f93ccae80acaf77bc7c19..d2ff3195491d395867c07e3de8abdba16625f315 100644 (file)
--- 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 (file)
index ebd39ad..0000000
--- 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 9ac9ffdb3a41210a2c529786d05b012774094f2e..51fdedab1b3844b82077be28af7b25ad5d5ca54d 100644 (file)
--- 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>