merge fixes from #76204

3 files changed, 33 insertions, 21 deletions

diff --git a/games-kids/pytraffic/Manifest b/games-kids/pytraffic/Manifest
index 5dc27270da5e..6df6005a3870 100644
--- a/games-kids/pytraffic/Manifest
+++ b/games-kids/pytraffic/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dbeff526147a6bb8fbc8005bdf899cce pytraffic-1.2.1.ebuild 888
+MD5 f3be75360eeaeb0b5adc8ea635bf731b pytraffic-1.2.1.ebuild 1041
 MD5 2aea0f8fb60a59ef65946a31fcd31216 ChangeLog 367
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 23d02af40cdc1e4ebd9234573e05b7c2 files/digest-pytraffic-1.2.1 67
-MD5 23fed5e5884473d5939e3fb001e7b48c files/1.2-gentoo-dirs.patch 1545
+MD5 435a1b2a65ae7fc35c83fbeb7397d829 files/1.2.1-gentoo-dirs.patch 1730
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB0+EyroRuSHgZdywRArapAJ91SwOiM7a4mu/2KUR7BIHCrrEv/QCfVidQ
-VxE6QJtVU8SsP8td+cF8lBE=
-=yulo
+iD8DBQFB1O5VroRuSHgZdywRAiyDAJ9wWmLH/+nj6vfewrnLjD9xKqI8NACfcrta
+js4yYMTU6C+TKwUi4OaaaUE=
+=pZpg
 -----END PGP SIGNATURE-----
diff --git a/games-kids/pytraffic/files/1.2-gentoo-dirs.patch b/games-kids/pytraffic/files/1.2.1-gentoo-dirs.patch
index d1b25252616e..cc885ed0f9f4 100644
--- a/games-kids/pytraffic/files/1.2-gentoo-dirs.patch
+++ b/games-kids/pytraffic/files/1.2.1-gentoo-dirs.patch
@@ -1,21 +1,25 @@
-diff -urN PyTraffic-1.2-orig/pytraffic PyTraffic-1.2/pytraffic
---- PyTraffic-1.2-orig/pytraffic	2004-12-27 16:16:15.000000000 -0500
-+++ PyTraffic-1.2/pytraffic	2004-12-27 16:16:51.000000000 -0500
+diff -urN PyTraffic-1.2.1-orig/pytraffic PyTraffic-1.2.1/pytraffic
+--- PyTraffic-1.2.1-orig/pytraffic	2004-12-31 00:08:32.000000000 -0500
++++ PyTraffic-1.2.1/pytraffic	2004-12-31 00:08:57.000000000 -0500
 @@ -1 +1 @@
 -exec python /usr/share/pytraffic12/Game.py 
 +exec python /usr/share/games/pytraffic12/Game.py 
-diff -urN PyTraffic-1.2-orig/pytraffic.desktop PyTraffic-1.2/pytraffic.desktop
---- PyTraffic-1.2-orig/pytraffic.desktop	2004-12-27 16:16:15.000000000 -0500
-+++ PyTraffic-1.2/pytraffic.desktop	2004-12-27 16:17:22.000000000 -0500
-@@ -7,4 +7,4 @@
- Exec=/usr/bin/pytraffic
+diff -urN PyTraffic-1.2.1-orig/pytraffic.desktop PyTraffic-1.2.1/pytraffic.desktop
+--- PyTraffic-1.2.1-orig/pytraffic.desktop	2004-12-31 00:08:32.000000000 -0500
++++ PyTraffic-1.2.1/pytraffic.desktop	2004-12-31 00:09:12.000000000 -0500
+@@ -4,7 +4,7 @@
+ X-Desktop-File-Install-Version=0.2
+ Name=PyTraffic
+ Description=A Python version of the board game Rush Hour created by Binary Arts Coporation.
+-Exec=/usr/bin/pytraffic
++Exec=pytraffic
  Terminal=0
  Type=Application
 -Icon=/usr/share/pytraffic12/ICNS/carNred64x64.png
 +Icon=/usr/share/games/pytraffic12/ICNS/carNred64x64.png
-diff -urN PyTraffic-1.2-orig/setup.py PyTraffic-1.2/setup.py
---- PyTraffic-1.2-orig/setup.py	2004-12-27 16:16:15.000000000 -0500
-+++ PyTraffic-1.2/setup.py	2004-12-27 16:16:51.000000000 -0500
+diff -urN PyTraffic-1.2.1-orig/setup.py PyTraffic-1.2.1/setup.py
+--- PyTraffic-1.2.1-orig/setup.py	2004-12-31 00:08:32.000000000 -0500
++++ PyTraffic-1.2.1/setup.py	2004-12-31 00:08:57.000000000 -0500
 @@ -45,7 +45,7 @@
                          'install_lib' :  r"c:\pytraffic12"}

      options['build_ext']={'compiler' : 'mingw32'}

diff --git a/games-kids/pytraffic/pytraffic-1.2.1.ebuild b/games-kids/pytraffic/pytraffic-1.2.1.ebuild
index 24a0dd9c60f6..0327e7134286 100644
--- a/games-kids/pytraffic/pytraffic-1.2.1.ebuild
+++ b/games-kids/pytraffic/pytraffic-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/games-kids/pytraffic/pytraffic-1.2.1.ebuild,v 1.1 2004/12/30 11:06:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/pytraffic/pytraffic-1.2.1.ebuild,v 1.2 2004/12/31 06:13:07 vapier Exp $
 
-inherit games distutils
+inherit distutils games
 
 DESCRIPTION="Python version of the board game Rush Hour"
 HOMEPAGE="http://alpha.luc.ac.be/Research/Algebra/Members/pytraffic"
@@ -22,7 +22,7 @@ S="${WORKDIR}/PyTraffic-${PV}"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/1.2-gentoo-dirs.patch
+	epatch ${FILESDIR}/${PV}-gentoo-dirs.patch
 }
 
 src_compile() {
@@ -31,8 +31,16 @@ src_compile() {
 }
 
 src_install() {
-	DDOCS="AUTHORS.txt CHANGELOG.txt PKG-INFO"
+	DOCS="AUTHORS.txt CHANGELOG.txt PKG-INFO"
 	distutils_src_install
 	dohtml DOCS/*
 	prepgamesdirs
 }
+
+pkg_postinst() {
+	if has_version ">=dev-lang/python-2.3"; then
+		python_version
+		python_mod_optimize ${ROOT}usr/share/games/${PN}12
+	fi
+	games_pkg_postinst
+}