Set exec_prefix in codegen patch; bug #194343

Package-Manager: portage-2.1.5.2

3 files changed, 44 insertions, 30 deletions

diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index b5263a086b47..b4754e692441 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygtk
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.181 2008/05/28 14:03:44 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.182 2008/05/29 02:28:17 dang Exp $
+
+  29 May 2008; Daniel Gryniewicz <dang@gentoo.org>
+  files/pygtk-2.12.1-fix-codegen-location.patch:
+  Set exec_prefix in codegen patch; bug #194343
 
 *pygtk-2.12.1-r1 (28 May 2008)
 
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index 9c34c38e1dbf..80f00fd57d3f 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -1,6 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pygtk-2.12.0-extrafuncs.patch 1339 RMD160 4d1d64c0da5157dcf2c468359cdc00eedc3f9756 SHA1 c23f9d6e17664e7154cd8e490977b1c392a4a05d SHA256 02d7933266cdff1fedbdcbae46ef92ab71f355190395565d3812b7af00abfe43
 AUX pygtk-2.12.1-fix-amd64.patch 391 RMD160 ff177af662fb0e83cf38d593c73a5bb01f455fd7 SHA1 b0826471db034fefaab667a0f3db1dda0f29a93c SHA256 aaf2073f38cad27b84093e9e7b017a7e5959e9b70c76eec32de974b0d7ab8af8
-AUX pygtk-2.12.1-fix-codegen-location.patch 1234 RMD160 58ba208bdacc943f7fd1595f71967d9cf2489e12 SHA1 e92acc5841fca0fb30c5676feb9f642a9a9e107d SHA256 dcf5e1dd7ceb7bdee1cf1009e3a3701d529944d61f4c04e8f54b59a7ca98ae4c
+AUX pygtk-2.12.1-fix-codegen-location.patch 1655 RMD160 3a7135fd9f8921ecca50ad023fba743dc87fcd53 SHA1 ed5725ee4b85d50463ef7d1ec8f19efa0084aedf SHA256 3c1015484633069a9c67446269f8bce9aed34889cd109bdbb31c56dcb8afe686
 DIST pygtk-2.10.6.tar.bz2 1977892 RMD160 504492d461bb4604bc5dd57bbde729ea30a116dc SHA1 aaa22fce4cf4f1d22f0586975dced4cc6bc4881a SHA256 e524a45b7ffab55c441bafff43f9583e48616ce48a150413f30208e540435ac9
 DIST pygtk-2.12.0.tar.bz2 2154621 RMD160 d982a9752abcd214be975a3ead3946b3c8d1d474 SHA1 8248a620ef4147af07a708643926523024789d4e SHA256 0200c16528c8fd32eec2a9b1c1c2a303d88f5dc6ca94124a6e3ec8be1cac496e
 DIST pygtk-2.12.1.tar.bz2 2175955 RMD160 c368deab52524248593b77984e93f18150efa0f4 SHA1 7a7d095f53829895174640d693c4e4af16122d98 SHA256 4100ed4bf295b03106308f1cfb9931cc22910401dab785f8bd3af9935f1fe13d
@@ -10,5 +13,12 @@ EBUILD pygtk-2.12.0-r1.ebuild 2568 RMD160 d73b31bc59cda9c8380a9f499cc0ed75558b99
 EBUILD pygtk-2.12.0.ebuild 2464 RMD160 01e20566153ad7a104745de56d56632e3f7ce733 SHA1 29cf8d9f223a7b24d328567104c39a67c1061879 SHA256 e4ef858b55d1a9b4e543f87b541b391f42a86203926b1b26e10df8287dc33852
 EBUILD pygtk-2.12.1-r1.ebuild 2172 RMD160 1e66404e77cdc9fd46a3e07e0671c20415b8f139 SHA1 68c5b266d393317b77bea053de57150d0e029cc3 SHA256 3f6cc7e18f1341a034c7ff4fe65872206ee9267ebbc91da4a5596571e8db8855
 EBUILD pygtk-2.12.1.ebuild 2019 RMD160 d492b8fba3a46273c742b784042942131643616a SHA1 55923e4e4b76cb344a0ee92186f617a28298a2d7 SHA256 0111e5126792f74b2351a225b468c840416f068a371c4c2e4d125e5e12a7c770
