From e8a6f12e0aef3de971881ea45e305f9a6af64c3e Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Thu, 29 May 2008 02:28:17 +0000 Subject: Set exec_prefix in codegen patch; bug #194343 (Portage version: 2.1.5.2) --- dev-python/pygtk/ChangeLog | 6 ++- .../files/pygtk-2.12.1-fix-codegen-location.patch | 54 +++++++++++----------- 2 files changed, 32 insertions(+), 28 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 + 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/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 -- cgit v1.2.3-65-gdbad