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/phenix-bin/
Date: Tue, 25 Feb 2014 12:08:19
Message-Id: 1393329944.d9dc5968bc209ac0ab32e198fc100e235a44a2b7.jlec@gentoo
1 commit: d9dc5968bc209ac0ab32e198fc100e235a44a2b7
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 25 12:05:44 2014 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 25 12:05:44 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d9dc5968
7
8 sci-chemistry/phenix-bin: Fix prefix problems
9
10 Package-Manager: portage-2.2.8-r1
11
12 ---
13 sci-chemistry/phenix-bin/ChangeLog | 5 ++++-
14 sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild | 7 ++++++-
15 2 files changed, 10 insertions(+), 2 deletions(-)
16
17 diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
18 index d5cdfbb..eb06212 100644
19 --- a/sci-chemistry/phenix-bin/ChangeLog
20 +++ b/sci-chemistry/phenix-bin/ChangeLog
21 @@ -1,7 +1,10 @@
22 # ChangeLog for sci-chemistry/phenix-bin
23 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
24 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
25 # $Header: $
26
27 + 25 Feb 2014; Justin Lecher <jlec@g.o> phenix-bin-1.8.4.1496.ebuild:
28 + Fix prefix problems
29 +
30 *phenix-bin-1.8.4.1496 (09 Oct 2013)
31
32 09 Oct 2013; Justin Lecher <jlec@g.o> +phenix-bin-1.8.4.1496.ebuild:
33
34 diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild
35 index 07737df..9219d5e 100644
36 --- a/sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild
37 +++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild
38 @@ -6,7 +6,9 @@ EAPI=5
39
40 PYTHON_COMPAT=( python{2_6,2_7} )
41
42 -inherit python-single-r1 versionator
43 +WX_GTK_VER=2.8
44 +
45 +inherit python-single-r1 versionator wxwidgets
46
47 MY_PV="$(replace_version_separator 3 -)"
48 MY_P="phenix-installer-${MY_PV}"
49 @@ -59,6 +61,7 @@ RDEPEND="${PYTHON_DEPS}
50 x11-libs/libXrandr
51 x11-libs/libXrender
52 x11-libs/libXxf86vm
53 + x11-libs/wxGTK:${WX_GTK_VER}[X]
54 sys-libs/zlib
55 virtual/jpeg:62"
56 DEPEND="${PYTHON_DEPS}"
57 @@ -94,6 +97,7 @@ src_install() {
58 foo/phenix-${MY_PV}/build/intel-linux-2.6-*/base/etc/{gtk*,pango}/* \
59 foo/phenix-${MY_PV}/phenix_env* \
60 || die
61 +
62 dodir /opt
63 mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/"
64
65 @@ -101,6 +105,7 @@ src_install() {
66 #!${EPREFIX}/bin/bash
67
68 source "${EPREFIX}/opt/phenix-${MY_PV}/phenix_env.sh"
69 + export LD_LIBRARY_PATH="${EPREFIX}"/usr/$(get_libdir)
70 exec phenix
71 EOF
72 dobin phenix