Modernized ebuild, make it more portable. Fix for tkinter and libdirs.

(Portage version: 2.1.4)

5 files changed, 31 insertions, 90 deletions

diff --git a/sci-misc/gato/ChangeLog b/sci-misc/gato/ChangeLog
index 9e06f22f935e..beb700554301 100644
--- a/sci-misc/gato/ChangeLog
+++ b/sci-misc/gato/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-misc/gato
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/ChangeLog,v 1.8 2008/01/29 13:34:40 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/ChangeLog,v 1.9 2008/01/29 15:03:51 bicatali Exp $
+
+  29 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  -gato-0.98p.ebuild, gato-0.99c.ebuild:
+  Modernized ebuild, make it more portable. Fix for tkinter and libdirs.
 
 *gato-0.99c (29 Jan 2008)
 
diff --git a/sci-misc/gato/files/digest-gato-0.98p b/sci-misc/gato/files/digest-gato-0.98p
deleted file mode 100644
index 2838712d92d4..000000000000
--- a/sci-misc/gato/files/digest-gato-0.98p
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 983fa4ba4581a7cb786903fff040dcd6 Gato-0.98P.tar.gz 178368
-RMD160 37abecb3e8052c62d05c071c39afd940524aca74 Gato-0.98P.tar.gz 178368
-SHA256 fc52f2be8eadb6f12cfa017a1e7ec40af7eb9db37177f325183b8cff20b8b379 Gato-0.98P.tar.gz 178368
-MD5 15a4387363c161cb8287352916ba0b0c Gato-Doc-0.98P.tar.gz 169996
-RMD160 9e2fc6070041f5b05e62547ace49e1e112888deb Gato-Doc-0.98P.tar.gz 169996
-SHA256 6ff34f336f8773ba0e446876f416d042ed8987588d3fdc23fed252d531e056b5 Gato-Doc-0.98P.tar.gz 169996
diff --git a/sci-misc/gato/gato-0.98p.ebuild b/sci-misc/gato/gato-0.98p.ebuild
deleted file mode 100644
index 448d4a456e39..000000000000
--- a/sci-misc/gato/gato-0.98p.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/gato-0.98p.ebuild,v 1.4 2008/01/29 13:34:40 markusle Exp $
-
-inherit eutils
-
-MY_P="Gato"
-MY_PV="0.98P"
-
-DESCRIPTION="Graph Animation Toolbox"
-LICENSE="LGPL-2"
-HOMEPAGE="http://gato.sourceforge.net/"
-SRC_URI="http://gato.sourceforge.net/Download/${MY_P}-${MY_PV}.tar.gz
-		doc? ( http://gato.sourceforge.net/Download/${MY_P}-Doc-${MY_PV}.tar.gz )"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="dev-lang/python
-		dev-lang/tk"
-
-S="${WORKDIR}"/Gato
-GATO_DOC="${WORKDIR}"/Doc
-
-src_unpack() {
-	unpack ${A}
-
-	# convert to python2.4
-	epatch "${FILESDIR}"/gato-python2.4-gentoo.patch
-
-	cd "${S}"
-	# change TKinter call to avoid crashing of X
-	sed -e "s:self.overrideredirect(1):self.overrideredirect(0):" \
-		-i GatoDialogs.py || die "failed to patch GatoDialogs.py"
-}
-
-src_install() {
-
-	# install python code
-	insinto /usr/lib/${PN}
-	doins *.py || die "Failed to install python files"
-	fperms 755 /usr/lib/${PN}/Gato.py /usr/lib/${PN}/Gred.py
-
-	# create symlinks
-	dodir /usr/bin
-	dosym /usr/lib/${PN}/Gato.py /usr/bin/gato
-	dosym /usr/lib/${PN}/Gred.py /usr/bin/gred
-
-	# install data files
-	insinto /usr/share/${PN}
-	doins BFS.* DFS.* sample.cat || die "failed to data files"
-
-	# install docs
-	if use doc; then
-		dohtml -r ${GATO_DOC}/*
-	fi
-}
diff --git a/sci-misc/gato/gato-0.99c.ebuild b/sci-misc/gato/gato-0.99c.ebuild
index 06960e23353b..9ce292c49229 100644
--- a/sci-misc/gato/gato-0.99c.ebuild
+++ b/sci-misc/gato/gato-0.99c.ebuild
@@ -1,59 +1,57 @@
 # Copyright 1999-2008 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.1 2008/01/29 13:34:40 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gato/gato-0.99c.ebuild,v 1.2 2008/01/29 15:03:51 bicatali Exp $
 
-inherit eutils
+inherit python eutils multilib
 
-MY_P="Gato"
-MY_PV="0.99C"
+MY_PN="Gato"
+MY_PV=$(echo ${PV} | tr '[:lower:]' '[:upper:]')
 
 DESCRIPTION="Graph Animation Toolbox"
 LICENSE="LGPL-2"
 HOMEPAGE="http://gato.sourceforge.net/"
-SRC_URI="http://gato.sourceforge.net/Download/${MY_P}-${MY_PV}.tar.gz
-		doc? ( http://gato.sourceforge.net/Download/${MY_P}-Doc-${MY_PV}.tar.gz )"
+SRC_URI="http://gato.sourceforge.net/Download/${MY_PN}-${MY_PV}.tar.gz
+	doc? ( http://gato.sourceforge.net/Download/${MY_PN}-Doc-${MY_PV}.tar.gz )"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="doc"
 
-DEPEND=""
-RDEPEND="dev-lang/python
-		dev-lang/tk"
+S="${WORKDIR}"/${MY_PN}
 
-S="${WORKDIR}"/Gato
-GATO_DOC="${WORKDIR}"/Doc
+pkg_setup() {
+	python_tkinter_exists
+}
 
 src_unpack() {
 	unpack ${A}
 
-	# convert to python2.4
+	# convert to python >=2.4
 	epatch "${FILESDIR}"/${P}-python.patch
 
-	cd "${S}"
 	# change TKinter call to avoid crashing of X
-	sed -e "s:self.overrideredirect(1):self.overrideredirect(0):" \
-		-i GatoDialogs.py || die "failed to patch GatoDialogs.py"
+	sed -i \
+		-e 's:self.overrideredirect(1):self.overrideredirect(0):' \
+		"${S}"/GatoDialogs.py || die "failed to patch GatoDialogs.py"
 }
 
 src_install() {
 
 	# install python code
-	insinto /usr/lib/${PN}
+	python_version
+	local instdir=/usr/$(get_libdir)/${python}${PYVER}/${PN}
+	insinto ${instdir}
 	doins *.py || die "Failed to install python files"
-	fperms 755 /usr/lib/${PN}/Gato.py /usr/lib/${PN}/Gred.py
+	fperms 755 ${instdir}/{Gato,Gred}.py
 
 	# create symlinks
 	dodir /usr/bin
-	dosym /usr/lib/${PN}/Gato.py /usr/bin/gato
-	dosym /usr/lib/${PN}/Gred.py /usr/bin/gred
+	dosym ${instdir}/Gato.py /usr/bin/gato
+	dosym ${instdir}/Gred.py /usr/bin/gred
 
 	# install data files
 	insinto /usr/share/${PN}
 	doins BFS.* DFS.* sample.cat || die "failed to data files"
 
-	# install docs
-	if use doc; then
-		dohtml -r ${GATO_DOC}/*
-	fi
+	use doc && dohtml -r "${WORKDIR}"/Doc/*
 }
diff --git a/sci-misc/gato/metadata.xml b/sci-misc/gato/metadata.xml
index b229aec85b8f..340e9aa29d0b 100644
--- a/sci-misc/gato/metadata.xml
+++ b/sci-misc/gato/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<herd>sci-mathematics</herd>
+<longdescription lang="en">
+  Gato - the Graph Animation Toolbox - is a software which visualizes
+  algorithms on mathematical graphs.
+</longdescription>
 </pkgmetadata>