Fix tcl/tk slotting; make desktop file pass validation

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

5 files changed, 47 insertions, 27 deletions

diff --git a/app-text/tkman/ChangeLog b/app-text/tkman/ChangeLog
index 4520a67fe967..cc4743395fec 100644
--- a/app-text/tkman/ChangeLog
+++ b/app-text/tkman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/tkman
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/ChangeLog,v 1.27 2014/09/26 20:05:57 axs Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/ChangeLog,v 1.28 2015/03/20 07:20:29 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> files/tkman.desktop,
+  metadata.xml, tkman-2.2-r1.ebuild:
+  Fix tcl/tk slotting; make desktop file pass validation
 
   26 Sep 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
   +files/tkman-CVE-2008-5137.diff:
diff --git a/app-text/tkman/Manifest b/app-text/tkman/Manifest
index 45363ffdc0f5..fc3ed40a1d73 100644
--- a/app-text/tkman/Manifest
+++ b/app-text/tkman/Manifest
@@ -1,17 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tkman-2.2-gentoo.diff 2321 SHA256 58d1e00288634797525308ef84a5c8840146b02f7cce85acc098b3240190059f SHA512 9f7329e2ed8267dfed31417a41a3d512571920ba6391d9fc23ef40ff5a18e0c74cf07d810ffc9de27ea88f560dc985d985b0cfe43e7d47b7fcd48af9d109eef7 WHIRLPOOL 9958ec17fcece98aeb6be541dff37aa9d5fb921c6a2e862edb955180641ed38edb6736f231c092d8654482dfec057023d35bc6ea56aaa39e189ecfc3cb1bf822
 AUX tkman-CVE-2008-5137.diff 11645 SHA256 3292226a9690420f52a562a587b93f6a0ff5124db685a4d237350e94bb03298a SHA512 60c65badeaa93d5e032117152905bd3c06985d7694fdec8c9ef9d0816446a865c45a1a4e7ac2dffc8eaf76163514de30663b2185fe6ba8e27a2cf9276aa09f4f WHIRLPOOL f8b83762953b136bf6c0e51448ee53754cfa9cd51d132130604271a1ec8c08399871ba89109ced7df2fdbf780fdb1d82ad363bcedf6a7cf6177fbf6ed3b71165
-AUX tkman.desktop 161 SHA256 1aa192a1e73bfb44b305cd752bbb89fd5cb4d5898864d6820814988425868a66 SHA512 a752169d6b26df584c95c5c92b5d92324d26fcb37b8b0d236ccf7a1651804ada587ad3f364ad628afad2303c092402503c965081a37ff592746f14f940ff5fb0 WHIRLPOOL dd07ed1bb30c94ccfde5e0e51aed96e9a4dd676cbbc2b8f3f64fdd939c9c30b08349bd160ca5ecd03dd7361b312c74880a8f219e77c453e88a2b22182fae6232
+AUX tkman.desktop 149 SHA256 ffd7d86e43c577b4152f8e490f4cc68635304d6e69f4d3fa8d82eda7be9906ac SHA512 d73c6ca978f0538c1b02f321cc4f45eec496c3e978229fc7eb373190d447c4d0c7639d0eaf8a3b7cc22d569e6a9088dd8371799874b41b13bb758c75369e572b WHIRLPOOL 59565d93a2ff8fdcdf18a622b19f723ea69bf836bb55115f44d59bd2aff165dd2945b6937e4426e71548b6c8baeb50610f10cea5c76b0be75e6bce18eb6804f3
 DIST tkman-2.2.tar.gz 229273 SHA256 ae2fde02705f154c119c76ca2d9c4132f01706359d218508b682652c8cfb3173 SHA512 31adaa4017282a6e6fba18a5f72c07c7d7d3bc63ef043b214bf68ec4837c73d4e0679d8b7513b0bae3984e1737e797ca886e15150b2e1a9cd288bbd7491a8777 WHIRLPOOL 703a9b9ed432191b5b6a9e10f93a932473a111780b0f190421aa6151f008e05186cc720d83ae4c7880ce4ff4769aab0e72311fb33f9f04b748ff26b7688d8895
