From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7D5F139694 for ; Sun, 26 Mar 2017 14:46:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 792C623406F; Sun, 26 Mar 2017 14:46:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4814223406F for ; Sun, 26 Mar 2017 14:46:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AC8634167F for ; Sun, 26 Mar 2017 14:46:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0515B7401 for ; Sun, 26 Mar 2017 14:45:58 +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: <1490519609.5fe779a3c9044048d5b176710c90496e24b00ffe.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/phenix-bin-1.10.2155.ebuild sci-chemistry/phenix-bin/phenix-bin-1.9.1692.ebuild X-VCS-Directories: sci-chemistry/phenix-bin/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 5fe779a3c9044048d5b176710c90496e24b00ffe X-VCS-Branch: master Date: Sun, 26 Mar 2017 14:45:58 +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: ab63530c-bf85-4152-9636-7014924caec7 X-Archives-Hash: c11f79d9b53b7bbdcd78b78975b96f14 commit: 5fe779a3c9044048d5b176710c90496e24b00ffe Author: Justin Lecher gentoo org> AuthorDate: Sun Mar 26 09:13:29 2017 +0000 Commit: Justin Lecher gentoo 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 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 -}