Fix tcl/tk slotting

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

6 files changed, 49 insertions, 34 deletions

diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index ac2a09689b6e..3e85dd126f54 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/magic
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.75 2015/03/16 18:58:35 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.76 2015/03/20 15:27:08 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> magic-7.5.202-r1.ebuild,
+  magic-7.5.231.ebuild, magic-8.0.138.ebuild, metadata.xml:
+  Fix tcl/tk slotting
 
   16 Mar 2015; Thomas Beierlein <tomjbe@gentoo.org> -magic-7.4.46-r1.ebuild,
   -magic-7.5.202.ebuild:
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 6bc20a956a13..eff88b9a1ea8 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX magic-7.5.202-include.patch 430 SHA256 a4d98e36678e5cdfdd8682b84f5eff782efe4f529b0d2972b8cfdabf5f9d8466 SHA512 0ff649589b65ac608586a425ca5d2b72e8608d513dae51be7b6e8fd5a2af494b2d186025777af2389358a3be6bd86efee312b4b1c3829d1eb3e9c28bef557e2f WHIRLPOOL 2b738613bea594b096b7d4258e74fcbb50ced9f552c4ece0584365319181978f0034bebe5f7975a97b8842f957dc7ad91c6ca9883c1d1960f020527e0ce1fd8d
 AUX magic-7.5.202-install.patch 566 SHA256 421ab4e98e8377d04c2cc5a07cfeac3ef52dc904c1c4dad488f85e7e5baf72b4 SHA512 332882e4557d0b5fc9fd4d681edc74e501578a5e1d00c144b5d656b8f95a5c6497cff3a6b620305cde032f9628ae169ea478927820ea085dfb52507f5de7722d WHIRLPOOL 439a4eb7eb0c62f928ddd6c389bdd57f308a8315e6862c0073b9fea31a710afc9c170675ce4c5e150313e31cf5da1cbb2669b4e715cdf144c570daa028e8d16a
@@ -11,15 +11,27 @@ DIST 2002a.tar.gz 6601961 SHA256 8b47889fcbcd36b1cdc2e51fc0aeb8c17b7780f559b01ca
 DIST magic-7.5.202.tgz 3692294 SHA256 975cb3962c8a97e3caae83c5de309bf09e623a829bd36983e82d28104067d99c SHA512 62be6e781ab51a4129a520b91a35ff5c280e7e9cb825e5d71e4012205dd0b777ca8c2355fb071d7d716977d477bddd44e45ca2810d3f97bb63dfe46c5ad1ba80 WHIRLPOOL 5deea41d84752b5706c505c9f33f0c7ab9c020a905f3d399279d9e0b423963cae59c17b73b86994bd04163ca2891eb6137ebc9a62bda3786c8d2e0da4f1a974c
 DIST magic-7.5.231.tgz 3751133 SHA256 48331d4ecfaf0239c746cc0e6f249187c57e751540c48b2c933afcd35430bf29 SHA512 ff1aa170c0fdbeb78aca7328370f40fde1a7276dd77e1b4d4d53f121b38ffecdc8b0d860dc92c1dfeccd1dd7685ee6079aa19984757025fc743ae1a88ed0aace WHIRLPOOL b1a6e0a80235ba0ef4d794436ce29a8cd42d15de48ab8a67e75cb5efcf4c316ce1b1099f1cb5f009eab831082166b80172afd152f7901aa34a5a471fc366edbe
 DIST magic-8.0.138.tgz 3880247 SHA256 85b49c587c09e874f8538386a0f8e2b5b5d034708ae12cd21063994b1cd74c8c SHA512 934fb0afef7fd7aca1307a1e9c86d23531d4188d1bd03bbfbb3609cabec115f5ce66ef02b75f5a0aedbace0b1f68260585b279a6d7bc45f58a4e0ac09cd99d36 WHIRLPOOL 75c84ed731a0405492bfbe364a9d774901895b009352659e5fb690d97830a6d30998deaf15f640d47b37216ea2dd61a93118910731f0751f4c9c7451306a788f