-MISC ChangeLog 22375 RMD160 41c702856a38d1b60e9fff7002cadfb99faaef90 SHA1 b3a6ce370bce371a63f3b1a2894ae1dba27fa614 SHA256 6b84db24a914b12f7e440d293f969a98d926784ba7c88c19dd87c638c2d3b799
+MISC ChangeLog 22524 RMD160 ef189c2563141ced548915111440b114bd7e5d86 SHA1 76f03256112039c30322dadd8cbf74d4bd8a5241 SHA256 d0d9eea76413bd583645aa75433bf76e0252ecdac2fc67818e45673ac80ddc20
 MISC metadata.xml 934 RMD160 5160cf3a201fe5209f575b0633ba8dd40d7b5ed5 SHA1 e62fb7156a43df5b3380a77f9ad7616130075f7d SHA256 6a0af6b71bbaca6634e59f933775fbf76053472b54ff3989bf26a065a4c9c426
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFIPhTYomPajV0RnrERAh8HAJ9xUYX8k4JtnFctWIcJiDuaMav2KACfdDgz
+q1qnBk9UIgVUH9ddDWECApw=
+=NZC5
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch b/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch
index 4d65927f5e01..9283a74f44a1 100644
--- a/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch
+++ b/dev-python/pygtk/files/pygtk-2.12.1-fix-codegen-location.patch
@@ -1,22 +1,23 @@
-Index: pygtk-2.0.pc.in
-===================================================================
---- pygtk-2.0.pc.in	(revision 2949)
-+++ pygtk-2.0.pc.in	(working copy)
-@@ -12,7 +12,7 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN pygtk-2.12.1.orig/codegen/Makefile.am pygtk-2.12.1/codegen/Makefile.am
+--- pygtk-2.12.1.orig/codegen/Makefile.am	2007-11-01 12:20:22.000000000 -0400
++++ pygtk-2.12.1/codegen/Makefile.am	2008-05-28 22:21:04.000000000 -0400
+@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
  
- # same here.  Useful when calling the code generator in addon packages.
- defsdir=${datadir}/pygtk/2.0/defs
--codegendir=${datadir}/pygtk/2.0/codegen
-+codegendir=${pyexecdir}/gtk-2.0/codegen
+ bin_SCRIPTS = pygtk-codegen-$(PLATFORM_VERSION)
+ 
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
++codegendir = $(pyexecdir)/gtk-2.0/codegen
+ 
+ codegen_PYTHON = \
+ 	__init__.py \
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN pygtk-2.12.1.orig/codegen/pygtk-codegen-2.0.in pygtk-2.12.1/codegen/pygtk-codegen-2.0.in
+--- pygtk-2.12.1.orig/codegen/pygtk-codegen-2.0.in	2007-11-01 12:20:22.000000000 -0400
++++ pygtk-2.12.1/codegen/pygtk-codegen-2.0.in	2008-05-28 22:24:38.000000000 -0400
+@@ -1,9 +1,10 @@
+ #!/bin/sh
  
- Name: PyGTK
- Description: Python bindings for GTK+ and related libraries
-Index: codegen/pygtk-codegen-2.0.in
-===================================================================
---- codegen/pygtk-codegen-2.0.in	(revision 2949)
-+++ codegen/pygtk-codegen-2.0.in	(working copy)
-@@ -3,7 +3,7 @@
  prefix=@prefix@
++exec_prefix=@exec_prefix@
  datarootdir=@datarootdir@
  datadir=@datadir@
 -codegendir=${datadir}/pygtk/2.0/codegen
@@ -24,16 +25,15 @@ Index: codegen/pygtk-codegen-2.0.in
  
  PYTHONPATH=$codegendir
  export PYTHONPATH
-Index: codegen/Makefile.am
-===================================================================
---- codegen/Makefile.am	(revision 2949)
-+++ codegen/Makefile.am	(working copy)
-@@ -2,7 +2,7 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN pygtk-2.12.1.orig/pygtk-2.0.pc.in pygtk-2.12.1/pygtk-2.0.pc.in
+--- pygtk-2.12.1.orig/pygtk-2.0.pc.in	2007-11-01 12:20:22.000000000 -0400
++++ pygtk-2.12.1/pygtk-2.0.pc.in	2008-05-28 22:21:04.000000000 -0400
+@@ -12,7 +12,7 @@ pygtkincludedir=${includedir}/pygtk-2.0
  
- bin_SCRIPTS = pygtk-codegen-$(PLATFORM_VERSION)
- 
--codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
-+codegendir = $(pyexecdir)/gtk-2.0/codegen
+ # same here.  Useful when calling the code generator in addon packages.
+ defsdir=${datadir}/pygtk/2.0/defs
+-codegendir=${datadir}/pygtk/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
  
- codegen_PYTHON = \
- 	__init__.py \
+ Name: PyGTK
+ Description: Python bindings for GTK+ and related libraries