Fix bug 262644: Dustin Polke <gentoobugzilla DOT 20 DOT dsurawicz AT spamgourmet DOT com> reported a problem with .pyo and .pyc being installed under /usr/share, which is a QA violation. This should have been fixed with bug 215944, but the fix there was just a workaround to quiten Portage QA warnings without solving the problem. Dustin provided a patch for all this.

Package-Manager: portage-2.1.6.7/cvs/Linux i686

3 files changed, 47 insertions, 6 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index e4296b2ce2f6..e61025ebf3b3 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/gramps
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.100 2009/03/19 17:07:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.101 2009/03/29 20:15:15 fauli Exp $
+
+  29 Mar 2009; Christian Faulhammer <fauli@gentoo.org> gramps-3.1.1.ebuild:
+  Fix bug 262644: Dustin Polke <gentoobugzilla DOT 20 DOT dsurawicz AT
+  spamgourmet DOT com> reported a problem with .pyo and .pyc being installed
+  under /usr/share, which is a QA violation. This should have been fixed
+  with bug 215944, but the fix there was just a workaround to quiten Portage
+  QA warnings without solving the problem. Dustin provided a patch for all
+  this.
 
   19 Mar 2009; Joseph Jezak <josejx@gentoo.org> gramps-3.1.1.ebuild:
   Marked ~ppc for bug #261672.
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 77594ac0c470..e7d46e88f9a9 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gramps-3.0.3_fix-installation-race-condition.patch 358 RMD160 b792536b814a66b808e1932c188f683848da5401 SHA1 476f672669d7fa06c3957c0a8bd35ced5ad26ec3 SHA256 53bd2058c6e1b5d72e781b1c09bdcaca66888d4f9daf4221ccfbe404ce06e85e
 DIST gramps-3.0.3.tar.gz 6056907 RMD160 0fc33fdbb8017174d0bce007b3662fe0c67cd782 SHA1 15e344033bf6015c6714f5c5b13a8e3e96096b80 SHA256 e880a6fb86b13170c28c4203d04b9821617014e51dbc0ef8ad422192b994f046
 DIST gramps-3.0.4.tar.gz 5830725 RMD160 2b5da63a67b814ef43ceb555351dd0930dfc32a7 SHA1 42501cb29b7b6b60006db0ded4a732e838becd45 SHA256 cca1262bb4e15fd018342c49bbe07a1cac96b1307bffdff10c34f3c1518fd792
 DIST gramps-3.1.1.tar.gz 6794185 RMD160 56cd774a5145a629d136988d76b9571113729b42 SHA1 1cfd0ffcec6507a0cb2ec4a703b7e8253ca38871 SHA256 cbd6b657dc3e1f79008b14cfa117862b0211f7418114de1d528df2818e5ee8bd
 EBUILD gramps-3.0.3.ebuild 1706 RMD160 2699029271e1cac616481c5d443abe5154540144 SHA1 57e88be4947f508b54fa291465caebfb0370a0d7 SHA256 854a563cb1be9532701b22790891e881dba16463a79f76effe11bf447903ba81
 EBUILD gramps-3.0.4.ebuild 1474 RMD160 98243ad0bd61839701543220fa554cabcd066b38 SHA1 ca0e6280094b45bc9f920c1bd7a8d960821d0860 SHA256 fff8b86d3ea2d7e377ce04d3026bec29e95b10735833b6a1b5c0272ea3a6523a
-EBUILD gramps-3.1.1.ebuild 1541 RMD160 f62e5a73048f09cbd4715c19ffdbfa01a9b5e0ba SHA1 0752c0e55ca0ed7f49defbe4a6cc55ea4b7e25a0 SHA256 25b2c2d25c82445ec406f103dd9fcab61b5baf077dc33fcebe5d79e259eda136
-MISC ChangeLog 14095 RMD160 1d31b4f1f5e3ab7e6b5cb3f7b015c5e52eccc595 SHA1 0e8a7531400b8296baeb9105a8c3476fe0b5f64e SHA256 d7240dcd3738ab180f17f29aff9506195eab4b3bed8965cef942a0cfafce561d
+EBUILD gramps-3.1.1.ebuild 2170 RMD160 9d48f8a8b2772d01c255c312772f1eed1bfb41ae SHA1 6b7d3b4ce066fc8ed169d6cd5399fd887ee961db SHA256 187cb54182ab4628c4d595db964f7eb5ba1b519a3c146f0511990c6b8c12dfba
+MISC ChangeLog 14552 RMD160 c95467104e19a85ab333d426ffa57c3d4f29174d SHA1 3259579fdc715a54e3c330738d0c49bd1dcfb19e SHA256 cf485a65492b6d2da5b40ae6fc5f6dfb9e25878f02baa741143d166e5f920873
 MISC metadata.xml 1107 RMD160 fa9e24e467103fb07bfacddbdafa7209c0428774 SHA1 60e89b5c5bbbfddecca19f80a3d06ad4b277a211 SHA256 475ba5393a3802b3201f89c0cad5a1ffcc7259b4f1f5357a0cf9fe71049a070c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknP1toACgkQNQqtfCuFneOQcACeIOvRk1IS7W/3x6/04Kjum+gD
+8l0AnA8z7IDNTWxXyWIDomSijfdl8uDB
+=2APP
+-----END PGP SIGNATURE-----
diff --git a/app-misc/gramps/gramps-3.1.1.ebuild b/app-misc/gramps/gramps-3.1.1.ebuild
index ca3f45c99207..bb768113fa8a 100644
--- a/app-misc/gramps/gramps-3.1.1.ebuild
+++ b/app-misc/gramps/gramps-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.1.1.ebuild,v 1.3 2009/03/19 17:07:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.1.1.ebuild,v 1.4 2009/03/29 20:15:15 fauli Exp $
 
 EAPI=2
 NEED_PYTHON="2.5"
@@ -47,6 +47,27 @@ src_unpack() {
 	# file system
 	mv "${S}"/py-compile "${S}"/py-compile.orig
 	ln -s $(type -P true) "${S}"/py-compile
+
+	python_version
+
+	# Fix install path.
+	einfo "Fix installation path"
+	find . -iname 'Makefile.in' | xargs \
+		sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
+		|| die
+
+	sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
+		-i src/Makefile.in || die
+
+	sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
+	-i src/docgen/Makefile.in || die
+
+	einfo "Fix wrapper script"
+	sed "s;@datadir@;$(python_get_sitedir);" \
+		-i gramps.sh.in || die
+
+	einfo "Fix icon location"
+	sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
 }
 
 src_install() {
@@ -56,10 +77,12 @@ src_install() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_mod_optimize /usr/share/${PN}
+	python_version
+	python_mod_optimize $(python_get_sitedir)/${PN}
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/share/${PN}
+	python_version
+	python_mod_cleanup $(python_get_sitedir)/${PN}
 }