Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/
Date: Mon, 30 Jun 2014 19:03:04
Message-Id: 1404154945.6a07207adec9b6152a0ab28c72f724c3972f1e8e.jlec@gentoo
1 commit: 6a07207adec9b6152a0ab28c72f724c3972f1e8e
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 30 19:02:25 2014 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 30 19:02:25 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6a07207a
7
8 sci-chemistry/coot: Fix sandbox violation
9
10 Package-Manager: portage-2.2.10
11
12 ---
13 sci-chemistry/coot/ChangeLog | 8 ++++++++
14 sci-chemistry/coot/coot-9999.ebuild | 5 ++++-
15 sci-chemistry/coot/files/coot-9999-sandbox-icons.patch | 16 ++++++++++++++++
16 3 files changed, 28 insertions(+), 1 deletion(-)
17
18 diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog
19 index cee77b1..cd498bb 100644
20 --- a/sci-chemistry/coot/ChangeLog
21 +++ b/sci-chemistry/coot/ChangeLog
22 @@ -2,6 +2,14 @@
23 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
24 # $Header: $
25
26 + 30 Jun 2014; Justin Lecher <jlec@g.o> coot-9999.ebuild,
27 + +files/coot-9999-sandbox-icons.patch:
28 + Fix sandbox violation
29 +
30 + 30 Jun 2014; Justin Lecher <jlec@g.o> coot-9999.ebuild,
31 + +files/coot-9999-sandbox-icons.patch:
32 + Fix sandbox violation
33 +
34 08 Jun 2014; Justin Lecher <jlec@g.o> coot-9999.ebuild:
35 Fix problem with shebang correction
36
37
38 diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild
39 index f0fd7dc..79aed91 100644
40 --- a/sci-chemistry/coot/coot-9999.ebuild
41 +++ b/sci-chemistry/coot/coot-9999.ebuild
42 @@ -82,7 +82,10 @@ pkg_setup() {
43 python-single-r1_pkg_setup
44 }
45
46 -PATCHES=( "${FILESDIR}"/${PV}-pc.patch )
47 +PATCHES=(
48 + "${FILESDIR}"/${PV}-pc.patch
49 + "${FILESDIR}"/${P}-sandbox-icons.patch
50 +)
51
52 src_unpack() {
53 subversion_src_unpack
54
55 diff --git a/sci-chemistry/coot/files/coot-9999-sandbox-icons.patch b/sci-chemistry/coot/files/coot-9999-sandbox-icons.patch
56 new file mode 100644
57 index 0000000..2a9ff2d
58 --- /dev/null
59 +++ b/sci-chemistry/coot/files/coot-9999-sandbox-icons.patch
60 @@ -0,0 +1,16 @@
61 + pixmaps/icons/Makefile.am | 4 ++--
62 + 1 file changed, 2 insertions(+), 2 deletions(-)
63 +
64 +diff --git a/pixmaps/icons/Makefile.am b/pixmaps/icons/Makefile.am
65 +index 0c183ae..dddc11a 100644
66 +--- a/pixmaps/icons/Makefile.am
67 ++++ b/pixmaps/icons/Makefile.am
68 +@@ -11,6 +11,6 @@ install-data-local:
69 + CONTEXT=` echo $$icon | cut -d_ -f2`; \
70 + SIZE=` echo $$icon | cut -d_ -f3`; \
71 + ICONFILE=`echo $$icon | cut -d_ -f4`; \
72 +- mkdir -p $(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
73 +- $(INSTALL_DATA) $(srcdir)/$$icon $(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
74 ++ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
75 ++ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
76 + done;