| 1 |
fauli 09/03/29 20:15:15 |
| 2 |
|
| 3 |
Modified: ChangeLog gramps-3.1.1.ebuild |
| 4 |
Log: |
| 5 |
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. |
| 6 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.101 app-misc/gramps/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/ChangeLog?rev=1.101&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/ChangeLog?rev=1.101&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/ChangeLog?r1=1.100&r2=1.101 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v |
| 18 |
retrieving revision 1.100 |
| 19 |
retrieving revision 1.101 |
| 20 |
diff -u -r1.100 -r1.101 |
| 21 |
--- ChangeLog 19 Mar 2009 17:07:01 -0000 1.100 |
| 22 |
+++ ChangeLog 29 Mar 2009 20:15:15 -0000 1.101 |
| 23 |
@@ -1,6 +1,14 @@ |
| 24 |
# ChangeLog for app-misc/gramps |
| 25 |
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.100 2009/03/19 17:07:01 josejx Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.101 2009/03/29 20:15:15 fauli Exp $ |
| 28 |
+ |
| 29 |
+ 29 Mar 2009; Christian Faulhammer <fauli@g.o> gramps-3.1.1.ebuild: |
| 30 |
+ Fix bug 262644: Dustin Polke <gentoobugzilla DOT 20 DOT dsurawicz AT |
| 31 |
+ spamgourmet DOT com> reported a problem with .pyo and .pyc being installed |
| 32 |
+ under /usr/share, which is a QA violation. This should have been fixed |
| 33 |
+ with bug 215944, but the fix there was just a workaround to quiten Portage |
| 34 |
+ QA warnings without solving the problem. Dustin provided a patch for all |
| 35 |
+ this. |
| 36 |
|
| 37 |
19 Mar 2009; Joseph Jezak <josejx@g.o> gramps-3.1.1.ebuild: |
| 38 |
Marked ~ppc for bug #261672. |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.4 app-misc/gramps/gramps-3.1.1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/gramps-3.1.1.ebuild?rev=1.4&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/gramps-3.1.1.ebuild?rev=1.4&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/gramps/gramps-3.1.1.ebuild?r1=1.3&r2=1.4 |
| 47 |
|
| 48 |
Index: gramps-3.1.1.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.1.1.ebuild,v |
| 51 |
retrieving revision 1.3 |
| 52 |
retrieving revision 1.4 |
| 53 |
diff -u -r1.3 -r1.4 |
| 54 |
--- gramps-3.1.1.ebuild 19 Mar 2009 17:07:01 -0000 1.3 |
| 55 |
+++ gramps-3.1.1.ebuild 29 Mar 2009 20:15:15 -0000 1.4 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2009 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.1.1.ebuild,v 1.3 2009/03/19 17:07:01 josejx Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.1.1.ebuild,v 1.4 2009/03/29 20:15:15 fauli Exp $ |
| 61 |
|
| 62 |
EAPI=2 |
| 63 |
NEED_PYTHON="2.5" |
| 64 |
@@ -47,6 +47,27 @@ |
| 65 |
# file system |
| 66 |
mv "${S}"/py-compile "${S}"/py-compile.orig |
| 67 |
ln -s $(type -P true) "${S}"/py-compile |
| 68 |
+ |
| 69 |
+ python_version |
| 70 |
+ |
| 71 |
+ # Fix install path. |
| 72 |
+ einfo "Fix installation path" |
| 73 |
+ find . -iname 'Makefile.in' | xargs \ |
| 74 |
+ sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \ |
| 75 |
+ || die |
| 76 |
+ |
| 77 |
+ sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \ |
| 78 |
+ -i src/Makefile.in || die |
| 79 |
+ |
| 80 |
+ sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \ |
| 81 |
+ -i src/docgen/Makefile.in || die |
| 82 |
+ |
| 83 |
+ einfo "Fix wrapper script" |
| 84 |
+ sed "s;@datadir@;$(python_get_sitedir);" \ |
| 85 |
+ -i gramps.sh.in || die |
| 86 |
+ |
| 87 |
+ einfo "Fix icon location" |
| 88 |
+ sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die |
| 89 |
} |
| 90 |
|
| 91 |
src_install() { |
| 92 |
@@ -56,10 +77,12 @@ |
| 93 |
|
| 94 |
pkg_postinst() { |
| 95 |
gnome2_pkg_postinst |
| 96 |
- python_mod_optimize /usr/share/${PN} |
| 97 |
+ python_version |
| 98 |
+ python_mod_optimize $(python_get_sitedir)/${PN} |
| 99 |
} |
| 100 |
|
| 101 |
pkg_postrm() { |
| 102 |
gnome2_pkg_postrm |
| 103 |
- python_mod_cleanup /usr/share/${PN} |
| 104 |
+ python_version |
| 105 |
+ python_mod_cleanup $(python_get_sitedir)/${PN} |
| 106 |
} |
Archives