[media-video/griffith]: Fix glade library path

5 files changed, 28 insertions, 3 deletions

diff --git a/media-video/griffith/ChangeLog b/media-video/griffith/ChangeLog
index 7f0712a..42f08ea 100644
--- a/media-video/griffith/ChangeLog
+++ b/media-video/griffith/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-video/griffith/ChangeLog,v 1.31 2009/06/11 13:57:01 fauli Exp $
 
+  12 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
+  griffith-0.10_beta2.ebuild, griffith-9999.ebuild,
+  +files/fix_lib_path.patch:
+  Fix glady library path
+
 *griffith-0.10_beta2 (12 Jun 2009)
 
   12 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index 3d0cdfa..a302119 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -1,6 +1,7 @@
+AUX fix_lib_path.patch 667 RMD160 3fefe17aa5edaed7c1531f59be717f661e8b5bad SHA1 bbe76a6bf701260d5ee8adaf2d0888891b93f944 SHA256 f9c5a58ac4552ddfe254cdb9e02ef3e91a5feb500c7afe92f9faed9cc02687f2
 DIST griffith-0.10-beta2.tar.gz 1267994 RMD160 854f272984176ab1df3b4ecca8f417c6a172a5d5 SHA1 9df05b8c704b6df8893e2e90555040221c6d9e4e SHA256 f76d0325f1811d67b7bbbf5161d3142b7285ac2fa5e9628815c04e0ebf83a123
 DIST griffith-extra-artwork-0.9.4.tar.gz 124008 RMD160 926081627d650803d4a16b140a23de4e9798321e SHA1 c518bcca5f279fc3e5f0263c29296b9ba431b54f SHA256 96bc01a05ad54aad9fabcf411809c46c78b990fc7656ea004cebdfd8ea9894fd
-EBUILD griffith-0.10_beta2.ebuild 1675 RMD160 5b4a4908b2682c69308101b1ffa31d13248d6636 SHA1 39904f0a8399a8840c4340f880de8b7382d5ab66 SHA256 476ef6f8d0fc1d466f424fdf693c44b6c13261d2e16be65d0afcdc342d99d2a9
-EBUILD griffith-9999.ebuild 2113 RMD160 94078aabedf1a85cd35f0b26b2e5ec5476f28e61 SHA1 66d08f18b951a60a2029ebad65ceefb174b9f733 SHA256 8fb46d382405bcbfc695d6145d918da39ce5803ec77627bf38be5bb4f633d184
-MISC ChangeLog 4817 RMD160 ec629cf4276fe66d88d7de42821125656b214bd7 SHA1 c3a1d0999afe39986f0e6aaf819bea7b2bcefaf3 SHA256 4813842c463e48a131d4645935146451094a67dcb2c9f06725840e10e4080864
+EBUILD griffith-0.10_beta2.ebuild 1734 RMD160 3571268a652fad01bca18b81abf2733d4c38ad3b SHA1 1b074481e7ce5151c2e04ed8aad98d5fc7d59b0b SHA256 9369de8c3d5e8b9cc42b3c6446b41310845da496516bdd95e21c78fa06502c07
+EBUILD griffith-9999.ebuild 2207 RMD160 255204f405803562bd65b1d56682fafb39bfca27 SHA1 117536bfd0f4ea4ae76c76abdb1c11ddd8794284 SHA256 6caee7706aa1ed34d8d18f0ecf775ae2f845c6d0054394755018dfbce13186f2
+MISC ChangeLog 4977 RMD160 aeb05a4305cfefcd23c725b2872c70389c6d621b SHA1 5db8665a99c7f49abbe633a9876b98e197d84c53 SHA256 79293169218442865af8d9112cfcca4641fd80dcd3596737a03c1decd82201b3
 MISC metadata.xml 396 RMD160 bd923c9f95910d90c221d7ab2fb605ad04be4ea1 SHA1 0965485891286a8571c29a1975ece94d0cc20392 SHA256 ccf6be79fb955aeaafc2fffe07ba6a1cd8aaf7fe4afc1b5baa7a32153efc928d
diff --git a/media-video/griffith/files/fix_lib_path.patch b/media-video/griffith/files/fix_lib_path.patch
new file mode 100644
index 0000000..952448f
--- /dev/null
+++ b/media-video/griffith/files/fix_lib_path.patch
@@ -0,0 +1,13 @@
+Index: lib/initialize.py
+===================================================================
+--- lib.orig/initialize.py
++++ lib/initialize.py
+@@ -73,7 +73,7 @@ def locations(self, home_dir):
+             os.environ['LANG'] = lang
+ 
+     elif os.name == 'posix':
+-        locations['share'] = os.path.abspath(os.path.join(locations['lib'], '..'))
++        locations['share'] = os.path.abspath(os.path.join(locations['lib'], '../../share/griffith/'))
+         locations['glade'] = os.path.join(locations['share'], 'glade')
+         locations['i18n']  = os.path.abspath(os.path.join(locations['share'], '..', 'locale'))
+         if not os.path.isdir(locations['i18n']):
diff --git a/media-video/griffith/griffith-0.10_beta2.ebuild b/media-video/griffith/griffith-0.10_beta2.ebuild
index c05020a..090707d 100644
--- a/media-video/griffith/griffith-0.10_beta2.ebuild
+++ b/media-video/griffith/griffith-0.10_beta2.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="csv doc spell"
 
 RDEPEND="dev-python/imaging
+	dev-util/glade:3
 	dev-python/pyxml
 	>=dev-python/pygtk-2.6.1
 	dev-python/pysqlite:2
@@ -37,6 +38,7 @@ src_prepare() {
 	sed -i \
 		-e 's/ISO-8859-1/UTF-8/' \
 		"${S}"/lib/gconsole.py || die "sed failed"
+	epatch "${FILESDIR}"/fix_lib_path.patch
 }
 
 src_compile() {
diff --git a/media-video/griffith/griffith-9999.ebuild b/media-video/griffith/griffith-9999.ebuild
index 24878d5..9d478e9 100644
--- a/media-video/griffith/griffith-9999.ebuild
+++ b/media-video/griffith/griffith-9999.ebuild
@@ -18,6 +18,7 @@ KEYWORDS=""
 IUSE="csv doc spell"
 
 RDEPEND="dev-python/imaging
+	dev-util/glade:3
 	dev-python/pyxml
 	>=dev-python/pygtk-2.6.1
 	dev-python/pysqlite:2
@@ -51,6 +52,9 @@ src_unpack() {
 	sed -i \
 		-e "s|locations\['lib'\], '..')|locations\['lib'\], '..', '..', 'share', 'griffith')|" \
 		lib/initialize.py || die "sed failed"
+	
+	# this patch has to go upstream
+	epatch "${FILESDIR}"/fix_lib_path.patch
 }
 
 src_compile() {