Moved to EAPI=4, Version Bump, added desktop entry creation, #300400

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 32 insertions, 25 deletions

diff --git a/dev-vcs/tkcvs/ChangeLog b/dev-vcs/tkcvs/ChangeLog
index 19f92875e8bf..48e601ea94e2 100644
--- a/dev-vcs/tkcvs/ChangeLog
+++ b/dev-vcs/tkcvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/tkcvs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tkcvs/ChangeLog,v 1.3 2010/06/22 18:52:18 arfrever Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tkcvs/ChangeLog,v 1.4 2012/01/02 23:52:49 jlec Exp $
+
+*tkcvs-8.2.3 (02 Jan 2012)
+
+  02 Jan 2012; Justin Lecher <jlec@gentoo.org> -tkcvs-8.2.ebuild,
+  tkcvs-8.2.2.ebuild, +tkcvs-8.2.3.ebuild, metadata.xml:
+  Moved to EAPI=4, Version Bump, added desktop entry creation, #300400
 
   22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   tkcvs-8.0.4.ebuild, tkcvs-8.2.ebuild, tkcvs-8.2.2.ebuild:
diff --git a/dev-vcs/tkcvs/metadata.xml b/dev-vcs/tkcvs/metadata.xml
index 173251e809e0..815cc916f2b6 100644
--- a/dev-vcs/tkcvs/metadata.xml
+++ b/dev-vcs/tkcvs/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+	<herd>tcltk</herd>
 </pkgmetadata>
-
diff --git a/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild b/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild
index 512250120f58..368a594f5191 100644
--- a/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild
+++ b/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild
@@ -1,32 +1,34 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild,v 1.2 2010/06/22 18:52:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tkcvs/tkcvs-8.2.2.ebuild,v 1.3 2012/01/02 23:52:48 jlec Exp $
+
+EAPI=4
 
 inherit eutils
 
 MY_P=${PN}_${PV//./_}
+
 DESCRIPTION="Tcl/Tk-based graphical interface to CVS with Subversion support"
-SRC_URI="http://www.twobarleycorns.net/${MY_P}.tar.gz"
 HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
+SRC_URI="http://www.twobarleycorns.net/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/tk-8.4"
+DEPEND="dev-lang/tk"
 RDEPEND="${DEPEND}
 	dev-vcs/cvs
 	dev-vcs/subversion
 	sys-apps/diffutils
 	dev-util/tkdiff"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "/set MANDIR/s/man man1/share man man1/" \
+src_prepare() {
+	sed \
+		-e "/set MANDIR/s/man man1/share man man1/" \
 		-e "/set LIBDIR/s/lib/$(get_libdir)/" \
 		-i doinstall.tcl || die
 }
diff --git a/dev-vcs/tkcvs/tkcvs-8.2.ebuild b/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild
index 5d3406584968..cf81f52cbfc5 100644
--- a/dev-vcs/tkcvs/tkcvs-8.2.ebuild
+++ b/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tkcvs/tkcvs-8.2.ebuild,v 1.3 2010/06/22 18:52:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tkcvs/tkcvs-8.2.3.ebuild,v 1.1 2012/01/02 23:52:49 jlec Exp $
+
+EAPI=4
 
 inherit eutils
 
-MY_P=${PN}_${PV//./_}
 DESCRIPTION="Tcl/Tk-based graphical interface to CVS with Subversion support"
-SRC_URI="http://www.twobarleycorns.net/${MY_P}.tar.gz"
 HOMEPAGE="http://www.twobarleycorns.net/tkcvs.html"
+SRC_URI="http://www.twobarleycorns.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/tk-8.4"
+DEPEND="dev-lang/tk"
 RDEPEND="${DEPEND}
 	dev-vcs/cvs
 	dev-vcs/subversion
 	sys-apps/diffutils
 	dev-util/tkdiff"
 
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -e "/set MANDIR/s/man man1/share man man1/" \
+src_prepare() {
+	sed \
+		-e "/set MANDIR/s/man man1/share man man1/" \
 		-e "/set LIBDIR/s/lib/$(get_libdir)/" \
 		-i doinstall.tcl || die
 }
@@ -40,5 +38,7 @@ src_install() {
 	rm "${D}"/usr/bin/tkdiff
 
 	# Add docs...this is important
-	dodoc CHANGELOG FAQ
+	dodoc {CHANGELOG,FAQ}.txt
+
+	make_desktop_entry ${PN} TkCVS "${EPREFIX}"/usr/$(get_libdir)/tkcvs/bitmaps/ticklefish_med.gif
 }