[gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2012-09-21  6:10 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2012-09-21  6:10 UTC (permalink / raw
  To: gentoo-commits

commit:     bfc6b961dcc9c9f9680451f865592077112793e2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 06:10:07 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 06:10:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bfc6b961

sci-chemistry/phenix-bin: Add missing dep

(Portage version: 2.2.0_alpha130/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/phenix-bin/ChangeLog                 |    3 +++
 .../phenix-bin/phenix-bin-1.8.1069.ebuild          |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 063fad4..22c887a 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   21 Sep 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1069.ebuild:
+  Add missing dep
+
+  21 Sep 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1069.ebuild:
   Don't double prefix
 
   21 Sep 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1069.ebuild:

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
index c2aed71..fa7088c 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
@@ -23,6 +23,10 @@ LICENSE="phenix"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
+RDEPEND="
+	media-libs/jpeg:62"
+DEPEND=""
+
 RESTRICT="fetch"
 
 QA_PREBUILT="opt/phenix-${MY_PV}/.*"


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2017-03-26 14:45 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2017-03-26 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     5fe779a3c9044048d5b176710c90496e24b00ffe
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 09:13:29 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 09:13:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5fe779a3

sci-chemistry/phenix-bin: Drop obsolete ncurses version

Drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../phenix-bin/phenix-bin-1.10.2155.ebuild         |   9 +-
 .../phenix-bin/phenix-bin-1.9.1692.ebuild          | 125 ---------------------
 2 files changed, 3 insertions(+), 131 deletions(-)

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild
index a4632eb46..9ca302dd8 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -37,10 +37,7 @@ RDEPEND="${PYTHON_DEPS}
 	media-libs/libpng:1.2
 	sys-libs/db:4.7
 	sys-libs/gdbm
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
-	)
+	sys-libs/ncurses:5/5[tinfo]
 	sys-libs/readline
 	virtual/glu
 	x11-libs/cairo

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
deleted file mode 100644
index 312c7164c..000000000
--- a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER=2.8
-
-inherit multilib python-single-r1 versionator wxwidgets
-
-MY_PV="$(replace_version_separator 2 -)"
-MY_P="phenix-installer-${MY_PV}"
-
-DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
-HOMEPAGE="http://phenix-online.org/"
-SRC_URI="
-	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc12.tar )
-	x86? ( phenix-installer-${MY_PV}-intel-linux-2.6-centos5.tar )
-"
-
-SLOT="0"
-LICENSE="phenix"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/atk
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/openssl
-	media-gfx/nvidia-cg-toolkit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:1.2
-	sys-libs/db:4.7
-	sys-libs/gdbm
-	|| (
-		sys-libs/ncurses:0/5[tinfo]
-		sys-libs/ncurses:5/5[tinfo]
-	)
-	sys-libs/readline
-	virtual/glu
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXi
-	x11-libs/libXmu
-	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}"
-
-RESTRICT="fetch"
-
-QA_PREBUILT="opt/phenix-${MY_PV}/.*"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_nofetch() {
-	elog "Please visit"
-	elog "http://www.phenix-online.org/phenix_request/index.cgi"
-	elog "and request a download password. With that done,"
-	elog "visit http://www.phenix-online.org/download/phenix/release"
-	elog "and download version \"Kernel 2.6 (64-bit; Fedora 12)\" (${A})"
-	elog "into ${DISTDIR}"
-}
-
-src_prepare() {
-	cat > "${S}/bin/machine_type" <<-EOF
-	#!${EPREFIX}/bin/sh
-	echo intel-linux-2.6-x86_64
-	exit 0
-	EOF
-}
-
-src_compile() {
-	LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)" ./install --prefix="${S}/foo" || die
-}
-
-src_install() {
-	sed \
-		-e "s:${S}/foo:${EPREFIX}/opt:g" \
-		-i \
-			build-binary/intel-linux-2.6-*/*/log/*.log \
-			build-final/intel-linux-2.6-*/*/log/*.log \
-			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/*_env \
-			foo/phenix-${MY_PV}/build/intel-linux-*/*sh \
-			foo/phenix-${MY_PV}/build/intel-linux-*/bin/* \
-			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/" || die
-
-	cat >> phenix <<- EOF
-	#!${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
-
-	python_fix_shebang "${ED}"/opt
-	python_optimize "${ED}"/opt
-}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2015-09-09  8:11 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2015-09-09  8:11 UTC (permalink / raw
  To: gentoo-commits

commit:     14d849851ea431ae63d52f29fe604675f66a4ca7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 08:01:41 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 08:01:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=14d84985

sci-chemistry/phenix-bin: Fix path correction

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild
index 9b5e811..90c185e 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild
@@ -70,7 +70,7 @@ RESTRICT="fetch"
 
 QA_PREBUILT="opt/phenix-${MY_PV}/.*"
 
-S="${WORKDIR}"/${MY_P}-intel-linux-2.6-x86_64-centos6/
+S="${WORKDIR}"/${MY_P}-intel-linux-2.6-x86_64-centos6
 
 pkg_nofetch() {
 	elog "Please visit"
@@ -94,6 +94,7 @@ src_compile() {
 }
 
 src_install() {
+	find "${S}/foo" -type f -name "*.pyc" -delete || die
 	sed \
 		-e "s:${S}/foo:${EPREFIX}/opt:g" \
 		-i \
@@ -103,7 +104,6 @@ src_install() {
 			foo/phenix-${MY_PV}/base/etc/{gtk*,pango}/* \
 			foo/phenix-${MY_PV}/phenix_env* \
 			|| die
-
 	dodir /opt
 	mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/" || die
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2015-09-09  7:11 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2015-09-09  7:11 UTC (permalink / raw
  To: gentoo-commits

commit:     e45b55477b4618f913798c79cd7ab47ef27cdeed
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 07:07:20 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 07:07:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e45b5547

sci-chemistry/phenix-bin: Version Bump

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../phenix-bin/phenix-bin-1.10.2155.ebuild         | 121 +++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild
new file mode 100644
index 0000000..9b5e811
--- /dev/null
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.10.2155.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER=2.8
+
+inherit multilib python-single-r1 versionator wxwidgets
+
+MY_PV="$(replace_version_separator 2 -)"
+MY_P="phenix-installer-${MY_PV}"
+
+DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
+HOMEPAGE="http://phenix-online.org/"
+SRC_URI="${MY_P}-intel-linux-2.6-x86_64-centos6.tar.gz"
+
+SLOT="0"
+LICENSE="phenix"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/atk
+	dev-libs/boost
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/openssl
+	media-gfx/nvidia-cg-toolkit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2
+	sys-libs/db:4.7
+	sys-libs/gdbm
+	|| (
+		sys-libs/ncurses:0/5[tinfo]
+		sys-libs/ncurses:5/5[tinfo]
+	)
+	sys-libs/readline
+	virtual/glu
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXi
+	x11-libs/libXmu
+	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}"
+
+RESTRICT="fetch"
+
+QA_PREBUILT="opt/phenix-${MY_PV}/.*"
+
+S="${WORKDIR}"/${MY_P}-intel-linux-2.6-x86_64-centos6/
+
+pkg_nofetch() {
+	elog "Please visit"
+	elog "http://www.phenix-online.org/phenix_request/index.cgi"
+	elog "and request a download password. With that done,"
+	elog "visit http://www.phenix-online.org/download/phenix/release"
+	elog "and download version \"Kernel 2.6 (64-bit; Fedora 12)\" (${A})"
+	elog "into ${DISTDIR}"
+}
+
+src_prepare() {
+	cat > "${S}/bin/machine_type" <<-EOF
+	#!${EPREFIX}/bin/sh
+	echo intel-linux-2.6-x86_64
+	exit 0
+	EOF
+}
+
+src_compile() {
+	LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)" ./install --prefix="${S}/foo" || die
+}
+
+src_install() {
+	sed \
+		-e "s:${S}/foo:${EPREFIX}/opt:g" \
+		-i \
+			foo/phenix-${MY_PV}/build/*_env \
+			foo/phenix-${MY_PV}/build/*sh \
+			foo/phenix-${MY_PV}/build/bin/* \
+			foo/phenix-${MY_PV}/base/etc/{gtk*,pango}/* \
+			foo/phenix-${MY_PV}/phenix_env* \
+			|| die
+
+	dodir /opt
+	mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/" || die
+
+	cat >> phenix <<- EOF
+	#!${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
+
+	python_fix_shebang "${ED}"/opt
+	python_optimize "${ED}"/opt
+}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2015-08-05 13:35 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2015-08-05 13:35 UTC (permalink / raw
  To: gentoo-commits

commit:     516717349d12927eaa97bd786828694710bbff2a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 13:35:10 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 13:35:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=51671734

sci-chemistry/phenix-bin: Prefix love

Package-Manager: portage-2.2.20

 sci-chemistry/phenix-bin/ChangeLog                  | 3 +++
 sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index bd837b5..25a8001 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Aug 2015; Justin Lecher <jlec@gentoo.org> phenix-bin-1.9.1692.ebuild:
+  sci-chemistry/phenix-bin: Prefix love
+
   03 Aug 2015; Justin Lecher <jlec@gentoo.org> phenix-bin-1.9.1692.ebuild:
   sci-chemistry/phenix-bin: Fix for latest linux kernel
 

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
index bb42371..be1a24f 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
 }
 
 src_compile() {
-	./install --prefix="${S}/foo" || die
+	LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)" ./install --prefix="${S}/foo" || die
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2015-08-03 12:31 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2015-08-03 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c9e6af8690a48c72dace0bc5556ec1380da1d73a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  3 12:31:16 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Aug  3 12:31:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c9e6af86

sci-chemistry/phenix-bin: Fix for latest linux kernel

Package-Manager: portage-2.2.20

 sci-chemistry/phenix-bin/ChangeLog                  |  3 +++
 sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild | 18 +++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index ca3642f..bd837b5 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Aug 2015; Justin Lecher <jlec@gentoo.org> phenix-bin-1.9.1692.ebuild:
+  sci-chemistry/phenix-bin: Fix for latest linux kernel
+
   22 Jun 2015; Justin Lecher <jlec@gentoo.org> -phenix-bin-1.8.2.1309.ebuild,
   -phenix-bin-1.8.4.1496.ebuild:
   sci-chemistry/phenix-bin: Drop old

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
index 83d3d38..bb42371 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 
 WX_GTK_VER=2.8
 
-inherit python-single-r1 versionator wxwidgets
+inherit multilib python-single-r1 versionator wxwidgets
 
 MY_PV="$(replace_version_separator 2 -)"
 MY_P="phenix-installer-${MY_PV}"
@@ -82,7 +82,15 @@ pkg_nofetch() {
 }
 
 src_prepare() {
-	./install --prefix="${S}/foo"
+	cat > "${S}/bin/machine_type" <<-EOF
+	#!${EPREFIX}/bin/sh
+	echo intel-linux-2.6-x86_64
+	exit 0
+	EOF
+}
+
+src_compile() {
+	./install --prefix="${S}/foo" || die
 }
 
 src_install() {
@@ -99,13 +107,13 @@ src_install() {
 			|| die
 
 	dodir /opt
-	mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/"
+	mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/" || die
 
 	cat >> phenix <<- EOF
 	#!${EPREFIX}/bin/bash
 
 	source "${EPREFIX}/opt/phenix-${MY_PV}/phenix_env.sh"
-	export LD_LIBRARY_PATH="${EPREFIX}"/usr/$(get_libdir)
+	export LD_LIBRARY_PATH="${EPREFIX}/usr/$(get_libdir)"
 	exec phenix
 	EOF
 	dobin phenix


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2015-06-22 10:58 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2015-06-22 10:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6f850d1ccf22e22e7a578e92a31ba414cbb7457c
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 10:58:39 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 10:58:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6f850d1c

sci-chemistry/phenix-bin: Drop old

Package-Manager: portage-2.2.20

 sci-chemistry/phenix-bin/ChangeLog                 |   7 +-
 .../phenix-bin/phenix-bin-1.8.2.1309.ebuild        | 110 --------------------
 .../phenix-bin/phenix-bin-1.8.4.1496.ebuild        | 115 ---------------------
 3 files changed, 5 insertions(+), 227 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index ab7e8c3..ca3642f 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-chemistry/phenix-bin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Jun 2015; Justin Lecher <jlec@gentoo.org> -phenix-bin-1.8.2.1309.ebuild,
+  -phenix-bin-1.8.4.1496.ebuild:
+  sci-chemistry/phenix-bin: Drop old
+
   14 Nov 2014; Justin Lecher <jlec@gentoo.org> phenix-bin-1.9.1692.ebuild:
   Fix dep SLOT of sys-libs/db
 
@@ -68,4 +72,3 @@
   20 Sep 2012; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.8.1069.ebuild,
   +metadata.xml:
   New Addition
-

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
deleted file mode 100644
index 3be483d..0000000
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 versionator
-
-MY_PV="$(replace_version_separator 3 -)"
-MY_P="phenix-installer-${MY_PV}"
-
-DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
-HOMEPAGE="http://phenix-online.org/"
-SRC_URI="
-	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc12.tar )
-	x86? ( phenix-installer-${MY_PV}-intel-linux-2.6-fc3.tar )
-"
-
-SLOT="0"
-LICENSE="phenix"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/atk
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/openssl
-	media-gfx/nvidia-cg-toolkit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:1.2
-	sys-libs/db:4.8
-	sys-libs/gdbm
-	sys-libs/ncurses[tinfo]
-	sys-libs/readline
-	virtual/glu
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	sys-libs/zlib
-	virtual/jpeg:62"
-DEPEND="${PYTHON_DEPS}"
-
-RESTRICT="fetch"
-
-QA_PREBUILT="opt/phenix-${MY_PV}/.*"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_nofetch() {
-	elog "Please visit"
-	elog "http://www.phenix-online.org/phenix_request/index.cgi"
-	elog "and request a download password. With that done,"
-	elog "visit http://www.phenix-online.org/download/phenix/release"
-	elog "and download version \"Kernel 2.6 (64-bit; Fedora 12)\" (${A})"
-	elog "into ${DISTDIR}"
-}
-
-src_prepare() {
-	./install --prefix="${S}/foo"
-}
-
-src_install() {
-	sed \
-		-e "s:${S}/foo:${EPREFIX}/opt:g" \
-		-i \
-			build-binary/intel-linux-2.6-*/*/log/*.log \
-			build-final/intel-linux-2.6-*/*/log/*.log \
-			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/*_env \
-			foo/phenix-${MY_PV}/build/intel-linux-*/*sh \
-			foo/phenix-${MY_PV}/build/intel-linux-*/bin/* \
-			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/"
-
-	cat >> phenix <<- EOF
-	#!${EPREFIX}/bin/bash
-
-	source "${EPREFIX}/opt/phenix-${MY_PV}/phenix_env.sh"
-	exec phenix
-	EOF
-	dobin phenix
-
-	python_fix_shebang "${ED}"/opt
-	python_optimize "${ED}"/opt
-}

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
deleted file mode 100644
index 2771605..0000000
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER=2.8
-
-inherit python-single-r1 versionator wxwidgets
-
-MY_PV="$(replace_version_separator 3 -)"
-MY_P="phenix-installer-${MY_PV}"
-
-DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
-HOMEPAGE="http://phenix-online.org/"
-SRC_URI="
-	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc12.tar )
-	x86? ( phenix-installer-${MY_PV}-intel-linux-2.6-fc3.tar )
-"
-
-SLOT="0"
-LICENSE="phenix"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/atk
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/openssl
-	media-gfx/nvidia-cg-toolkit
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libpng:1.2
-	sys-libs/db:4.8
-	sys-libs/gdbm
-	sys-libs/ncurses[tinfo]
-	sys-libs/readline
-	virtual/glu
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
-	x11-libs/pixman
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXi
-	x11-libs/libXmu
-	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}"
-
-RESTRICT="fetch"
-
-QA_PREBUILT="opt/phenix-${MY_PV}/.*"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_nofetch() {
-	elog "Please visit"
-	elog "http://www.phenix-online.org/phenix_request/index.cgi"
-	elog "and request a download password. With that done,"
-	elog "visit http://www.phenix-online.org/download/phenix/release"
-	elog "and download version \"Kernel 2.6 (64-bit; Fedora 12)\" (${A})"
-	elog "into ${DISTDIR}"
-}
-
-src_prepare() {
-	./install --prefix="${S}/foo"
-}
-
-src_install() {
-	sed \
-		-e "s:${S}/foo:${EPREFIX}/opt:g" \
-		-i \
-			build-binary/intel-linux-2.6-*/*/log/*.log \
-			build-final/intel-linux-2.6-*/*/log/*.log \
-			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/*_env \
-			foo/phenix-${MY_PV}/build/intel-linux-*/*sh \
-			foo/phenix-${MY_PV}/build/intel-linux-*/bin/* \
-			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/"
-
-	cat >> phenix <<- EOF
-	#!${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
-
-	python_fix_shebang "${ED}"/opt
-	python_optimize "${ED}"/opt
-}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2014-11-14 11:41 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2014-11-14 11:41 UTC (permalink / raw
  To: gentoo-commits

commit:     09049c38879a551bacff7a1601413923f5c353e5
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 14 11:40:52 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Nov 14 11:40:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=09049c38

sci-chemistry/phenix-bin: Fix dep SLOT of sys-libs/db

Package-Manager: portage-2.2.14

---
 sci-chemistry/phenix-bin/ChangeLog                  | 3 +++
 sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 515e8de..ab7e8c3 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Nov 2014; Justin Lecher <jlec@gentoo.org> phenix-bin-1.9.1692.ebuild:
+  Fix dep SLOT of sys-libs/db
+
   13 May 2014; Justin Lecher <jlec@gentoo.org> -phenix-bin-1.9.1690.ebuild,
   +phenix-bin-1.9.1692.ebuild:
   Version Bump

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
index 32eba10..83d3d38 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${PYTHON_DEPS}
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/libpng:1.2
-	sys-libs/db:4.8
+	sys-libs/db:4.7
 	sys-libs/gdbm
 	sys-libs/ncurses[tinfo]
 	sys-libs/readline


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2014-05-13 10:04 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2014-05-13 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     6eae434d881849b43acb00c5304e54df02c2b2cc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue May 13 07:34:37 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May 13 09:15:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6eae434d

sci-chemistry/phenix-bin: Version Bump

Package-Manager: portage-2.2.10

---
 sci-chemistry/phenix-bin/ChangeLog                                    | 4 ++++
 .../{phenix-bin-1.9.1690.ebuild => phenix-bin-1.9.1692.ebuild}        | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index ddba56b..515e8de 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 May 2014; Justin Lecher <jlec@gentoo.org> -phenix-bin-1.9.1690.ebuild,
+  +phenix-bin-1.9.1692.ebuild:
+  Version Bump
+
 *phenix-bin-1.9.1690 (06 May 2014)
 
   06 May 2014; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.9.1690.ebuild:

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.9.1690.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
similarity index 95%
rename from sci-chemistry/phenix-bin/phenix-bin-1.9.1690.ebuild
rename to sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
index 2196ef1..32eba10 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.9.1690.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild
@@ -17,11 +17,12 @@ DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
 HOMEPAGE="http://phenix-online.org/"
 SRC_URI="
 	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc12.tar )
+	x86? ( phenix-installer-${MY_PV}-intel-linux-2.6-centos5.tar )
 "
 
 SLOT="0"
 LICENSE="phenix"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2014-05-06 16:44 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2014-05-06 16:44 UTC (permalink / raw
  To: gentoo-commits

commit:     2c7fc4b6a6d108239112399e3c15b268a4d9b0f2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue May  6 15:48:19 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue May  6 15:48:19 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2c7fc4b6

sci-chemistry/phenix-bin: Version Bump

Package-Manager: portage-2.2.10

---
 sci-chemistry/phenix-bin/ChangeLog                 |   5 +
 .../phenix-bin/phenix-bin-1.9.1690.ebuild          | 114 +++++++++++++++++++++
 2 files changed, 119 insertions(+)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index eb06212..ddba56b 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*phenix-bin-1.9.1690 (06 May 2014)
+
+  06 May 2014; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.9.1690.ebuild:
+  Version Bump
+
   25 Feb 2014; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.4.1496.ebuild:
   Fix prefix problems
 

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.9.1690.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.9.1690.ebuild
new file mode 100644
index 0000000..2196ef1
--- /dev/null
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.9.1690.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER=2.8
+
+inherit python-single-r1 versionator wxwidgets
+
+MY_PV="$(replace_version_separator 2 -)"
+MY_P="phenix-installer-${MY_PV}"
+
+DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
+HOMEPAGE="http://phenix-online.org/"
+SRC_URI="
+	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc12.tar )
+"
+
+SLOT="0"
+LICENSE="phenix"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/atk
+	dev-libs/boost
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/openssl
+	media-gfx/nvidia-cg-toolkit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2
+	sys-libs/db:4.8
+	sys-libs/gdbm
+	sys-libs/ncurses[tinfo]
+	sys-libs/readline
+	virtual/glu
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXi
+	x11-libs/libXmu
+	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}"
+
+RESTRICT="fetch"
+
+QA_PREBUILT="opt/phenix-${MY_PV}/.*"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_nofetch() {
+	elog "Please visit"
+	elog "http://www.phenix-online.org/phenix_request/index.cgi"
+	elog "and request a download password. With that done,"
+	elog "visit http://www.phenix-online.org/download/phenix/release"
+	elog "and download version \"Kernel 2.6 (64-bit; Fedora 12)\" (${A})"
+	elog "into ${DISTDIR}"
+}
+
+src_prepare() {
+	./install --prefix="${S}/foo"
+}
+
+src_install() {
+	sed \
+		-e "s:${S}/foo:${EPREFIX}/opt:g" \
+		-i \
+			build-binary/intel-linux-2.6-*/*/log/*.log \
+			build-final/intel-linux-2.6-*/*/log/*.log \
+			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/*_env \
+			foo/phenix-${MY_PV}/build/intel-linux-*/*sh \
+			foo/phenix-${MY_PV}/build/intel-linux-*/bin/* \
+			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/"
+
+	cat >> phenix <<- EOF
+	#!${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
+
+	python_fix_shebang "${ED}"/opt
+	python_optimize "${ED}"/opt
+}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2014-02-25 12:08 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2014-02-25 12:08 UTC (permalink / raw
  To: gentoo-commits

commit:     d9dc5968bc209ac0ab32e198fc100e235a44a2b7
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 12:05:44 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec@gentoo.org> phenix-bin-1.8.4.1496.ebuild:
+  Fix prefix problems
+
 *phenix-bin-1.8.4.1496 (09 Oct 2013)
 
   09 Oct 2013; Justin Lecher <jlec@gentoo.org> +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


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2013-10-09 19:04 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2013-10-09 19:04 UTC (permalink / raw
  To: gentoo-commits

commit:     f545687227b7dc9d1b7eda422f53e4c401035537
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 19:03:53 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Oct  9 19:03:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f5456872

sci-chemistry/phenix-bin: Version Bump

Package-Manager: portage-2.2.7

---
 sci-chemistry/phenix-bin/ChangeLog                 |   5 +
 .../phenix-bin/phenix-bin-1.8.4.1496.ebuild        | 110 +++++++++++++++++++++
 2 files changed, 115 insertions(+)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 34b5627..c094264 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*phenix-bin-1.8.4.1496 (09 Oct 2013)
+
+  09 Oct 2013; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.8.4.1496.ebuild:
+  Version Bump
+
   13 Aug 2013; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.2.1309.ebuild:
   Move jpeg to virtual
 

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
new file mode 100644
index 0000000..fa9c3fb
--- /dev/null
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.4.1496.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-single-r1 versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+MY_P="phenix-installer-${MY_PV}"
+
+DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
+HOMEPAGE="http://phenix-online.org/"
+SRC_URI="
+	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc12.tar )
+	x86? ( phenix-installer-${MY_PV}-intel-linux-2.6-fc3.tar )
+"
+
+SLOT="0"
+LICENSE="phenix"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/atk
+	dev-libs/boost
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/openssl
+	media-gfx/nvidia-cg-toolkit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2
+	sys-libs/db:4.8
+	sys-libs/gdbm
+	sys-libs/ncurses[tinfo]
+	sys-libs/readline
+	virtual/glu
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	sys-libs/zlib
+	virtual/jpeg:62"
+DEPEND="${PYTHON_DEPS}"
+
+RESTRICT="fetch"
+
+QA_PREBUILT="opt/phenix-${MY_PV}/.*"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_nofetch() {
+	elog "Please visit"
+	elog "http://www.phenix-online.org/phenix_request/index.cgi"
+	elog "and request a download password. With that done,"
+	elog "visit http://www.phenix-online.org/download/phenix/release"
+	elog "and download version \"Kernel 2.6 (64-bit; Fedora 12)\" (${A})"
+	elog "into ${DISTDIR}"
+}
+
+src_prepare() {
+	./install --prefix="${S}/foo"
+}
+
+src_install() {
+	sed \
+		-e "s:${S}/foo:${EPREFIX}/opt:g" \
+		-i \
+			build-binary/intel-linux-2.6-*/*/log/*.log \
+			build-final/intel-linux-2.6-*/*/log/*.log \
+			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/*_env \
+			foo/phenix-${MY_PV}/build/intel-linux-*/*sh \
+			foo/phenix-${MY_PV}/build/intel-linux-*/bin/* \
+			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/"
+
+	cat >> phenix <<- EOF
+	#!${EPREFIX}/bin/bash
+
+	source "${EPREFIX}/opt/phenix-${MY_PV}/phenix_env.sh"
+	exec phenix
+	EOF
+	dobin phenix
+
+	python_fix_shebang "${ED}"/opt
+	python_optimize "${ED}"/opt
+}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2013-08-13 22:20 Nicolas Bock
  0 siblings, 0 replies; 22+ messages in thread
From: Nicolas Bock @ 2013-08-13 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     33d963556759142b5f339f6e6e85920283e822e6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 16:27:09 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Aug 13 16:27:09 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=33d96355

sci-chemistry/phenix-bin: Move jpeg to virtual

Package-Manager: portage-2.2.0

---
 sci-chemistry/phenix-bin/ChangeLog                    | 3 +++
 sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index ba9d515..34b5627 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Aug 2013; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.2.1309.ebuild:
+  Move jpeg to virtual
+
   04 Jun 2013; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.2.1309.ebuild:
   Fix for correct usage of new python eclasses
 

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
index bda1380..fa9c3fb 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
@@ -36,7 +36,6 @@ RDEPEND="${PYTHON_DEPS}
 	media-gfx/nvidia-cg-toolkit
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/jpeg:62
 	media-libs/libpng:1.2
 	sys-libs/db:4.8
 	sys-libs/gdbm
@@ -60,7 +59,8 @@ RDEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/libXxf86vm
-	sys-libs/zlib"
+	sys-libs/zlib
+	virtual/jpeg:62"
 DEPEND="${PYTHON_DEPS}"
 
 RESTRICT="fetch"


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2013-06-04 11:59 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2013-06-04 11:59 UTC (permalink / raw
  To: gentoo-commits

commit:     d4d824f7ec1f107e15c8ddd9f515cb15abb29de0
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 11:34:44 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 11:34:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d4d824f7

sci-chemistry/phenix-bin: Fix for correct usage of new python eclasses

Package-Manager: portage-2.2.0_alpha177

---
 sci-chemistry/phenix-bin/ChangeLog                    | 3 +++
 sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 1d99115..ba9d515 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jun 2013; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.2.1309.ebuild:
+  Fix for correct usage of new python eclasses
+
 *phenix-bin-1.8.2.1309 (11 Mar 2013)
 
   11 Mar 2013; Justin Lecher <jlec@gentoo.org> -phenix-bin-1.8.1.1168.ebuild,

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
index 628ed97..bda1380 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
@@ -23,7 +23,9 @@ LICENSE="phenix"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-RDEPEND="
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
 	app-arch/bzip2
 	dev-db/sqlite:3
 	dev-libs/atk
@@ -59,7 +61,7 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXxf86vm
 	sys-libs/zlib"
-DEPEND=""
+DEPEND="${PYTHON_DEPS}"
 
 RESTRICT="fetch"
 


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2013-03-21  6:54 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2013-03-21  6:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2099a249aacb0660adfd2b7beec86425305b4ddf
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 16:42:06 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 16:42:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2099a249

sci-chemistry/phenix-bin: Version BUmp

Package-Manager: portage-2.2.0_alpha166

---
 sci-chemistry/phenix-bin/ChangeLog                 |    6 ++++
 ....1.1168.ebuild => phenix-bin-1.8.2.1309.ebuild} |   28 +++++---------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 5aa78cd..1d99115 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*phenix-bin-1.8.2.1309 (11 Mar 2013)
+
+  11 Mar 2013; Justin Lecher <jlec@gentoo.org> -phenix-bin-1.8.1.1168.ebuild,
+  +phenix-bin-1.8.2.1309.ebuild:
+  Version BUmp
+
   17 Jan 2013; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1.1168.ebuild,
   metadata.xml:
   Add new dep on libtinfo.so

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
similarity index 82%
rename from sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
rename to sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
index 8646157..628ed97 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.2.1309.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit python versionator
+inherit python-single-r1 versionator
 
 MY_PV="$(replace_version_separator 3 -)"
 MY_P="phenix-installer-${MY_PV}"
@@ -14,7 +14,7 @@ MY_P="phenix-installer-${MY_PV}"
 DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
 HOMEPAGE="http://phenix-online.org/"
 SRC_URI="
-	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc15.tar )
+	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc12.tar )
 	x86? ( phenix-installer-${MY_PV}-intel-linux-2.6-fc3.tar )
 "
 
@@ -72,23 +72,15 @@ pkg_nofetch() {
 	elog "http://www.phenix-online.org/phenix_request/index.cgi"
 	elog "and request a download password. With that done,"
 	elog "visit http://www.phenix-online.org/download/phenix/release"
-	elog "and download version \"Kernel 2.6 (64-bit; Fedora 15)\" (${A})"
+	elog "and download version \"Kernel 2.6 (64-bit; Fedora 12)\" (${A})"
 	elog "into ${DISTDIR}"
 }
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	./install --prefix="${S}/foo"
-
 }
 
 src_install() {
-#	find -name "*.py[co]" -delete
-#	find -name SConstruct -delete
 	sed \
 		-e "s:${S}/foo:${EPREFIX}/opt:g" \
 		-i \
@@ -100,7 +92,6 @@ src_install() {
 			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/base/etc/{gtk*,pango}/* \
 			foo/phenix-${MY_PV}/phenix_env* \
 			|| die
-#	grep ${S} * -R
 	dodir /opt
 	mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/"
 
@@ -111,12 +102,7 @@ src_install() {
 	exec phenix
 	EOF
 	dobin phenix
-}
-
-pkg_postinst() {
-	python_mod_optimize "/opt/phenix-${MY_PV}"
-}
 
-pkg_postrm() {
-	python_mod_cleanup "/opt/phenix-${MY_PV}"
+	python_fix_shebang "${ED}"/opt
+	python_optimize "${ED}"/opt
 }


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2013-01-17  7:44 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2013-01-17  7:44 UTC (permalink / raw
  To: gentoo-commits

commit:     a85300b72c38b61a12b5eed5aeef8d3cfedc4035
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 07:43:37 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 07:43:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a85300b7

sci-chemistry/phenix-bin: Add new dep on libtinfo.so

Package-Manager: portage-2.2.0_alpha153

---
 sci-chemistry/phenix-bin/ChangeLog                 |    6 +++++-
 sci-chemistry/phenix-bin/metadata.xml              |    2 +-
 .../phenix-bin/phenix-bin-1.8.1.1168.ebuild        |    4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 742f390..5aa78cd 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-chemistry/phenix-bin
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Jan 2013; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1.1168.ebuild,
+  metadata.xml:
+  Add new dep on libtinfo.so
+
   14 Nov 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1.1168.ebuild:
   Make no-fetch msg better understandable
 

diff --git a/sci-chemistry/phenix-bin/metadata.xml b/sci-chemistry/phenix-bin/metadata.xml
index d369d06..897aa2e 100644
--- a/sci-chemistry/phenix-bin/metadata.xml
+++ b/sci-chemistry/phenix-bin/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+  <herd>sci</herd>
 </pkgmetadata>

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
index a91ce88..8646157 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -38,7 +38,7 @@ RDEPEND="
 	media-libs/libpng:1.2
 	sys-libs/db:4.8
 	sys-libs/gdbm
-	sys-libs/ncurses
+	sys-libs/ncurses[tinfo]
 	sys-libs/readline
 	virtual/glu
 	x11-libs/cairo


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2012-11-14 15:20 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2012-11-14 15:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c19a5a3a9c7b7d65393c98615bf940710df93c92
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 14 14:46:31 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Nov 14 14:46:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c19a5a3a

sci-chemistry/phenix-bin: Make no-fetch msg better understandable

Package-Manager: portage-2.2.0_alpha142

---
 sci-chemistry/phenix-bin/ChangeLog                 |    3 +++
 .../phenix-bin/phenix-bin-1.8.1.1168.ebuild        |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index a32c5ba..742f390 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   14 Nov 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1.1168.ebuild:
+  Make no-fetch msg better understandable
+
+  14 Nov 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1.1168.ebuild:
   Fix deps
 
 *phenix-bin-1.8.1.1168 (09 Oct 2012)

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
index 990525e..a91ce88 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
@@ -72,7 +72,8 @@ pkg_nofetch() {
 	elog "http://www.phenix-online.org/phenix_request/index.cgi"
 	elog "and request a download password. With that done,"
 	elog "visit http://www.phenix-online.org/download/phenix/release"
-	elog "and downlaod ${A} to ${DISTDIR}"
+	elog "and download version \"Kernel 2.6 (64-bit; Fedora 15)\" (${A})"
+	elog "into ${DISTDIR}"
 }
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2012-11-14 14:41 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2012-11-14 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     086f7d4a05fa0348373efdcb44d5a0862f75331f
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 14 14:41:31 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Nov 14 14:41:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=086f7d4a

sci-chemistry/phenix-bin: Fix deps

Package-Manager: portage-2.2.0_alpha142

---
 sci-chemistry/phenix-bin/ChangeLog                 |    3 ++
 .../phenix-bin/phenix-bin-1.8.1.1168.ebuild        |   36 +++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 2647479..a32c5ba 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Nov 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1.1168.ebuild:
+  Fix deps
+
 *phenix-bin-1.8.1.1168 (09 Oct 2012)
 
   09 Oct 2012; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.8.1.1168.ebuild,

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
index 75fe8b0..990525e 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
@@ -24,7 +24,41 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	media-libs/jpeg:62"
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/atk
+	dev-libs/boost
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/openssl
+	media-gfx/nvidia-cg-toolkit
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/jpeg:62
+	media-libs/libpng:1.2
+	sys-libs/db:4.8
+	sys-libs/gdbm
+	sys-libs/ncurses
+	sys-libs/readline
+	virtual/glu
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	x11-libs/pixman
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	sys-libs/zlib"
 DEPEND=""
 
 RESTRICT="fetch"


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2012-10-09 14:15 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2012-10-09 14:15 UTC (permalink / raw
  To: gentoo-commits

commit:     8d705937ddc096cce7c1ca2eb5d49a635d9e91d9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  9 14:15:24 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Oct  9 14:15:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8d705937

sci-chemistry/phenix-bin: Version Bump

(Portage version: 2.2.0_alpha136/git/Linux x86_64)

---
 sci-chemistry/phenix-bin/ChangeLog                 |    6 ++++++
 ....8.1069.ebuild => phenix-bin-1.8.1.1168.ebuild} |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index 22c887a..2647479 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*phenix-bin-1.8.1.1168 (09 Oct 2012)
+
+  09 Oct 2012; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.8.1.1168.ebuild,
+  -phenix-bin-1.8.1069.ebuild:
+  Version Bump
+
   21 Sep 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1069.ebuild:
   Add missing dep
 

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
similarity index 97%
rename from sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
rename to sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
index fa7088c..75fe8b0 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.1.1168.ebuild
@@ -8,7 +8,7 @@ PYTHON_DEPEND="2"
 
 inherit python versionator
 
-MY_PV="$(replace_version_separator 2 -)"
+MY_PV="$(replace_version_separator 3 -)"
 MY_P="phenix-installer-${MY_PV}"
 
 DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2012-09-21  6:00 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2012-09-21  6:00 UTC (permalink / raw
  To: gentoo-commits

commit:     cf46a7fd0324f1a5416c0fad384c371ab2a3a0ab
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 05:53:55 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 05:53:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cf46a7fd

sci-chemistry/phenix-bin: Don't double prefix

(Portage version: 2.2.0_alpha130/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/phenix-bin/ChangeLog                 |    3 +++
 .../phenix-bin/phenix-bin-1.8.1069.ebuild          |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index b6139e0..063fad4 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   21 Sep 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1069.ebuild:
+  Don't double prefix
+
+  21 Sep 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1069.ebuild:
   Not everyone installs on my box
 
   20 Sep 2012; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.8.1069.ebuild,

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
index e235479..c2aed71 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
@@ -75,9 +75,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize "${EPREFIX}/opt/phenix-${MY_PV}"
+	python_mod_optimize "/opt/phenix-${MY_PV}"
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${EPREFIX}/opt/phenix-${MY_PV}"
+	python_mod_cleanup "/opt/phenix-${MY_PV}"
 }


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2012-09-21  6:00 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2012-09-21  6:00 UTC (permalink / raw
  To: gentoo-commits

commit:     cf8be70f33cff693986238ef6eaedb254396855a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 05:51:37 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 05:51:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cf8be70f

sci-chemistry/phenix-bin: Not everyone installs on my box

(Portage version: 2.2.0_alpha130/git/Linux x86_64, unsigned Manifest commit)

---
 sci-chemistry/phenix-bin/ChangeLog                 |    3 +++
 .../phenix-bin/phenix-bin-1.8.1069.ebuild          |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
index a783f12..b6139e0 100644
--- a/sci-chemistry/phenix-bin/ChangeLog
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Sep 2012; Justin Lecher <jlec@gentoo.org> phenix-bin-1.8.1069.ebuild:
+  Not everyone installs on my box
+
   20 Sep 2012; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.8.1069.ebuild,
   +metadata.xml:
   New Addition

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
index 897b55b..e235479 100644
--- a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
@@ -53,8 +53,8 @@ src_install() {
 	sed \
 		-e "s:${S}/foo:${EPREFIX}/opt:g" \
 		-i \
-			build-binary/intel-linux-2.6-*/paul/log/*.log \
-			build-final/intel-linux-2.6-*/paul/log/*.log \
+			build-binary/intel-linux-2.6-*/*/log/*.log \
+			build-final/intel-linux-2.6-*/*/log/*.log \
 			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/*_env \
 			foo/phenix-${MY_PV}/build/intel-linux-*/*sh \
 			foo/phenix-${MY_PV}/build/intel-linux-*/bin/* \


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/
@ 2012-09-20 12:39 Justin Lecher
  0 siblings, 0 replies; 22+ messages in thread
From: Justin Lecher @ 2012-09-20 12:39 UTC (permalink / raw
  To: gentoo-commits

commit:     a08f5dea99628341944586f95ad92ed88ba854f8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 12:37:10 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Sep 20 12:37:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a08f5dea

new addition

---
 sci-chemistry/phenix-bin/ChangeLog                 |   14 ++++
 sci-chemistry/phenix-bin/metadata.xml              |    5 +
 .../phenix-bin/phenix-bin-1.8.1069.ebuild          |   83 ++++++++++++++++++++
 3 files changed, 102 insertions(+), 0 deletions(-)

diff --git a/sci-chemistry/phenix-bin/ChangeLog b/sci-chemistry/phenix-bin/ChangeLog
new file mode 100644
index 0000000..a783f12
--- /dev/null
+++ b/sci-chemistry/phenix-bin/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for sci-chemistry/phenix-bin
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  20 Sep 2012; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.8.1069.ebuild,
+  +metadata.xml:
+  New Addition
+
+*phenix-bin-1.8.1069 (20 Sep 2012)
+
+  20 Sep 2012; Justin Lecher <jlec@gentoo.org> +phenix-bin-1.8.1069.ebuild,
+  +metadata.xml:
+  New Addition
+

diff --git a/sci-chemistry/phenix-bin/metadata.xml b/sci-chemistry/phenix-bin/metadata.xml
new file mode 100644
index 0000000..d369d06
--- /dev/null
+++ b/sci-chemistry/phenix-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci</herd>
+</pkgmetadata>

diff --git a/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild b/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
new file mode 100644
index 0000000..897b55b
--- /dev/null
+++ b/sci-chemistry/phenix-bin/phenix-bin-1.8.1069.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit python versionator
+
+MY_PV="$(replace_version_separator 2 -)"
+MY_P="phenix-installer-${MY_PV}"
+
+DESCRIPTION="Python-based Hierarchical ENvironment for Integrated Xtallography"
+HOMEPAGE="http://phenix-online.org/"
+SRC_URI="
+	amd64? ( phenix-installer-${MY_PV}-intel-linux-2.6-x86_64-fc15.tar )
+	x86? ( phenix-installer-${MY_PV}-intel-linux-2.6-fc3.tar )
+"
+
+SLOT="0"
+LICENSE="phenix"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RESTRICT="fetch"
+
+QA_PREBUILT="opt/phenix-${MY_PV}/.*"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_nofetch() {
+	elog "Please visit"
+	elog "http://www.phenix-online.org/phenix_request/index.cgi"
+	elog "and request a download password. With that done,"
+	elog "visit http://www.phenix-online.org/download/phenix/release"
+	elog "and downlaod ${A} to ${DISTDIR}"
+}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	./install --prefix="${S}/foo"
+
+}
+
+src_install() {
+#	find -name "*.py[co]" -delete
+#	find -name SConstruct -delete
+	sed \
+		-e "s:${S}/foo:${EPREFIX}/opt:g" \
+		-i \
+			build-binary/intel-linux-2.6-*/paul/log/*.log \
+			build-final/intel-linux-2.6-*/paul/log/*.log \
+			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/*_env \
+			foo/phenix-${MY_PV}/build/intel-linux-*/*sh \
+			foo/phenix-${MY_PV}/build/intel-linux-*/bin/* \
+			foo/phenix-${MY_PV}/build/intel-linux-2.6-*/base/etc/{gtk*,pango}/* \
+			foo/phenix-${MY_PV}/phenix_env* \
+			|| die
+#	grep ${S} * -R
+	dodir /opt
+	mv "${S}/foo/phenix-${MY_PV}" "${ED}/opt/"
+
+	cat >> phenix <<- EOF
+	#!${EPREFIX}/bin/bash
+
+	source "${EPREFIX}/opt/phenix-${MY_PV}/phenix_env.sh"
+	exec phenix
+	EOF
+	dobin phenix
+}
+
+pkg_postinst() {
+	python_mod_optimize "${EPREFIX}/opt/phenix-${MY_PV}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${EPREFIX}/opt/phenix-${MY_PV}"
+}


^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2017-03-26 14:46 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-21  6:10 [gentoo-commits] proj/sci:master commit in: sci-chemistry/phenix-bin/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2017-03-26 14:45 Justin Lecher
2015-09-09  8:11 Justin Lecher
2015-09-09  7:11 Justin Lecher
2015-08-05 13:35 Justin Lecher
2015-08-03 12:31 Justin Lecher
2015-06-22 10:58 Justin Lecher
2014-11-14 11:41 Justin Lecher
2014-05-13 10:04 Justin Lecher
2014-05-06 16:44 Justin Lecher
2014-02-25 12:08 Justin Lecher
2013-10-09 19:04 Justin Lecher
2013-08-13 22:20 Nicolas Bock
2013-06-04 11:59 Justin Lecher
2013-03-21  6:54 Justin Lecher
2013-01-17  7:44 Justin Lecher
2012-11-14 15:20 Justin Lecher
2012-11-14 14:41 Justin Lecher
2012-10-09 14:15 Justin Lecher
2012-09-21  6:00 Justin Lecher
2012-09-21  6:00 Justin Lecher
2012-09-20 12:39 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox