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

Package-Manager: portage-2.1.4

6 files changed, 53 insertions, 111 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/Manifest b/sci-misc/gato/Manifest
index cfb114cb0b20..9edbe9bb5c17 100644
--- a/sci-misc/gato/Manifest
+++ b/sci-misc/gato/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gato-0.99-python.patch 878 RMD160 98386b37a20f7e3cca946223de6f3f4275011d0c SHA1 e4e634cda1edcff46d515eac86ccd1d6b0e99921 SHA256 a90b44daeedfda74f859a7bce844116da5e1966ea5d397ea957f830b2024477a
 MD5 b8f6645f4e48706ea447be11f48fbe69 files/gato-0.99-python.patch 878
 RMD160 98386b37a20f7e3cca946223de6f3f4275011d0c files/gato-0.99-python.patch 878
@@ -10,38 +13,36 @@ AUX gato-python2.4-gentoo.patch 6372 RMD160 80030bee565ebba6eea1700ef5e73f858767
 MD5 796946a23554105785f59fa99c4a460f files/gato-python2.4-gentoo.patch 6372
 RMD160 80030bee565ebba6eea1700ef5e73f858767ffa1 files/gato-python2.4-gentoo.patch 6372
 SHA256 72d43825f8e2040a110b2ec54da2e8bdea7a4f168212bb94c42ab435783e1bfa files/gato-python2.4-gentoo.patch 6372
-DIST Gato-0.98P.tar.gz 178368 RMD160 37abecb3e8052c62d05c071c39afd940524aca74 SHA1 b63cb0ac2eb48c95e259350d1ba2a21d3ddc5a5d SHA256 fc52f2be8eadb6f12cfa017a1e7ec40af7eb9db37177f325183b8cff20b8b379
 DIST Gato-0.99.tar.gz 186494 RMD160 a5bd815645fc2cd39691846223d2830677bf7527 SHA1 72131a08ee2e5046c24d3bb9a568138c50494756 SHA256 881bab443d56cafe7f2b58771be69bfc5156ab6fcdc76a07d1b6fa693821cb31
 DIST Gato-0.99C.tar.gz 194234 RMD160 220e41a80c806f548bfc22c926df7d456128e991 SHA1 c8a870f74f2e8cf75cb592c47225ed1855108ca7 SHA256 21f946ac9fa46b76e9224028d658eb8f5494c1171854efa65f3d8d3e8569c507
-DIST Gato-Doc-0.98P.tar.gz 169996 RMD160 9e2fc6070041f5b05e62547ace49e1e112888deb SHA1 bc037a85c1865f24099aab3026e425cc4e3e67a2 SHA256 6ff34f336f8773ba0e446876f416d042ed8987588d3fdc23fed252d531e056b5
 DIST Gato-Doc-0.99.tar.gz 122019 RMD160 0ca1692f427b49a8e50ab7b25445b6ba12f9574d SHA1 200ac3804a1713b66c203e93e74a7549e8bc85c1 SHA256 084a7ce1df1016d11a24683f7650ea20a59a774b3e070a67c169a0ac13757fc5
 DIST Gato-Doc-0.99C.tar.gz 68349 RMD160 92dc6c63945cd76f639121377b996bde7a00813b SHA1 b607774f86008df5c7d12bb728c921ef4ff59cfc SHA256 542514880d40afaafb95bfd80c52f26d02d38ad25c5610f0df404d36f24a449b
-EBUILD gato-0.98p.ebuild 1405 RMD160 120e5100ab8e32f63ff6a837ee11dd273cd306d1 SHA1 b1905241aa272d80260d44cdbc702e49e95070ff SHA256 51f0fcdeab232120c594025f34a0af1fbb974a0d278b3f47e7693d689dc13eda
-MD5 04089e0e9b55bfa6965e50b7800277af gato-0.98p.ebuild 1405
-RMD160 120e5100ab8e32f63ff6a837ee11dd273cd306d1 gato-0.98p.ebuild 1405
-SHA256 51f0fcdeab232120c594025f34a0af1fbb974a0d278b3f47e7693d689dc13eda gato-0.98p.ebuild 1405
 EBUILD gato-0.99.ebuild 1393 RMD160 0e1a4c488d81b3ad18b2b08d7d5d68c9cd26958d SHA1 8efbe4bd7fecf88004a73311bfc70f5d2aaa96c8 SHA256 eb71d1b392590c325b3cf54bbbcef70c2a24aa30cd3ce49c26de9a5d3c7b02c1
 MD5 df229bd5e299c0f3364e4fe0b179b6ec gato-0.99.ebuild 1393
 RMD160 0e1a4c488d81b3ad18b2b08d7d5d68c9cd26958d gato-0.99.ebuild 1393
 SHA256 eb71d1b392590c325b3cf54bbbcef70c2a24aa30cd3ce49c26de9a5d3c7b02c1 gato-0.99.ebuild 1393
-EBUILD gato-0.99c.ebuild 1402 RMD160 45a578a6591d23f11285fe64809716a0a9119ea6 SHA1 3b9d8bf5768aaad650eac601109d3656e9f7f4f7 SHA256 d189cdd5445613b6d1b2170526461b606b50752bd09e42adea6267fdeb478a99
-MD5 6b19026acccf2d67ed7b50c53d347070 gato-0.99c.ebuild 1402
-RMD160 45a578a6591d23f11285fe64809716a0a9119ea6 gato-0.99c.ebuild 1402
-SHA256 d189cdd5445613b6d1b2170526461b606b50752bd09e42adea6267fdeb478a99 gato-0.99c.ebuild 1402
-MISC ChangeLog 1491 RMD160 0dc8f8908aeeffd3936fb3976534348461a7597f SHA1 320e43118b1e02b439f9a251db9b7e870ed3d8f8 SHA256 f33ac525855a019dcb8804245bc1dda900b6b52c4ef170f1ca11a654b9c54e7d
-MD5 d2a622a3d0f3cc9ad90cdac81ae1730c ChangeLog 1491
-RMD160 0dc8f8908aeeffd3936fb3976534348461a7597f ChangeLog 1491
-SHA256 f33ac525855a019dcb8804245bc1dda900b6b52c4ef170f1ca11a654b9c54e7d ChangeLog 1491
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
-SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
-MD5 3432d6f2262c15aa00e879c70991728e files/digest-gato-0.98p 476
-RMD160 38be5dd8bfff6b8d51546be121fbf91d5c632607 files/digest-gato-0.98p 476
-SHA256 78890933badd43d28c79bc442322babec0453123cb81eddedee933057f425c89 files/digest-gato-0.98p 476
+EBUILD gato-0.99c.ebuild 1444 RMD160 c2b1df92fd51240590cddfcf6b3ea0760e6e99c1 SHA1 d403034e585794747d5e9d41bc3bb186718efb52 SHA256 4d8370881ec19168ba718e3bf00c85bbd8c9367d5ca42a9093f848d08b4925cf
+MD5 b52be2f9c08e65356ea6a1b00cd89734 gato-0.99c.ebuild 1444
+RMD160 c2b1df92fd51240590cddfcf6b3ea0760e6e99c1 gato-0.99c.ebuild 1444
+SHA256 4d8370881ec19168ba718e3bf00c85bbd8c9367d5ca42a9093f848d08b4925cf gato-0.99c.ebuild 1444
+MISC ChangeLog 1675 RMD160 77d76bbef97794da74793f487abfb7190e7893ae SHA1 7fc1801d022a4190bde612232587d1c02060f7ff SHA256 e7e78d07210f9adc891837a12fdd9bb55b71192156f4841c632ff51167939fac
+MD5 d8f73ed922231681a0bebee675f12704 ChangeLog 1675
+RMD160 77d76bbef97794da74793f487abfb7190e7893ae ChangeLog 1675
+SHA256 e7e78d07210f9adc891837a12fdd9bb55b71192156f4841c632ff51167939fac ChangeLog 1675
+MISC metadata.xml 322 RMD160 eb8906647d81f389ea120ee66214c8b9c9bd98cd SHA1 289bd59600f0523ed11e65dac2eccd1aaf413b14 SHA256 1d2dab91c811cea360ef97069d52e624ccfb15152575869ae404ece703323334
+MD5 a28825e579373d69fb850135e4f21ee8 metadata.xml 322
+RMD160 eb8906647d81f389ea120ee66214c8b9c9bd98cd metadata.xml 322
+SHA256 1d2dab91c811cea360ef97069d52e624ccfb15152575869ae404ece703323334 metadata.xml 322
 MD5 e437e2ffa860edbb4b1be3f3165a06f3 files/digest-gato-0.99 470
 RMD160 cfcb7e7147672c81da11f2375886e0aa9e8d0dda files/digest-gato-0.99 470
 SHA256 55f85566ddcac9743ead6df3bcad526a22f652965fbde418cf24dd0abb7dd0b8 files/digest-gato-0.99 470
 MD5 4bf2cc25384a283c3fc9b739d7c6799d files/digest-gato-0.99c 473
 RMD160 3a978b0aaa8f4781f2042a1224fbd093d9c5721f files/digest-gato-0.99c 473
 SHA256 453dbd0cd87e7ee381ed196cd0d38b497df3485d3cdd635fe7baed1438e1ea46 files/digest-gato-0.99c 473
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHn0Bf1ycZbhPLE2ARAqnXAJsE0tBgCOIa8/M06bdvtYwxBF0hzwCeN7Dn
+l8C+Y1wLpRQBAAEE103DXxQ=
+=wkaI
+-----END PGP SIGNATURE-----
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>