Fix tcl/tk slotting; bump EAPI=5

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

6 files changed, 86 insertions, 66 deletions

diff --git a/app-cdr/tkdvd/ChangeLog b/app-cdr/tkdvd/ChangeLog
index ff72ef617dce..d2b728de46a2 100644
--- a/app-cdr/tkdvd/ChangeLog
+++ b/app-cdr/tkdvd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/tkdvd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/ChangeLog,v 1.20 2012/09/05 08:36:57 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/ChangeLog,v 1.21 2015/03/19 13:34:34 jlec Exp $
+
+*tkdvd-4.0.9-r1 (19 Mar 2015)
+
+  19 Mar 2015; Justin Lecher <jlec@gentoo.org> +tkdvd-4.0.9-r1.ebuild,
+  -tkdvd-4.0.8.ebuild, metadata.xml, tkdvd-4.0.7.ebuild:
+  Fix tcl/tk slotting; bump EAPI=5
 
   05 Sep 2012; Justin Lecher <jlec@gentoo.org> tkdvd-4.0.7.ebuild,
   tkdvd-4.0.8.ebuild, tkdvd-4.0.9.ebuild:
diff --git a/app-cdr/tkdvd/Manifest b/app-cdr/tkdvd/Manifest
index 320f113363e4..5c3a54b4c353 100644
--- a/app-cdr/tkdvd/Manifest
+++ b/app-cdr/tkdvd/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST tkdvd-4.0.7.tar.gz 69590 SHA256 9a69f2375bfd4170f8565307eadf8bbec1148a38040eb136395a7e27f45e8ab7 SHA512 8da0fd166b0d04ad194339b9834c31f5ed5d04e866b38a3b9f6ada9a9e39147853d81293a823237bf8c5c25ec1d78e9f7bc7a6ec571219222fc9fa7f6a3c3b1c WHIRLPOOL aaebf931f668be7740473c6d5873578560db794d15dfb75b4d13f832fa378a89badccea44e15d6b0bbfb10e1dd5382d634fcbec1be9f32774793e3e9cfcb2013
-DIST tkdvd-4.0.8.tar.gz 71721 SHA256 0cc4ae70566b13e618326ceb1f83855566ede10e07c5ee88fd33266137d57f9c SHA512 dd48684cdbcc76f897e10858aa548055a11762b61f6a0100257bca34d387a186d597120761a26051e12c6885366bfd34b7db1bfb3f23af4c67bbdaa746f59a9f WHIRLPOOL af499cac0686ce88a98b0ffc8427aaaae8181d7233f93df035ee8332ca34c953b122cffb75e4780e178efbd50e62df1f12c40fc9434eec2249dd155d17ab6ccf
 DIST tkdvd-4.0.9.tar.gz 71046 SHA256 0e9cbc014699eb6c423f8b88a728ba8dd5519928f4968f68a94f8a0a81651ac7 SHA512 948cbbf98338aaf92e4e74e81fbd996d7646f6737a7adfad16063bd8747994e33e034b277942536423d9c099f85dec6649c2be6f1a0e1efba8da7537ea426820 WHIRLPOOL 92bcfdd2fddfc85a323bef6de26b58caa7d7a7632d4a5210eb8ecb058d401a64077d5ce6549366eeb9569cd3084a3dd7b13bf4114f9e43c04291fe801d1d70b2
