Finally fixed bug #202484

Package-Manager: portage-2.1.5.4

4 files changed, 34 insertions, 9 deletions

diff --git a/media-video/griffith/ChangeLog b/media-video/griffith/ChangeLog
index 0ec02cdf341e..fcb5ff7aac1b 100644
--- a/media-video/griffith/ChangeLog
+++ b/media-video/griffith/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/griffith
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/ChangeLog,v 1.23 2008/06/07 12:54:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/ChangeLog,v 1.24 2008/06/07 16:50:11 dev-zero Exp $
+
+*griffith-0.9.6-r1 (07 Jun 2008)
+
+  07 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/0.9.6-moving_share_dir.patch, -griffith-0.9.6.ebuild,
+  +griffith-0.9.6-r1.ebuild:
+  Finally fixed bug #202484
 
 *griffith-0.9.6 (07 Jun 2008)
 
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index a3b44971a3bb..4858de510206 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -1,7 +1,8 @@
+AUX 0.9.6-moving_share_dir.patch 636 RMD160 bdd8e3da8b7b1673627af5f1f5e149f282d381e6 SHA1 1f85c237d279584492266887c9d1519b4ccd197e SHA256 bad2d45cf80db09026d8ce816f3c1e5760279d8670d28ae8a82a44abc56f6e6f
 DIST griffith-0.9.5.tar.gz 886950 RMD160 9a8c5d9b728997bd4d8ccefca95f769314d09b54 SHA1 8621fd96b82fd6a842192c71dbf123d33afc62c4 SHA256 3cf4a199ed945137fec08902a4e7e1415b787ce9a5fff163210ee4385fdedaed
 DIST griffith-0.9.6.tar.gz 1282207 RMD160 31f4a2bc124d0b37f51f35d79d17a7cb5fd5897e SHA1 4bd2575373cd176f32a9f9e4a433ccb770307c6a SHA256 999441bcac77da30ab8e55e2de17f86cdea09a92645190759d35d55cf1b0e4ca
 DIST griffith-extra-artwork-0.9.4.tar.gz 124008 RMD160 926081627d650803d4a16b140a23de4e9798321e SHA1 c518bcca5f279fc3e5f0263c29296b9ba431b54f SHA256 96bc01a05ad54aad9fabcf411809c46c78b990fc7656ea004cebdfd8ea9894fd
 EBUILD griffith-0.9.5.ebuild 1601 RMD160 d25531c3ca90821493ef498ab3d089dca57399a3 SHA1 7f4b848d6bf3ed50fa71f4e8d473e8f856fde1aa SHA256 7800c38774a60d9b916e4b46a8821fc34d58c2b3f4e2e67bedea190efab1d7de
-EBUILD griffith-0.9.6.ebuild 1581 RMD160 de65bf2cb0e1f77d310ec46e455ae1b3153c87d0 SHA1 b8905710d895691bdd9f0968fef994d2808b60fa SHA256 4009100440aa2e86aa43f9a0bacd53db79f1f022ecb2be7b9f4cc0cdf50e6b3e
-MISC ChangeLog 3263 RMD160 da74afb0528db1c41a668ded14c835e8b3404760 SHA1 25b526aa62e5e131b86f279a99b39b3caf7d377d SHA256 e6f2ce430f0005c4ebb1cf1475b706fb87b47dd3fbf1f7b8b6b89b17f5b61a99
+EBUILD griffith-0.9.6-r1.ebuild 1756 RMD160 2a53692c41116672972a2d9edca8f2eadad54072 SHA1 9c6ef8672f5f3a1c49131ed46f631e16cf6a22c7 SHA256 0c7fcdddf5baaddbd393390acf42b6614acd7b5fb1b594a276783bf348ae12d2
+MISC ChangeLog 3471 RMD160 a7382ce0733a21df8bfffdb9df4fbd7c3e99199a SHA1 7cc633967b05f14650310fdc04feedb542e54695 SHA256 c5ae2f3af807fc2941b3402ca06b453fcdd596cdacb556abbe2211c344fea72a
 MISC metadata.xml 230 RMD160 ba2fc20eb03a61dd12b2f1797531ebf1f4959844 SHA1 69e97f96a005751522346f38a0b241c1c35ffe57 SHA256 24ae6f87fd27f2cdee7b7727fb3c417c2b96d307d6cb97dcd0ea2a0c7c7d52a0
diff --git a/media-video/griffith/files/0.9.6-moving_share_dir.patch b/media-video/griffith/files/0.9.6-moving_share_dir.patch
new file mode 100644
index 000000000000..40ce939fb7e0
--- /dev/null
+++ b/media-video/griffith/files/0.9.6-moving_share_dir.patch
@@ -0,0 +1,11 @@
+--- lib/initialize.py.orig	2008-06-07 18:45:17.000000000 +0200
++++ lib/initialize.py	2008-06-07 18:46:13.000000000 +0200
+@@ -78,7 +78,7 @@
+ 
+ 	elif os.name == 'posix':
+ 		locations['home']  = os.path.join(os.path.expanduser('~'), '.griffith').decode(defaultEnc)
+-		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.9.6.ebuild b/media-video/griffith/griffith-0.9.6-r1.ebuild
index 7baf90a98980..38d3e2f30786 100644
--- a/media-video/griffith/griffith-0.9.6.ebuild
+++ b/media-video/griffith/griffith-0.9.6-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/griffith-0.9.6.ebuild,v 1.2 2008/06/07 12:55:34 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/griffith-0.9.6-r1.ebuild,v 1.1 2008/06/07 16:50:11 dev-zero Exp $
 
 EAPI="1"
 
-inherit python
+inherit eutils python multilib
 
 ARTWORK_PV="0.9.4"
 
@@ -12,7 +12,6 @@ DESCRIPTION="Movie collection manager"
 HOMEPAGE="http://griffith.berlios.de/"
 SRC_URI="mirror://berlios/griffith/${P/_/-}.tar.gz
 	mirror://berlios/griffith/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -41,6 +40,8 @@ src_unpack() {
 	sed -i \
 		-e 's/ISO-8859-1/UTF-8/' \
 		lib/gconsole.py || die "sed failed"
+
+	epatch "${FILESDIR}/${PV}-moving_share_dir.patch"
 }
 
 src_compile() {
@@ -51,7 +52,10 @@ src_compile() {
 src_install() {
 	use doc || sed -i -e '/docs/d' Makefile
 
-	emake DESTDIR="${D}" install || die "emake install failed"
+	python_version
+	emake \
+		LIBDIR="${D}/usr/$(get_libdir)/griffith" \
+		DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO NEWS TRANSLATORS
 
 	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/"
@@ -59,9 +63,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}/lib
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}/lib
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
 }