From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E9631138E66 for ; Tue, 25 Feb 2014 12:08:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6197E09A9; Tue, 25 Feb 2014 12:08:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FCB1E09A9 for ; Tue, 25 Feb 2014 12:08:14 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E47133EFA1 for ; Tue, 25 Feb 2014 12:08:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id BF07718875 for ; Tue, 25 Feb 2014 12:08:10 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1393329944.d9dc5968bc209ac0ab32e198fc100e235a44a2b7.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/phenix-bin/ChangeLog sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild X-VCS-Directories: sci-chemistry/phenix-bin/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: d9dc5968bc209ac0ab32e198fc100e235a44a2b7 X-VCS-Branch: master Date: Tue, 25 Feb 2014 12:08:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 934ba12e-f070-4a10-9627-a679a082a206 X-Archives-Hash: 04626842f25a26c1304cd695c70552d6 commit: d9dc5968bc209ac0ab32e198fc100e235a44a2b7 Author: Justin Lecher gentoo org> AuthorDate: Tue Feb 25 12:05:44 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Feb 25 12:05:44 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d9dc5968 sci-chemistry/phenix-bin: Fix prefix problems Package-Manager: portage-2.2.8-r1 --- sci-chemistry/phenix-bin/ChangeLog | 5 ++++- sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog index d5cdfbb..eb06212 100644 --- a/sci-chemistry/phenix-bin/ChangeLog +++ b/sci-chemistry/phenix-bin/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-chemistry/phenix-bin -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Feb 2014; Justin Lecher phenix-bin-1.8.4.1496.ebuild: + Fix prefix problems + *phenix-bin-1.8.4.1496 (09 Oct 2013) 09 Oct 2013; Justin Lecher +phenix-bin-1.8.4.1496.ebuild: 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 index 07737df..9219d5e 100644 --- a/sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild +++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild @@ -6,7 +6,9 @@ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) -inherit python-single-r1 versionator +WX_GTK_VER=2.8 + +inherit python-single-r1 versionator wxwidgets MY_PV="$(replace_version_separator 3 -)" MY_P="phenix-installer-${MY_PV}" @@ -59,6 +61,7 @@ RDEPEND="${PYTHON_DEPS} x11-libs/libXrandr x11-libs/libXrender x11-libs/libXxf86vm + x11-libs/wxGTK:${WX_GTK_VER}[X] sys-libs/zlib virtual/jpeg:62" DEPEND="${PYTHON_DEPS}" @@ -94,6 +97,7 @@ src_install() { foo/phenix-${MY_PV}/build/intel-linux-2.6-*/base/etc/{gtk*,pango}/* \ foo/phenix-${MY_PV}/phenix_env* \ || die + dodir /opt mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/" @@ -101,6 +105,7 @@ src_install() { #!${EPREFIX}/bin/bash source "${EPREFIX}/opt/phenix-${MY_PV}/phenix_env.sh" + export LD_LIBRARY_PATH="${EPREFIX}"/usr/$(get_libdir) exec phenix EOF dobin phenix