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 1Pxl8H-0001RT-Dh for garchives@archives.gentoo.org; Thu, 10 Mar 2011 19:02:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABCEDE06EC; Thu, 10 Mar 2011 19:00:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6C5A9E06EC for ; Thu, 10 Mar 2011 19:00:28 +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 15C091B4266 for ; Thu, 10 Mar 2011 19:00:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 71A308006A for ; Thu, 10 Mar 2011 19:00:27 +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: <0ec40849d2201c1d4a15ce8a73b85dc4408bb953.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: 0ec40849d2201c1d4a15ce8a73b85dc4408bb953 Date: Thu, 10 Mar 2011 19:00:27 +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: 382e8d4dad9e1884b337b5b97771260c commit: 0ec40849d2201c1d4a15ce8a73b85dc4408bb953 Author: Justin Lecher gentoo org> AuthorDate: Thu Mar 10 16:36:05 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Mar 10 16:36:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D0ec40849 embassy-ng.eclass progressing --- eclass/embassy-ng.eclass | 91 ++++++++++++++++++++++++++++++++++++++++= ------ 1 files changed, 80 insertions(+), 11 deletions(-) diff --git a/eclass/embassy-ng.eclass b/eclass/embassy-ng.eclass index ad5e6ae..951e5eb 100644 --- a/eclass/embassy-ng.eclass +++ b/eclass/embassy-ng.eclass @@ -8,15 +8,52 @@ # Author of the next generation eclass # Justin Lecher =20 -# @ECLASS: versionator.eclass +# @ECLASS: embassy-ng.eclass # @MAINTAINER: # sci-biology@gentoo.org # jlec@gentoo.org -# @BLURB: Use this to easy install EMBASSY programs (EMBOSS add-ons). -# @DESCRIPTION: The inheriting ebuild should provide a "DESCRIPTION", "K= EYWORDS" -# and, if necessary, add "(R|P)DEPEND"encies. Additionnaly, the inheriti= ng -# ebuild's name must begin by "embassy-". Also, before inheriting, the e= build -# should specify what version of EMBOSS is required by setting EBOV. +# @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 set. +# The inheriting ebuild's name must begin by "embassy-" and must be EAPI= =3D4 conform. + +# @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: +# +# EMBOSS integrated version of EBO_DESCRIPTION" +# +# Defaults to the upstream name of the module. + +# @ECLASS-VARIABLE: EBO_PATCH +# @DEFAULT_UNSET +# @DESCRIPTION: Specify the patch level of EMBOSS. Only available for th= e emboss ebuild. +# The patch wil be fetch from: +# +# ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-${EBO_PATCH= }.gz. +# +# Embassy package should create one patch package and place it in FILESD= IR, e.g. +# "files/embassy-iprscan-4.3.1-r2.patch". The patch will be automaticall= y used during src_prepare + +# @ECLASS-VARIABLE: NO_RECONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Set this, if you do want to have eautoreconf be run after patching. + +# @ECLASS-VARIABLE: EBO_ECONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Extra config options passed to econf, similar to EXTRA_ECONF. =20 EAPI=3D"4" =20 @@ -49,7 +86,7 @@ RDEPEND=3D"${DEPEND}" if [[ ${PN} =3D=3D "emboss" ]] ; then 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-${MY_PATCH}.gz -> ${P}.patch.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" @@ -68,20 +105,52 @@ else # The full name and version of the EMBASSY package (excluding the Gento= o # revision number) 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]" + DEPEND+=3D" >=3Dsci-biology/emboss-${EBOV}[mysql=3D,pdf=3D,png=3D,postg= res=3D,static-libs=3D,X=3D]" =20 S=3D"${WORKDIR}"/${EF} fi =20 +# @FUNCTION: embassy-ng_src_prepare +# @USAGE: +# @RETURN: +# @MAINTAINER: +# @DESCRIPTION: +# Does three things +# +# 1. Patches EMBOSS if EBO_PATCH is set +# 2. Patches, if "${FILESDIR}"/${PF}.patch is a file +# 3. runs eautoreconf unless NO_RECONF is set +# + embassy-ng_src_prepare() { - [[ -n ${EBO_PATCH} ]] && epatch "${WORKDIR}"/${P}.patch + [[ ${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 +# @USAGE: +# @RETURN: +# @MAINTAINER: +# @DESCRIPTION: +# runs econf with following options. Extra things can be passed by setti= ng EBO_ECONF +# +# $(use_with X x) +# $(use_with png pngdriver "${EPREFIX}/usr") +# $(use_with doc docroot "${EPREFIX}/usr") +# $(use_with pdf hpdf "${EPREFIX}/usr") +# $(use_with mysql mysql "${EPREFIX}/usr/bin/mysql_config") +# $(use_with postgres postgresql "${EPREFIX}/usr/bin/pg_config") +# $(use_enable amd64 64) +# $(use_enable static-libs static) +# --enable-large +# --without-java +# --enable-systemlibs +# ${EBO_ECONF} + embassy-ng_src_configure() { econf \ $(use_with X x) \ @@ -92,7 +161,7 @@ embassy-ng_src_configure() { $(use_with postgres postgresql "${EPREFIX}/usr/bin/pg_config") \ $(use_enable amd64 64) \ $(use_enable static-libs static) \ - --enable-large + --enable-large \ --without-java \ --enable-systemlibs \ ${EBO_ECONF}