Version Bump, QA cleanup

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 88 insertions, 32 deletions

diff --git a/sci-misc/gato/ChangeLog b/sci-misc/gato/ChangeLog
index 55adb1593368..7bb59a80cfc3 100644
--- a/sci-misc/gato/ChangeLog
+++ b/sci-misc/gato/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-misc/gato
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/ChangeLog,v 1.12 2010/06/04 16:20:34 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/ChangeLog,v 1.13 2010/06/24 12:51:38 jlec Exp $
+
+*gato-1.02 (24 Jun 2010)
+
+  24 Jun 2010; Justin Lecher <jlec@gentoo.org> gato-0.99c.ebuild,
+  -files/gato-0.99c-python.patch, +gato-1.02.ebuild:
+  Version Bump, QA cleanup
 
   04 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gato-0.99c.ebuild:
diff --git a/sci-misc/gato/Manifest b/sci-misc/gato/Manifest
index 5d2d2ded55a0..44b37404f2ed 100644
--- a/sci-misc/gato/Manifest
+++ b/sci-misc/gato/Manifest
@@ -1,6 +1,17 @@
-AUX gato-0.99c-python.patch 654 RMD160 622d25dc97ea498cccc9f8288fd321a918299cd9 SHA1 2b00aa49eb46302ce811c06e7003138f51e2728f SHA256 0ed1b4d02e893f8318ee0a3a0f28dd7bcdb9b1f5f3b590a4d60eec9724684cc3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Gato-0.99C.tar.gz 194234 RMD160 220e41a80c806f548bfc22c926df7d456128e991 SHA1 c8a870f74f2e8cf75cb592c47225ed1855108ca7 SHA256 21f946ac9fa46b76e9224028d658eb8f5494c1171854efa65f3d8d3e8569c507
+DIST Gato-1.02.tar.gz 182323 RMD160 36feb189bf2a307c2d70b84757f1a639641c6169 SHA1 ac649f9f71c5ab4e06199f2ed40f1ecb85ce7c78 SHA256 28632f326429534ccc4919b49aedb4b4b210ac9318024a0aa677a37239231035
 DIST Gato-Doc-0.99C.tar.gz 68349 RMD160 92dc6c63945cd76f639121377b996bde7a00813b SHA1 b607774f86008df5c7d12bb728c921ef4ff59cfc SHA256 542514880d40afaafb95bfd80c52f26d02d38ad25c5610f0df404d36f24a449b
-EBUILD gato-0.99c.ebuild 1611 RMD160 aabfb627e4f93cef60b7d2acf929de4d70cf6d47 SHA1 6b634af1a78dc09d800b1e42ea42e5db598eefd7 SHA256 f627bf7cec5133b39ee4ccbad3b482638481131af4ec0db744a71360c6a3437b
-MISC ChangeLog 2107 RMD160 8c592a445dcdc27f8b81f069320d7ec33e3ef65c SHA1 8549c8f428eb40646599b143f74a3e9fe04eeb8f SHA256 6a7930c82c8e42a24875e5b2a4115872048e7ab373a6bdd1ade56746ad284b5e
+EBUILD gato-0.99c.ebuild 1519 RMD160 d075fae03ff053d2ed5929e9cb658560d4bf87c8 SHA1 2ba8a50c95e29bc314ce597f6826ecdea1467c64 SHA256 a3606d2710a189636d4a9190091cb273e70ad515fa2f54d8fcaa83eb2fb2d039
+EBUILD gato-1.02.ebuild 1397 RMD160 f3953e3d725dea45072eafbcac8e129644076386 SHA1 62a493d9ce15349d68ab7fb34894a449f29c9218 SHA256 879deffce3a0037a476f97c2ed12751fd686659eea5d8cffee7ccb0c3072a0ae
+MISC ChangeLog 2276 RMD160 0bbba3d314383893810b9c9ad0a4d24ffc4615df SHA1 ecb4bc9b1661933fe58dcbfb18a2383b1ee6311b SHA256 1297838a434142894d1ac54b5eb7a474fb1a1f3466f354d8b925dc4bc45d6223
 MISC metadata.xml 322 RMD160 eb8906647d81f389ea120ee66214c8b9c9bd98cd SHA1 289bd59600f0523ed11e65dac2eccd1aaf413b14 SHA256 1d2dab91c811cea360ef97069d52e624ccfb15152575869ae404ece703323334
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwjVN8ACgkQgAnW8HDreRZe8wCgs74ja4ztT23c2tATB+lwRxOK
++s8An2zWS9bNJ467HuElViKtvUdQBcE3
+=v8JE
+-----END PGP SIGNATURE-----
diff --git a/sci-misc/gato/files/gato-0.99c-python.patch b/sci-misc/gato/files/gato-0.99c-python.patch
deleted file mode 100644
index 01fea326a86c..000000000000
--- a/sci-misc/gato/files/gato-0.99c-python.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Gato/Gato.py	2008-01-27 14:10:49.000000000 +0100
-+++ Gato-patched/Gato.py	2008-01-27 14:12:37.000000000 +0100
-@@ -1,4 +1,5 @@
--#!/usr/bin/env python2.3
-+#!/usr/bin/env python
-+
- ################################################################################
- #
- #       This file is part of Gato (Graph Animation Toolbox) 
---- Gato/Gred.py	2008-01-27 14:17:02.000000000 +0100
-+++ Gato-patched/Gred.py	2008-01-27 14:17:25.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.3
-+#!/usr/bin/env python
- ################################################################################
- #
- #       This file is part of Gato (Graph Animation Toolbox) 
diff --git a/sci-misc/gato/gato-0.99c.ebuild b/sci-misc/gato/gato-0.99c.ebuild
index 95545640aa97..6e2f355105af 100644
--- a/sci-misc/gato/gato-0.99c.ebuild
+++ b/sci-misc/gato/gato-0.99c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/gato-0.99c.ebuild,v 1.6 2010/06/04 16:26:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/gato-0.99c.ebuild,v 1.7 2010/06/24 12:51:38 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -18,11 +18,9 @@ SRC_URI="http://gato.sourceforge.net/Download/${MY_PN}-${MY_PV}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
-DEPEND=""
-RDEPEND=""
 
 S="${WORKDIR}/${MY_PN}"
 