-EBUILD magic-7.5.202-r1.ebuild 1829 SHA256 7f75c1882f601f41e38db360240bdbd8889b4b6675751af21634e91f46a89247 SHA512 caafd42714ecba85a3d059fb7edb1b8711ec7a61a6280e3ae35c4f74dc8e612ffb4640fc738f8a6e15972b64fdb0d984845ac3163276fb0db38a845023e61fb4 WHIRLPOOL e23b7d37218dfeeef17142e67f447fdba180e819b7f2736754da00f560603ab22a374251391b82d876fa7c67772c94b0275624ccb456fceb4c8f5440218bbd70
-EBUILD magic-7.5.231.ebuild 2039 SHA256 7c34147c41303d8729418c93e5ce6f4c6ec94ccea8db591861a820f2e801c212 SHA512 43811778fd02acba24e99063d397af68cd8834b388b5335a1b2178645bae60e3f088f72b1c7905de52235ecc676ce6d056510795159ae6b651217f8fd903f436 WHIRLPOOL 99fcb2389d764555416f9bce114baeed1d6fe8fdd8ec14f256946f25e66e8fdbe30fcbfe8c1a70be77f06d3d8380568494cb7a9f03f4194361c4f73808be47e6
-EBUILD magic-8.0.138.ebuild 1990 SHA256 3741a9aa907f7803a679cf3c7c1585b92d75b2a70e292cc5f87c4566e2af3200 SHA512 5f4d9748a78f9f1ad461831a8537bf1dcbf05c58aef4cabd2b3137cf9d280b6f257e2c8ec15a6009bdfdcdef400b199a1aa93fa2120d4dd5553917486f59411e WHIRLPOOL 807fb7332cc3a8036ef2ffdff6203648f52a687bd5439dfa996584ecddd254a6235637b174f1c2b202cdd128c728be2c59e7909931e94976ca1aeb2692e03c05
-MISC ChangeLog 13052 SHA256 0d4b145f5cec06e9541b837a8c3c0de290d17377cd9d41fd887d76b9461f7ddb SHA512 5d19616ff644d515a0938b9d0869f8971231c86b33be56ce20dea15e2e9a7b8dc1725c6a96f038bdad53c9a4bb2bd63215d2eb28fbc4fc1ef8fc8079359ed774 WHIRLPOOL bb45df512ecf565d82dcbc781be59acb234d1fad21293973a6df86fdfa04a4cdd213375fbf8aaa46fad921d915b40cc14598008fdde1fc31f1fe22a3c2c7a252
-MISC metadata.xml 1253 SHA256 97dac63520952a6074ac0a894e36afe38a06711bdcd31912314f6bdd73bf393d SHA512 5449349f54ba0dae6000f7a2b5a641d450f7fa41ed74621acc1dd7d971b236bdf2be02e4a5ea98141edb71750b964823e519dfec9732e915a972fdc7c053f1b9 WHIRLPOOL 4020583a1bac11ac72c82ab34e6225873d8709655317356e95337738d52a6ba9c7cf8b661c6bb1d0b912cf714ebc92feeb831f7edcb6b1e482ffe85e2d01a110
+EBUILD magic-7.5.202-r1.ebuild 1836 SHA256 bcf6f6375a85062e748b9ec9000c1aad439827a1f9ea6b6387e099b34543d49c SHA512 8aadfb61c48bd1b9dbf52a9054e3c879014cc07aa3a1017fba2ab2f2dab36b24c7fde9ab20bd136228ea9d17ced360f4d8c059e06997f996dd733cac647f0e14 WHIRLPOOL 0b17a0ac79e17486b82c296bdf3d8d41de21e6574d730b8b082723cce41bc7be6184f625135fe0654d289060c0dd43d8b3d653c53d42af49ed91a0aaf620e7b0
+EBUILD magic-7.5.231.ebuild 2046 SHA256 91203ed70873081b1a4ac67975e70dd1e1a2e78023cdcfca7405682c4f27e432 SHA512 59cfd3bee5290d87934e9da51b38eba76e0c940f62e8e969aee84f698673ba2723e8f9c25e117dc5beec8ba468623f0326c3f1895d9b04229d87ce99df734152 WHIRLPOOL 463e2986fa6a906e98a07ecc97d1c3cd69c1f3ac2a3bfeb646b6fc6aaca2bb8d755fb21f15123b4df98f5dcbccce12f0ab3cf6a82ee9e07d2a501a243dfef881
+EBUILD magic-8.0.138.ebuild 1997 SHA256 3df4f79cb8fbeb9aaa7edb40975f561e4c6d0927ddaa161e2bb3d1b93815b474 SHA512 fd290fe10d83d56bdef159b7cf11bd8db8549dd63812fd521c36cce662f2cefe737c7ba42c851de93bff526df854e86f4846dce4e06b2cd2359f3a255d5777de WHIRLPOOL 160d394068d298aebec151cba17ae61f6aeddada84d52dd08d1c75649868bf577e84c565ae149ea8be87354d829cc246b13b5958255ae342105c98cc45c6a880
+MISC ChangeLog 13205 SHA256 e53334fcd8b7ffceb5e5a6a7f6f802ce05f78237229304aa96ed667ab5f50f5a SHA512 ec4973a66726e201f15cb842edd92972b2600654236d28116e58661b14462c0793a0818820d810780e32057ab50a35050e469d3eeeacf2fc9055989ec2a7d4a7 WHIRLPOOL f3284129926331c4cc2852cd3486ca9e8c6474883cce92a5a7a3d8b2bdac31fbe19f0898d5aabd3fe9ed6e3c4fb99af22ca2e02736fe3006d588fd671cc6a17b
+MISC metadata.xml 1268 SHA256 310d572e93e1738963755a74946b4f4b09d13c0fc0cd872f672f25489fa6c26f SHA512 8d25c12c3c70d233bdc7fa6f8eb5453ea7a623ef657f9ddf002ba0fd253ca216b18877f50c31b3412ce09f3dbce4f72d9c736ac096febceed35387a26d732413 WHIRLPOOL 870b0a87451e2c071cbbd94a9dd4ab11ba6b60bf1467ed043963e5376f070e8aa0cbe1754318630c9dcd3e68f1afe74dec095e8bfcecb1bc8662d46754fe1a76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUHJ90ACgkQQe4uqXYgU9URXQCfQ48PYm+QbingUJRem9DgRLRR
-JqUAn3E54CGgXNpIVcLHjZNrCRHanXNq
-=skXv
+iQJ8BAEBCgBmBQJVDDxNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirty0P/2dw9Yj9La+pv3rooWs1HByS
+xg8YW0/buUIi/p8teRN2S1GQWro53CCkCdpoz0PN+I0wqv2fkJmPmbOxPStOHT4v
+UGQC6XZBueP9RVOcmnHvSH2sAmn8je7ArG9KH9PK7C8Nse+4YiIw7q+ztmxO6nFa
+GN/USkD/W77Az+1SU+O9Jq06Y0Zq5zI+SLWzF5pVFqcbtZRhz1gV3JQjCEhlsN8E
+xDSOXiUVaK40/KBZcuLedmFjNzJrPDiEnE6y9e1L5zJLAsRY8MSK65KjQ3PTbwrW
+jwWUkCELFhMsZKV/QWGY38ECKeznxPAERc8GEPqrG+Z9ioS5wg8TxpzCQS07XJM0
+wgpmqyNVBXfznTzksSlOa0rOjoKgU7wPy/rz+CSQVm1sW8W1xx5zcsQuoP2lPrzS
+zkxz8H4eNJe3l1KAfQpeRoqUdRm6Qo2lIWMmhMELdoLMRW7E3fMA+y51LOe1Vyzo
+tzofCxTSrHvvycHOuRm7gku3cRCiHfcWse7fY/v0w0NPUyu6HZeEcHqCJWz5zySg
+svtKPM/Np9+EAc0TjYEAaVoYWZITy1Dt9uOTt4OFWFCTkms5PzzpaqtjlLVHTVEZ
+b3gOYUT5f+9/bg6MERkuq0eiUZsl+qAK9YA7jAM5noGTRlxjR0gR8d7OxPPA4qi7
+NtIEkZYmTnQrlRZEfks9
+=QdDU
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/magic/magic-7.5.202-r1.ebuild b/sci-electronics/magic/magic-7.5.202-r1.ebuild
index 6c999a8a2140..8e766e2ade4c 100644
--- a/sci-electronics/magic/magic-7.5.202-r1.ebuild
+++ b/sci-electronics/magic/magic-7.5.202-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-electronics/magic/magic-7.5.202-r1.ebuild,v 1.5 2014/08/10 20:28:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.202-r1.ebuild,v 1.6 2015/03/20 15:27:08 jlec Exp $
 
 EAPI=5
 