-EBUILD tkdvd-4.0.7.ebuild 914 SHA256 bb2ca5a6a28b117b52ef4497d049fe33e739a20247592fc4cc2ba36d1de4aa2e SHA512 7f756df9173ca11258f806304b12674c98511a2d90d98ecb234f270fce47644ebcc7882e1f1069028e7781cc5ea06a975e9fa02caaa26bbef0d3aca5d9de7b0d WHIRLPOOL ca9df8bfd1ff5e2d34ef25c6ac74734d0bccfa61574dca4a4465aadb304a4a986bcfe9ba823b784d1d36fc955e3903ccf75a984b39dc962ee5b78d08a99b42c5
-EBUILD tkdvd-4.0.8.ebuild 954 SHA256 65d0f1e09dcf81a3c3be260903ce219b3128b4045e10477e04cb38b0651330b2 SHA512 02c442a21bd387898d0bc02e29534417ca06ca233c7f71ee1df3b06fce0ba1742641b97847f912f63ebcb0170180e64ad50ba17b0555a9dbbdf6f2b27152adb0 WHIRLPOOL 2b57bcd4d72d060c70ec06316af0a0f98c1ed5268baa5bf56aa4e12078bc9ca49620a4d296b86dab50a6118ce7a46980fca922faea0ce58bfbad8f0782f0b895
+EBUILD tkdvd-4.0.7.ebuild 913 SHA256 80b3f18af99d3eb4b7ef789f85c2432a6d542b83032a8e0e970daf5089cbedd7 SHA512 42ffc7d7e9c38cd304eff9876717fc4d366255ff10f68eca3f85a60ffe8f097c2cb9e9da90229bb139d52affea76d525ebe57bd21198bfe87dad1e533c465a46 WHIRLPOOL 0ddbbc7a286b0ff70845d3cf776bb765a4fb59a5cb6b168fec957a8c03f9676481c90d04e57b7ac94bd04c891dbed03c1c3525ede93446a3dade9f113d75ae5c
+EBUILD tkdvd-4.0.9-r1.ebuild 914 SHA256 62eccf8306a5ce66f5603a9b885da2091ddb077bdf3b50d886d1877ff835d2a3 SHA512 2ecd2f197c2d00fdb8c92be8db2398fc9012c0aad5bc398caba335ab7612b116c073fca0ddb56dcd945ddbaa77dfcb2369868d24445df2b75345e5e6acf6c62d WHIRLPOOL 733bfa2b81715bfb5efb7a32dd80252eefbcdafc15cd9a5f35f805f5fd254b9e45d54b4f219cc55af582b0a381c4e6aa4e95f31e13f01a30be1ada376a09e245
 EBUILD tkdvd-4.0.9.ebuild 954 SHA256 c62d70cd5083d82c61f5647821e29207d0411e125ca4a9d47615e9d5eb961a0b SHA512 9bf283f38e5658d3ecaba902496e9e72179858257f7246715b36494d83fe0820e4d7eb043dcf9da5552121a9dace23f7c9f2c77c78b093fdcb1861284e00c0d4 WHIRLPOOL 58c2b255a1f1793731f10fdfe75138be444803c4ea1a821c5012f3b341b5bb5fd6315a68960cb04f4404f0ebbea71d4be2c763ecbd5a84b554ed71aba91a0be9
-MISC ChangeLog 2765 SHA256 eb39f077b68f2fb2488032b7c4e6f5cfbbee17692531bad588e40da57327b15a SHA512 562d2df04a45643258046618b9cdb87455102c4adce965d4ee7285b2f0f8c241a88cd19fe2a50563a60361112d15e123ccb7aca3fa68d891b8ff5d415e5060f2 WHIRLPOOL 68b82e4cf53ff27dc698f913c634de94ace4141415a7aacba0de287d321dd9f909026b851c191db4d2734ded7b6b745cedeaed85f13be7213ba85b6a20c61c22
-MISC metadata.xml 166 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8 SHA512 1534f47fd560004cf8965363536d60529b5f28a58e26bf3459bc062b76ad89b0310bb4d1e339bf271d6d150026db5a4068ac11f9e2a39b075bb8c26e925e4daa WHIRLPOOL 6373ff408cef4ca611267c74d1217a4addf1c03cf069f6855a19204eebed7a2f17561ea98ad62adab2e540dbdb42d030be15b7ddbd864e94a2bc1112aa68d571
+MISC ChangeLog 2960 SHA256 7ce17bbf3d9dc80ce1971ccb0bd78c132412f4d40f52c5f9f50ac670b7c3b5e7 SHA512 9e2757c4bd5115ed72a4bc6df484fcb23606062c297b6837d7a773b7566388020da4e81530e42994043f3c358bdb5c9698701656f0299c21972aabf4e5d67ce8 WHIRLPOOL a5a6cdc3ef4a5e1e3091e0dbfef5d85a3ce2acaf5e31a7f65f7bfae6172a7aedfec37ed2f466bbc6b8909f6edc3d56bdcdd43221cc304a2d78ee56f2ea237206
+MISC metadata.xml 168 SHA256 657ae402ef03783bd5a6d6591ae9d9cfe9301854ff6794f0a83bc336c1506cff SHA512 81c7c0ab0cf977bfa3cd708909fb393b23aed876b5b09f97533e8c7f5b19a69425e0dfc163eaa179fa5c7dc75d5471c08965e75787ddab6aa7dfa7ea89fb282a WHIRLPOOL d481cfc8175ed27c6b2dc65573b9012ac930aea96a2ccb4f8ba4f15349b0030069324d70356960036dbb217adb1675bf206e7b38e5d000800c5d00574d749fb2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlBHDy4ACgkQgAnW8HDreRZsRACdEytWSuRtFnewsMsozgee25pJ
-c5EAn2kfD0VGSKRpaIbhxBr8Ef+MPDBc
-=A8zG
+iQJ8BAEBCgBmBQJVCtBrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirAiAP/0grOyQhWUYgg7R6bWSC7Hak
+ZLwYmAa23UzSQYWaTwOpGUzXkcS2tkiiIlMQDiSQlEWqtOfl9DEd4ENnkNM9vn27
+bZFVihekVpzZqgsrRfXEQDSTp0xUEw8ra+tMFRl6+k32MPZtzFO0K0Ssz40uaRQq
+eFfmpP9yfLun4M/GU7keNxV2LDmAlBPrn8DqJUQDf/FbhbxTCF5ZMeCK4JLQVRo1
+aJqAKonBMK3xUkvLoZ586ASFj5Q9sDfEjiotfw3kPnyqPm/icoBHEpgxyxSQVkva
+RgeDMG7VEz8W7ETvpcehaP2pMtqYBF1u7E+pEmch3HmPblGGQhAwszpDHPrKyaJE
+ArQHU5kCA+vwoquJ45VWQ81nku+38eLtP8yJg94W6McD7O+uTP2ry+08yabJ+Ekm
+QsgaWiJIxj6VBV7YeChDYHASxWYH9CBnwddKgf0MCl1O37Yxypp0efUSTfrWrGDS
+iOdYvfjlfnaB73SwJX48E5ZT+YVcXplYLHmR7QhrPECPLF1cK+ebx08Tu20QieY8
+hgXWXIVomnmGaGzYnTqvZ592zscFVC0cK/Qi/Llb8PwrDUbnYJ8wrCpOY9fQxvgn
+7WVFZSDaKN6fyE/XZl+1eeJRGcLH4P0A2S7jgVQqiZwQ6KTu+gu3S23lEpoRPdf2
+VNxDwP8fO5o/NikMN1pB
+=Hrb2
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/tkdvd/metadata.xml b/app-cdr/tkdvd/metadata.xml
index 3ca6ae763b34..8f92762cc1c9 100644
--- a/app-cdr/tkdvd/metadata.xml
+++ b/app-cdr/tkdvd/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>media-optical</herd>
+  <herd>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/tkdvd/tkdvd-4.0.7.ebuild b/app-cdr/tkdvd/tkdvd-4.0.7.ebuild
index 27a7edc567c5..41dc14c105fd 100644
--- a/app-cdr/tkdvd/tkdvd-4.0.7.ebuild
+++ b/app-cdr/tkdvd/tkdvd-4.0.7.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/app-cdr/tkdvd/tkdvd-4.0.7.ebuild,v 1.4 2012/09/05 08:36:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.7.ebuild,v 1.5 2015/03/19 13:34:34 jlec Exp $
 
 inherit eutils
 
