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 A27191381F3 for ; Sun, 16 Jun 2013 15:54:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3C66E096B; Sun, 16 Jun 2013 15:53:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05D37E0967 for ; Sun, 16 Jun 2013 15:53:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E82BB33E378 for ; Sun, 16 Jun 2013 15:53:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E147CE468F for ; Sun, 16 Jun 2013 15:53:45 +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: <1371395737.3e1cb4dc9866f4cebd8eeedfac3ff142c872a7d2.jlec@gentoo> Subject: [gentoo-commits] proj/sci:fixing commit in: sci-chemistry/specView/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/specView/ChangeLog sci-chemistry/specView/specView-1.0.2.ebuild X-VCS-Directories: sci-chemistry/specView/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 3e1cb4dc9866f4cebd8eeedfac3ff142c872a7d2 X-VCS-Branch: fixing Date: Sun, 16 Jun 2013 15:53:45 +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: 11e96fa4-e9e8-42b2-bb8c-628764ee60f3 X-Archives-Hash: add9e93d9a83109ba6aa14e414c17695 Message-ID: <20130616155345.vtJFZ-JIkjxsD0OYM1guuA4W3EKiXd7uILuntNJsNYM@z> commit: 3e1cb4dc9866f4cebd8eeedfac3ff142c872a7d2 Author: Justin Lecher gentoo org> AuthorDate: Sun Jun 16 15:15:37 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Jun 16 15:15:37 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3e1cb4dc sci-chemistry/specView: Bump to EAPI=5 and python-single-r1.eclass Package-Manager: portage-2.2.0_alpha180 --- sci-chemistry/specView/ChangeLog | 3 ++ sci-chemistry/specView/specView-1.0.2.ebuild | 52 +++++++++------------------- 2 files changed, 19 insertions(+), 36 deletions(-) diff --git a/sci-chemistry/specView/ChangeLog b/sci-chemistry/specView/ChangeLog index 09193d6..b6fe2af 100644 --- a/sci-chemistry/specView/ChangeLog +++ b/sci-chemistry/specView/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 16 Jun 2013; Justin Lecher specView-1.0.2.ebuild: + Bump to EAPI=5 and python-single-r1.eclass + 03 Mar 2013; Justin Lecher specView-1.0.2.ebuild, metadata.xml: Fix quoting diff --git a/sci-chemistry/specView/specView-1.0.2.ebuild b/sci-chemistry/specView/specView-1.0.2.ebuild index 89666a6..a0a5bac 100644 --- a/sci-chemistry/specView/specView-1.0.2.ebuild +++ b/sci-chemistry/specView/specView-1.0.2.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 toolchain-funcs +inherit multilib python-single-r1 toolchain-funcs DESCRIPTION="Fast way to visualise NMR spectrum and peak data" HOMEPAGE="http://www.ccpn.ac.uk/software/specview" @@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND=" - dev-python/pyopengl - dev-python/pyside[webkit]" + dev-python/pyopengl[${PYTHON_USEDEP}] + dev-python/pyside[webkit,${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" S="${WORKDIR}"/ccpnmr/ccpnmr3.0/ @@ -30,11 +30,6 @@ S="${WORKDIR}"/ccpnmr/ccpnmr3.0/ #unbundle inchi #parallel build -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - src_prepare() { sed \ -e "s|/usr|"${EPREFIX}"/usr|g" \ @@ -43,7 +38,7 @@ src_prepare() { -e "/^OPT_FLAG/s:=.*$:= ${CFLAGS}:g" \ -e "/^LINK_FLAGS/s:$: ${LDFLAGS}:g" \ -e "/^PYTHON_DIR/s:=.*:= "${EPREFIX}"/usr:g" \ - -e "/^PYTHON_LIB/s:=.*:= $(python_get_library -l):g" \ + -e "/^PYTHON_LIB/s:=.*:= $(python_get_LIBS):g" \ -e "/^PYTHON_INCLUDE_FLAGS/s:=.*:= -I"${EPREFIX}"$(python_get_includedir) -I"${EPREFIX}"$(python_get_sitedir)/numpy/core/include/numpy:g" \ -e "/^PYTHON_LIB_FLAGS/s:=.*:= -L"${EPREFIX}"/usr/$(get_libdir):g" \ -e "/^SHARED_FLAGS/s:=.*:= -shared:g" \ @@ -72,37 +67,22 @@ src_install() { find . -name "*.pyc" -type f -delete dodir /usr/bin sed \ - -e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \ - -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \ - -e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \ - -e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \ - -e "s|gentoopython|$(PYTHON -a)|g" \ - -e "s|gentoousr|${EPREFIX}/usr|g" \ - -e "s|//|/|g" \ + -e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \ + -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \ + -e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \ + -e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \ + -e "s|gentoopython|${PYTHON}|g" \ + -e "s|gentoousr|${EPREFIX}/usr|g" \ + -e "s|//|/|g" \ "${FILESDIR}"/${PN} > "${ED}"/usr/bin/${PN} || die fperms 755 /usr/bin/${PN} - insinto ${in_path} - dodir ${in_path}/cNg rm -rf cNg || die ebegin "Installing main files" - doins -r * - eend - - ebegin "Adjusting permissions" - - for _file in $(find "${ED}" -type f -name "*so"); do - chmod 755 ${_file} - done + python_moduleinto ${PN} + python_domodule * eend -} - -pkg_postinst() { - python_mod_optimize ${PN} -} - -pkg_postrm() { - python_mod_cleanup ${PN} + python_optimize }