@@ -17,9 +17,9 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	dev-lang/tcl
-	dev-lang/tk
+	sys-libs/readline:0=
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
 	dev-tcltk/blt"
 DEPEND="${RDEPEND}
 	app-shells/tcsh"
diff --git a/sci-electronics/magic/magic-7.5.231.ebuild b/sci-electronics/magic/magic-7.5.231.ebuild
index b8b491055c37..c618ce616abe 100644
--- a/sci-electronics/magic/magic-7.5.231.ebuild
+++ b/sci-electronics/magic/magic-7.5.231.ebuild
@@ -1,6 +1,6 @@
-# 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-electronics/magic/magic-7.5.231.ebuild,v 1.3 2014/08/10 20:28:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.231.ebuild,v 1.4 2015/03/20 15:27:08 jlec Exp $
 
 EAPI=5
 
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug opengl"
 
 RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	dev-lang/tcl
-	dev-lang/tk
+	sys-libs/readline:0=
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
 	dev-tcltk/blt
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
diff --git a/sci-electronics/magic/magic-8.0.138.ebuild b/sci-electronics/magic/magic-8.0.138.ebuild
index e26bcf02e601..cb31742dad2b 100644
--- a/sci-electronics/magic/magic-8.0.138.ebuild
+++ b/sci-electronics/magic/magic-8.0.138.ebuild
@@ -1,6 +1,6 @@
-# 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-electronics/magic/magic-8.0.138.ebuild,v 1.2 2014/08/10 20:28:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-8.0.138.ebuild,v 1.3 2015/03/20 15:27:08 jlec Exp $
 
 EAPI=5
 
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug opengl"
 
 RDEPEND="sys-libs/ncurses