@@ -13,10 +13,11 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-RDEPEND="virtual/cdrtools
-	 app-cdr/dvd+rw-tools
-	 dev-lang/tcl
-	 dev-lang/tk"
+RDEPEND="
+	virtual/cdrtools
+	app-cdr/dvd+rw-tools
+	dev-lang/tcl
+	dev-lang/tk"
 
 S=${WORKDIR}/tkdvd
 
diff --git a/app-cdr/tkdvd/tkdvd-4.0.8.ebuild b/app-cdr/tkdvd/tkdvd-4.0.8.ebuild
deleted file mode 100644
index 0f1346a9b541..000000000000
--- a/app-cdr/tkdvd/tkdvd-4.0.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.8.ebuild,v 1.2 2012/09/05 08:36:57 jlec Exp $
-
-inherit eutils
-
-DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs"
-HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/"
-SRC_URI="http://regis.damongeot.free.fr/tkdvd/dl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="virtual/cdrtools
-	 app-cdr/dvd+rw-tools
-	 dev-lang/tcl
-	 dev-lang/tk"
-
-S=${WORKDIR}/tkdvd
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/${PF}/src
-	doins src/* || die "doins failed."
-
-	exeinto /usr/share/${PF}
-	doexe TkDVD.sh || die "doexe failed."
-
-	dodir /usr/bin
-
-	cat <<- EOF >"${D}"/usr/bin/tkdvd
-	#!/bin/sh
-	cd /usr/share/${PF}
-	./TkDVD.sh
-	EOF
-
-	fperms 755 /usr/bin/tkdvd
-
-	dodoc ChangeLog FAQ README TODO doc/config_file
-	dohtml doc/combobox.html
-
-	doicon icons/*.png
-}
diff --git a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
new file mode 100644
index 000000000000..f3bc3a3b5fde
--- /dev/null
+++ b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild,v 1.1 2015/03/19 13:34:34 jlec Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs"
+HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/"
+SRC_URI="http://regis.damongeot.free.fr/tkdvd/dl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-cdr/dvd+rw-tools
+	dev-lang/tcl:0
+	dev-lang/tk:0
+	virtual/cdrtools
+"
+
+S=${WORKDIR}/tkdvd
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/${PF}/src
+	doins src/*
+
+	insinto /usr/share/${PF}
+	doins TkDVD.sh
+
+	cat <<- EOF >"${T}"tkdvd
+	#!/bin/sh
+	cd /usr/share/${PF}
+	sh TkDVD.sh
+	EOF
+
+	dobin "${T}"tkdvd
+
+	DOCS=( ChangeLog FAQ README TODO doc/config_file )
+	HTML_DOCS=( doc/combobox.html )
+	einstalldocs
+
+	doicon icons/*.png
+}