Fix tcl/tk slotting; bump EAPI=5

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 65 insertions, 55 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/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
+}