-	sys-libs/readline
-	dev-lang/tcl
-	dev-lang/tk
+	sys-libs/readline:0=
+	dev-lang/tcl:0=
+	dev-lang/tk:0=
 	dev-tcltk/blt
 	opengl? ( virtual/glu
 		virtual/opengl )"
diff --git a/sci-electronics/magic/metadata.xml b/sci-electronics/magic/metadata.xml
index 56dc1bb641d7..4bbd90c81497 100644
--- a/sci-electronics/magic/metadata.xml
+++ b/sci-electronics/magic/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-electronics</herd>
-	<longdescription>
+  <herd>sci-electronics</herd>
+  <longdescription>
   Magic is a venerable VLSI layout tool, written in the 1980's at Berkeley by
   John Ousterhout, of Tcl fame. Due largely in part to its liberal Berkeley
   open-source license, magic has remained popular with universities and small
@@ -13,14 +13,13 @@
   as being the easiest tool to use for circuit layout, even for people who
   ultimately rely on commercial tools for their product design flow.
   </longdescription>
-<upstream>
+  <upstream>
     <maintainer status="active">
-    <email>tim@opencircuitdesign.com</email>
-	<name>Timothy Edwards</name>
+      <email>tim@opencircuitdesign.com</email>
+      <name>Timothy Edwards</name>
     </maintainer>
     <changelog>http://www.opencircuitdesign.com/magic/release.html</changelog>
     <doc lang="en">http://www.opencircuitdesign.com/magic/magic_docs.html</doc>
-	<bugs-to>tim@opencircuitdesign.com</bugs-to>
-</upstream>
-
+    <bugs-to>tim@opencircuitdesign.com</bugs-to>
+  </upstream>
 </pkgmetadata>