From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pz42N-0002Ap-Dr for garchives@archives.gentoo.org; Mon, 14 Mar 2011 09:26:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20E9FE0453; Mon, 14 Mar 2011 09:25:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D1E36E0453 for ; Mon, 14 Mar 2011 09:25:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 540981B405B for ; Mon, 14 Mar 2011 09:25:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B3F518006A for ; Mon, 14 Mar 2011 09:25:54 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <0e94cc6a36156187f23cfc58f3b09070edd4b055.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/embassy-ng.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 0e94cc6a36156187f23cfc58f3b09070edd4b055 Date: Mon, 14 Mar 2011 09:25:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 43dd090852d0ac6d40baabee3fce2cff commit: 0e94cc6a36156187f23cfc58f3b09070edd4b055 Author: Justin Lecher gentoo org> AuthorDate: Mon Mar 14 09:25:43 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Mar 14 09:25:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D0e94cc6a Last cleanings before review --- eclass/embassy-ng.eclass | 47 +++++++++++++++++++++-------------------= ----- 1 files changed, 22 insertions(+), 25 deletions(-) diff --git a/eclass/embassy-ng.eclass b/eclass/embassy-ng.eclass index ff137a3..317a08e 100644 --- a/eclass/embassy-ng.eclass +++ b/eclass/embassy-ng.eclass @@ -14,19 +14,11 @@ # jlec@gentoo.org # @BLURB: Use this to easy install EMBOSS and EMBASSY programs (EMBOSS a= dd-ons). # @DESCRIPTION: -# The inheriting ebuild should provide EBOV, EBO_DESCRIPTION and "KEYWOR= DS", -# before the inherit line. -# Additionally "(R|P)DEPEND"encies and other standard ebuild Variables c= an be extended (FOO+=3D"BAR"). +# The inheriting ebuild should provide EBO_DESCRIPTION before the inheri= t line. +# KEYWORDS should set and additional "(R|P)DEPEND"encies and other stand= ard +# ebuild Variables can be extended (FOO+=3D"BAR"). # The inheriting ebuild's name must begin by "embassy-" and must be EAPI= =3D4 conform. =20 -# @ECLASS-VARIABLE: EBOV -# @DEFAULT_UNSET -# @REQUIRED -# @DESCRIPTION: -# This specifies the minimum Emboss version needed for this package. *DE= PEND are set to -# >=3Dsci-biology/emboss-${EBOV}. -# This variable must be always set by the ebuild before the inheriting l= ine - # @ECLASS-VARIABLE: EBO_DESCRIPTION # @DESCRIPTION: # Should be set. Completes the describtion of the embassy module as foll= ows: @@ -48,7 +40,7 @@ # @ECLASS-VARIABLE: NO_RECONF # @DEFAULT_UNSET # @DESCRIPTION: -# Set this, if you do want to have eautoreconf be run after patching. +# Set this, if you do not want to have eautoreconf be run after patching= . =20 # @ECLASS-VARIABLE: EBO_ECONF # @DEFAULT_UNSET @@ -60,11 +52,11 @@ EAPI=3D"4" inherit autotools eutils multilib =20 DESCRIPTION=3D"Based on the $ECLASS eclass" -HOMEPAGE=3D"http://emboss.sourceforge.net/" +HOMEPAGE=3D"http://emboss.sourceforge.net" LICENSE=3D"LGPL-2 GPL-2" =20 SLOT=3D"0" -IUSE+=3D" doc minimal mysql pdf png postgres static-libs X" +IUSE+=3D" doc minimal mysql pdf png postgres static-libs X " =20 DEPEND=3D" dev-libs/expat @@ -79,21 +71,25 @@ DEPEND=3D" media-libs/gd ) postgres? ( dev-db/postgresql-base ) - X? ( x11-libs/libXt )" + X? ( x11-libs/libXt ) + " =20 -RDEPEND=3D"${DEPEND}" +RDEPEND=3D" + ${DEPEND} + " =20 DOCS=3D"AUTHORS ChangeLog NEWS README" =20 -[[ -z ${EBOV} ]] && die "You must set EBOV in the ebuild!" - if [[ ${PN} =3D=3D "emboss" ]] ; then + EBOV=3D"${PV/_p*}" DESCRIPTION=3D"The European Molecular Biology Open Software Suite - A s= equence analysis package" SRC_URI=3D"ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${EBOV}.tar.gz" [[ -n ${EBO_PATCH} ]] && SRC_URI+=3D" ftp://${PN}.open-bio.org/pub/EMBO= SS/fixes/patches/patch-1-${EBO_PATCH}.gz -> ${P}.patch.gz" - IUSE+=3D" minimal" - RDEPEND+=3D" !sys-devel/cons" - PDEPEND=3D" + IUSE+=3D" minimal " + RDEPEND+=3D" + !sys-devel/cons + " + PDEPEND+=3D" !minimal? ( sci-biology/aaindex sci-biology/cutg @@ -101,9 +97,10 @@ if [[ ${PN} =3D=3D "emboss" ]] ; then sci-biology/prosite sci-biology/rebase sci-biology/transfac - )" + ) + " S=3D"${WORKDIR}/EMBOSS-${EBOV}" - DOCS+=3D" FAQ THANKS" + DOCS+=3D" FAQ THANKS " else # The EMBASSY package name, retrieved from the inheriting ebuild's name EN=3D${PN:8} @@ -112,8 +109,8 @@ else EF=3D"$(echo ${EN} | tr "[:lower:]" "[:upper:]")-${PV}" EBO_DESCRIPTION=3D${EBO_DESCRIPTION:=3D${EN}} DESCRIPTION=3D"EMBOSS integrated version of ${EBO_DESCRIPTION}" - SRC_URI=3D"ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz -> embassy= -${EBOV}-${PN:8}-${PV}.tar.gz" - DEPEND+=3D" >=3Dsci-biology/emboss-${EBOV}[mysql=3D,pdf=3D,png=3D,postg= res=3D,static-libs=3D,X=3D]" + SRC_URI=3D"ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz -> embassy= -${PN:8}-${PV}.tar.gz" + DEPEND+=3D" >=3Dsci-biology/emboss-6.3.1_p4[mysql=3D,pdf=3D,png=3D,post= gres=3D,static-libs=3D,X=3D] " =20 S=3D"${WORKDIR}"/${EF} fi