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

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 47 insertions, 30 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/Manifest b/dev-vcs/tkcvs/Manifest
index cf82bb072aaa..b8a822aefd80 100644
--- a/dev-vcs/tkcvs/Manifest
+++ b/dev-vcs/tkcvs/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST tkcvs-8.2.3.tar.gz 570910 RMD160 62f80f45341fb4c52212b26845fbb64a8e8c133b SHA1 16e994c638ad42e0ad89f1fe404835d3804e8d6c SHA256 4bfb29dd9ffbbbc1e6e611e1c772af745d742d336e797bf056dbf70116b8e32a
 DIST tkcvs_8_0_4.tar.gz 1147807 RMD160 0dfd12547528a6cdb11cab9eba6d9f590cafbea3 SHA1 437c0c3ca1d6f60bb0043c73bb6ba52b9bc84e14 SHA256 1ab66a218bd12c138a006f45d03bd281ac733dfd2a01a223221cbf514d686ebb
-DIST tkcvs_8_2.tar.gz 1168611 RMD160 93fcb138b7ea0cbeea9e4234c154d24e282f3120 SHA1 a248b8ccbc5bb39d58036761330b0428ef46309b SHA256 99fb93e97c191a0adf98f4c23ae6697d92ed727666bb5d910d504cd324722233
 DIST tkcvs_8_2_2.tar.gz 1183853 RMD160 1a38cd351cdcd557981586c3037944f304f7013d SHA1 88498a77c4eace15f9d29d940e6dde02102a13d1 SHA256 d03cfa701ba4c3e360c6590ea546f9eb1ef8dbff037e62d82f750535b142385c
 EBUILD tkcvs-8.0.4.ebuild 994 RMD160 f1a5f88d97241db9553fd59b4ca7a741fe16e288 SHA1 0a1c711e0a7eb4cc59e0a2cce1ec560ae3c943aa SHA256 0af3c00d4cbc63947f0ce36b05a1ce2873cfcaafc8ce1a631c2a989b4856a125
-EBUILD tkcvs-8.2.2.ebuild 998 RMD160 0ebc8af9866a507c2bd4e6e69b49d447e4dba281 SHA1 9539d6498993380b6ed36c052f9cbdf6b8997f0b SHA256 14f3cb42c5064d7f7b956d5673d56727ba04e2b4b4a21ff6194a7f091d66a88d
-EBUILD tkcvs-8.2.ebuild 996 RMD160 55a6d7e1c0033b3d50f229de87e6fccfcc99a198 SHA1 384aa3e59e66ea20e9599e2b3f627613b75ed3cc SHA256 adcd7655c58d7074106fd50f7adb23d2238910983a2368d8161583d4810cef8d
-MISC ChangeLog 4629 RMD160 309d0a924042b3df8befaea3fead515d1ca2bed8 SHA1 88e21d6981a1524a4a3893ea0664c653a6f01040 SHA256 0cc53ff1de810ae01d1597bc036f2c5deffa6c5df7e69582262004f427b98790
-MISC metadata.xml 159 RMD160 117cc289391c0477579de68e7347628756673eac SHA1 37f242cbf27c6e859fc63487487fdcae09d6931f SHA256 2cf13398186ae4abcd9f41c51ffb3bcdcc7da32df2c2af5c2de2e2cc8ad194ce
+EBUILD tkcvs-8.2.2.ebuild 980 RMD160 3d76afaea994302fa3b858cf291d8a1b69b2b3d5 SHA1 8357c4090a2ec344ba141281188d9606a57d773d SHA256 c083cf4e2a3a292429308aac29a105c4663ccbd2bf14648c9cd4f95a6eb0aea9
+EBUILD tkcvs-8.2.3.ebuild 1033 RMD160 d8dfbfbae68484b243b35ed3e0875a92549b631a SHA1 7dbadedc05df9d96e312be4117afd2e0a7eee90e SHA256 4f08325dc03ba16d50aa019c36202a774b6f98eba5f6f1f95059f3abea138c51
+MISC ChangeLog 4848 RMD160 b68a20014725136c15b4461d83e67b287e8fe0da SHA1 d6230e6d88e2a3f5e5a737d92a4fe1ed683c8c4c SHA256 f9b0ec8151f1eef8a9e5c726c69a5308a6291afaa781f0d021cde795f2c024ee
+MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk8CQ1sACgkQgAnW8HDreRYYhACeKhKMCcQzsGE9S++xrZJOD2ic
+6qgAoJZROUEC42IzedqmUgbtQmmX5Gm9
+=9mu7
+-----END PGP SIGNATURE-----
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
 }