@@ -32,8 +30,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# convert to python >=2.4
-	epatch "${FILESDIR}"/${P}-python.patch
 	# change TKinter call to avoid crashing of X
 	sed -i \
 		-e 's:self.overrideredirect(1):self.overrideredirect(0):' \
@@ -49,9 +45,8 @@ src_install() {
 	python_convert_shebangs -r 2 "${ED}"
 
 	# create symlinks
-	dodir /usr/bin
-	dosym ${instdir}/Gato.py /usr/bin/gato
-	dosym ${instdir}/Gred.py /usr/bin/gred
+	dosym ${instdir}/Gato.py /usr/bin/gato || die
+	dosym ${instdir}/Gred.py /usr/bin/gred || die
 
 	# install data files
 	insinto /usr/share/${PN}
@@ -61,9 +56,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize gato
+	python_mod_optimize ${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup gato
+	python_mod_cleanup ${PN}
 }
diff --git a/sci-misc/gato/gato-1.02.ebuild b/sci-misc/gato/gato-1.02.ebuild
new file mode 100644
index 000000000000..44b2fbf40560
--- /dev/null
+++ b/sci-misc/gato/gato-1.02.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/gato-1.02.ebuild,v 1.1 2010/06/24 12:51:38 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+
+inherit eutils python
+
+MY_PN="Gato"
+MY_PV=$(echo ${PV} | tr '[:lower:]' '[:upper:]')
+
+DESCRIPTION="Graph Animation Toolbox"
+HOMEPAGE="http://gato.sourceforge.net/"
+SRC_URI="http://gato.sourceforge.net/Download/${MY_PN}-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# change TKinter call to avoid crashing of X
+	sed -i \
+		-e 's:self.overrideredirect(1):self.overrideredirect(0):' \
+		"${S}"/GatoDialogs.py || die "failed to patch GatoDialogs.py"
+}
+
+src_install() {
+	# install python code
+	local instdir=$(python_get_sitedir)/${PN}
+	insinto ${instdir}
+	doins *.py || die "Failed to install python files"
+	fperms 755 ${instdir}/{Gato,Gred}.py
+	python_convert_shebangs -r 2 "${ED}"
+
+	# create symlinks
+	dosym ${instdir}/Gato.py /usr/bin/gato || die
+	dosym ${instdir}/Gred.py /usr/bin/gred || die
+
+	# install data files
+	insinto /usr/share/${PN}
+	doins BFS.* DFS.* sample.cat || die "failed to data files"
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}