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 1PzOVK-0003in-Kw for garchives@archives.gentoo.org; Tue, 15 Mar 2011 07:17:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBD73E050F; Tue, 15 Mar 2011 07:16:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AB25DE0504 for ; Tue, 15 Mar 2011 07:16:20 +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 18DE01B426D for ; Tue, 15 Mar 2011 07:16:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7B2B880079 for ; Tue, 15 Mar 2011 07:16:19 +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: Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/embassy-ng.eclass eclass/emboss.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: a8eefd318317de24b6579074d52d2f722dea66b4 Date: Tue, 15 Mar 2011 07:16:19 +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: fa4104c635093208412deb0357fe7a17 commit: a8eefd318317de24b6579074d52d2f722dea66b4 Author: Justin Lecher gentoo org> AuthorDate: Tue Mar 15 07:08:55 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Mar 15 07:08:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Da8eefd31 renamed embassy-ng -> emboss.eclass --- eclass/{embassy-ng.eclass =3D> emboss.eclass} | 35 +++++++++++--------= ------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/eclass/embassy-ng.eclass b/eclass/emboss.eclass similarity index 87% rename from eclass/embassy-ng.eclass rename to eclass/emboss.eclass index 317a08e..cee063d 100644 --- a/eclass/embassy-ng.eclass +++ b/eclass/emboss.eclass @@ -8,7 +8,7 @@ # Author of the next generation eclass # Justin Lecher =20 -# @ECLASS: embassy-ng.eclass +# @ECLASS: emboss.eclass # @MAINTAINER: # sci-biology@gentoo.org # jlec@gentoo.org @@ -51,12 +51,11 @@ EAPI=3D"4" =20 inherit autotools eutils multilib =20 -DESCRIPTION=3D"Based on the $ECLASS eclass" 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 mysql pdf png postgres static-libs X " =20 DEPEND=3D" dev-libs/expat @@ -65,11 +64,7 @@ DEPEND=3D" sys-libs/zlib mysql? ( dev-db/mysql ) pdf? ( media-libs/libharu ) - png? ( - sys-libs/zlib - media-libs/libpng - media-libs/gd - ) + png? ( media-libs/gd[png] ) postgres? ( dev-db/postgresql-base ) X? ( x11-libs/libXt ) " @@ -78,14 +73,14 @@ RDEPEND=3D" ${DEPEND} " =20 -DOCS=3D"AUTHORS ChangeLog NEWS README" +DOCS=3D"AUTHORS ChangeLog NEWS README " =20 if [[ ${PN} =3D=3D "emboss" ]] ; then - EBOV=3D"${PV/_p*}" + 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 " + IUSE+=3D"minimal " RDEPEND+=3D" !sys-devel/cons " @@ -99,23 +94,23 @@ if [[ ${PN} =3D=3D "emboss" ]] ; then sci-biology/transfac ) " - S=3D"${WORKDIR}/EMBOSS-${EBOV}" - DOCS+=3D" FAQ THANKS " + S=3D${WORKDIR}/EMBOSS-${EBOV} + DOCS+=3D"FAQ THANKS " else # The EMBASSY package name, retrieved from the inheriting ebuild's name EN=3D${PN:8} # The full name and version of the EMBASSY package (excluding the Gento= o # revision number) - EF=3D"$(echo ${EN} | tr "[:lower:]" "[:upper:]")-${PV}" + 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= -${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] " + DEPEND+=3D">=3Dsci-biology/emboss-6.3.1_p4[mysql=3D,pdf=3D,png=3D,postg= res=3D,static-libs=3D,X=3D] " =20 - S=3D"${WORKDIR}"/${EF} + S=3D${WORKDIR}/${EF} fi =20 -# @FUNCTION: embassy-ng_src_prepare +# @FUNCTION: emboss_src_prepare # @USAGE: # @RETURN: # @MAINTAINER: @@ -127,13 +122,13 @@ fi # 3. runs eautoreconf unless NO_RECONF is set # =20 -embassy-ng_src_prepare() { +emboss_src_prepare() { [[ ${PN} =3D=3D emboss ]] && [[ -n ${EBO_PATCH} ]] && epatch "${WORKDIR= }"/${P}.patch [[ -f "${FILESDIR}"/${PF}.patch ]] && epatch "${FILESDIR}"/${PF}.patch [[ -n ${NO_RECONF} ]] || eautoreconf } =20 -# @FUNCTION: embassy-ng_src_prepare +# @FUNCTION: emboss_src_prepare # @USAGE: # @RETURN: # @MAINTAINER: @@ -153,7 +148,7 @@ embassy-ng_src_prepare() { # --enable-systemlibs # ${EBO_ECONF} =20 -embassy-ng_src_configure() { +emboss_src_configure() { econf \ $(use_with X x) \ $(use_with png pngdriver "${EPREFIX}/usr") \