-EBUILD tkman-2.2-r1.ebuild 871 SHA256 9bec3bd9fb429aaee42e2a56c336cf501a4166dbe2bcae14ffdd14a1417b07ba SHA512 297e98221fd32f2fbbda22b43f1174d3e9663cb9631207b3689e81415cffd4887d324cfc44d8e21547b97be2ec62af7de78184805a4ce1c51615aa920580123b WHIRLPOOL 24e98774adadecb4a32bb4ed7656ee8458a147725a6790e3aa32e4aa40dab52b34639ae752327239f118234e27216d275ca20ba6f1ebf52f135e649ff42ac441
-MISC ChangeLog 2990 SHA256 a4118166b9685a476cbb57d230b12ae538fb58f2ed612025c60f66d47b0feb74 SHA512 7b650c8e9c7c44bb7ff5abad7f175dc12238a769b0987824bdf31ab2d1c52a070ca5a8218f1906a35474d94c70a33380937e23bbca386ad39d405e8758a0d258 WHIRLPOOL b32d6ad87b0acc0b8d9e202fc7093face20848fbd1fa714a6b6931eb64d53eece44f24f0fcef6920b7ff89e7daf4e47a5e38c58579489448df21a02de46a6689
-MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
+EBUILD tkman-2.2-r1.ebuild 861 SHA256 4df0c4a35494159224dbf357f8025318073ec2d06f0891224fe6682c110b49d8 SHA512 f3fa56c37155d1c957e06a739f245f8804600ace547e4ee15b4538dcf8bcf7060ad2356e482d4d499f27af1110656ea0468292a52607a82a59edc9f80f0f836e WHIRLPOOL b812342bf99fc046f6c2fab6040e4c29efbfe7a73e2ededd4e8496932fbe1e63e67e22717ef1fcd08c78a293693f4cd47fbb95249063c36d51bc896daf0b69bf
+MISC ChangeLog 3154 SHA256 b6481a77d46055c1010e4b32250590fb90d972ef0682d8837e86e987079f7089 SHA512 9465933f5f490418dea73f93ec5d69d3dce1ba0fd305a437b2f7e464599aeb0622da3cd66a608c1d965d3a103181673dac5cead5e91e0e846a32a325f1deb1fe WHIRLPOOL 8b1490c331d3ecc821ac03ba4ccd48026868c8aeadf544101fe1082d374d299d7cb87006ada699d492250acd8fb996c2ee9faf24b4bbf4127a67e0242c0e8fd8
+MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlQlxzIACgkQ2ugaI38ACPA8EQD+PqL10NybDEt4NwBgIzxYcSpa
-gvYi5TjVTxJuH/sQbD4A+wZdb/Gpxgkvvk/YuoDnLW5nG7+qvPyH4gHGwqxi6RCj
-=SCRC
+iQJ8BAEBCgBmBQJVC8o+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirZGkP/0LWs3UiKBOqDAZd4bZ8lYte
+Lzgobkakyigj0wC2RUW0WTvdFfV7LHhM2UiuPUyOo3wtKp/adYGU3xh4RyUs8/vp
+7PWlPw9LbKpYhMcb9z2dKII4TZqO/bFrKtGPQgIYQI1/r+k9y975LMiaA/h59kId
+naXUcOMyePnikb+nmAtDR33H2Aehm90LYvuCCSlQ586cprkcmu0EqUC5f8LhEGwD
+OeGgEhM9iYosCS9+pe+NiIJJekVMSp7QD+aQVM54VHBEhvlF5Z4lkKtWmkUInnW6
+2vZ0rTDUQwyMPg35fThIRZSb5pCEj+cZp/vfsl69725QjKR1lLJqqYGy93uUqrIb
+EfVvS6XP4aEQIFg0cTWxloSCI5OblDqqM1J1Emq78bp4Kh0B/yRqpsPODcCyOPuf
+HObmYAa8NLbAmpiqt4dvDXoNti4+RawOkc2k160//yImuPlgA1kNu5fk1pzwguWD
+vCDNrTrzDNVcTNNM+yQWGI4MAtURWTAWEp/2C6OOAGss6drGUD8rOidX78lT26u+
+9O8eWJXk3nm/NLvJTvuWpUX8jbKCIVZ+hRjni8pBALdcjfhwWKELY2AqNvyruVjR
+a+ov0Y+C63wh6xWyDtvIazj1ek+iT6rEpK9kyBCNYmkTvUUfdI0ueGPBZwf63uI6
+q8H8QxhUOUcZKBex5yxM
+=c6fL
 -----END PGP SIGNATURE-----
diff --git a/app-text/tkman/files/tkman.desktop b/app-text/tkman/files/tkman.desktop
index 322af4bde940..25a2cdcbf790 100644
--- a/app-text/tkman/files/tkman.desktop
+++ b/app-text/tkman/files/tkman.desktop
@@ -5,5 +5,5 @@ Exec=tkman
 Icon=TkMan.gif
 Terminal=false
 Type=Application
-Categories=Application;Utility;
+Categories=Utility;
 
diff --git a/app-text/tkman/metadata.xml b/app-text/tkman/metadata.xml
index d9cd2cad66c2..1470e032181b 100644
--- a/app-text/tkman/metadata.xml
+++ b/app-text/tkman/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-text/tkman/tkman-2.2-r1.ebuild b/app-text/tkman/tkman-2.2-r1.ebuild
index e7eb4c6a75bf..83c1ca40b6d6 100644
--- a/app-text/tkman/tkman-2.2-r1.ebuild
+++ b/app-text/tkman/tkman-2.2-r1.ebuild
@@ -1,8 +1,9 @@
-# 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/app-text/tkman/tkman-2.2-r1.ebuild,v 1.8 2014/01/25 03:47:24 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tkman/tkman-2.2-r1.ebuild,v 1.9 2015/03/20 07:20:29 jlec Exp $
 
 EAPI=5
+
 inherit eutils
 
 DESCRIPTION="TkMan man and info page browser"
@@ -14,24 +15,27 @@ SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND=">=app-text/rman-3.1
-	>=dev-lang/tcl-8.4
-	>=dev-lang/tk-8.4"
+DEPEND="
+	>=app-text/rman-3.1
+	>=dev-lang/tcl-8.4:0
+	>=dev-lang/tk-8.4:0
+	"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2-gentoo.diff
-	epatch "${FILESDIR}"/${PN}-CVE-2008-5137.diff #bug 247540
+	epatch \
+		"${FILESDIR}"/${PN}-2.2-gentoo.diff \
+		"${FILESDIR}"/${PN}-CVE-2008-5137.diff #bug 247540
 }
 
 src_install() {
-	dodir /usr/bin
-	make DESTDIR="${D}" install
+	local DOCS=( ANNOUNCE-tkman.txt CHANGES README-tkman )
+	local HTML_DOCS=( manual.html )
 
-	dodoc ANNOUNCE-tkman.txt CHANGES README-tkman manual.html
+	dodir /usr/bin
+	default
 
-	insinto /usr/share/icons
-	doins contrib/TkMan.gif
+	doicon contrib/TkMan.gif
 
 	domenu "${FILESDIR}"/tkman.desktop
 }