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 1Q1LV7-0004qQ-4F for garchives@archives.gentoo.org; Sun, 20 Mar 2011 16:29:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E4BC1C020; Sun, 20 Mar 2011 16:28:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 39AD2E06C8 for ; Sun, 20 Mar 2011 16:28:32 +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 E45931B4115 for ; Sun, 20 Mar 2011 16:28:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5A7578006D for ; Sun, 20 Mar 2011 16:28:31 +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/emboss.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: bd121a5a1a1386b62f7fb8cebbd550d7e68cf4c6 Date: Sun, 20 Mar 2011 16:28:31 +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: 1adc1c738c17944645a9a78304c895ea commit: bd121a5a1a1386b62f7fb8cebbd550d7e68cf4c6 Author: Justin Lecher gentoo org> AuthorDate: Sun Mar 20 13:20:09 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Mar 20 13:20:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Dbd121a5a Updates from review --- eclass/emboss.eclass | 152 ++++++++++++++++++--------------------------= ----- 1 files changed, 56 insertions(+), 96 deletions(-) diff --git a/eclass/emboss.eclass b/eclass/emboss.eclass index 74d9d79..e682ab3 100644 --- a/eclass/emboss.eclass +++ b/eclass/emboss.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/eclass/embassy.eclass,v 1.17 2008/11/= 03 22:17:50 ribosome Exp $ =20 @@ -14,48 +14,55 @@ # jlec@gentoo.org # @BLURB: Use this to easy install EMBOSS and EMBASSY programs (EMBOSS a= dd-ons). # @DESCRIPTION: -# The inheriting ebuild should provide EBO_DESCRIPTION before the inheri= t line. +# The inheriting ebuild must set EAPI=3D4 and provide EBO_DESCRIPTION be= fore the inherit line. # KEYWORDS should be set. Additionally "(R|P)DEPEND"encies and other sta= ndard # ebuild Variables can be extended (FOO+=3D"BAR"). -# The inheriting ebuild's name must begin with "emboss" or "embassy" and= must be EAPI=3D4 conform. +# The inheriting ebuild's name must begin with "emboss" or "embassy". +# Default installation of following DOCS=3D"AUTHORS ChangeLog NEWS READM= E" +# +# Example: +# +# EAPI=3D"4" +# +# EBO_DESCRIPTION=3D"applications from the CBS group" +# +# inherit emboss +# +# KEYWORDS=3D"~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + =20 # @ECLASS-VARIABLE: EBO_DESCRIPTION # @DESCRIPTION: -# Should be set. Completes the describtion of the embassy module as foll= ows: +# Should be set. Completes the generic description of the embassy module= as follows: # -# EMBOSS integrated version of EBO_DESCRIPTION" +# EMBOSS integrated version of ${EBO_DESCRIPTION}, +# e.g. +# "EMBOSS integrated version of applications from the CBS group" # # Defaults to the upstream name of the module. =20 -# @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 packages should create one patch package and place it in FILES= DIR, 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 +# @ECLASS-VARIABLE: EBO_EAUTORECONF # @DESCRIPTION: -# Set this, if you do not want to have eautoreconf be run after patching= . +# Set to 'no', if you don't want eautoreconf to be run after patching. +: ${EBO_EAUTORECONF:=3D"yes"} =20 -# @ECLASS-VARIABLE: EBO_ECONF +# @ECLASS-VARIABLE: EBO_EXTRA_ECONF # @DEFAULT_UNSET # @DESCRIPTION: # Extra config options passed to econf, similar to EXTRA_ECONF. =20 -EAPI=3D"4" +case ${EAPI:-0} in + 4) ;; + *) die "this eclass doesn't support < EAPI 4" ;; +esac =20 inherit autotools eutils multilib =20 -HOMEPAGE=3D"http://emboss.sourceforge.net" +HOMEPAGE=3D"http://emboss.sourceforge.net/" LICENSE=3D"LGPL-2 GPL-2" =20 SLOT=3D"0" -IUSE=3D"mysql pdf png postgres static-libs X " +IUSE=3D"mysql pdf png postgres static-libs X" =20 DEPEND=3D" dev-libs/expat @@ -66,113 +73,66 @@ DEPEND=3D" pdf? ( media-libs/libharu ) png? ( media-libs/gd[png] ) postgres? ( dev-db/postgresql-base ) - X? ( x11-libs/libXt ) - " - -RDEPEND=3D" - ${DEPEND} - " - -DOCS=3D"AUTHORS ChangeLog NEWS README " - -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" - !minimal? ( - sci-biology/aaindex - sci-biology/cutg - sci-biology/prints - sci-biology/prosite - sci-biology/rebase - sci-biology/transfac - ) - " - S=3D${WORKDIR}/EMBOSS-${EBOV} - DOCS+=3D"FAQ THANKS " -else + X? ( x11-libs/libXt )" +RDEPEND=3D"${DEPEND}" + +if [[ ${PN} =3D=3D embassy-* ]]; then # 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} - EBO_DESCRIPTION=3D${EBO_DESCRIPTION:=3D${EN}} + : ${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,postg= res=3D,static-libs=3D,X=3D] " + SRC_URI=3D"ftp://emboss.open-bio.org/pub/EMBOSS/${EF}.tar.gz -> embassy= -${EN}-${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} + S=3D"${WORKDIR}"/${EF} fi =20 +DOCS=3D"AUTHORS ChangeLog NEWS README" + # @FUNCTION: emboss_src_prepare -# @USAGE: -# @RETURN: -# @MAINTAINER: # @DESCRIPTION: -# Does three things +# Does following things # -# 1. Patches EMBOSS if EBO_PATCH is set -# 2. Patches with "${FILESDIR}"/${PF}.patch, of present -# 3. Runs eautoreconf unless NO_RECONF is set +# 1. Patches with "${FILESDIR}"/${PF}.patch, of present +# 2. Runs eautoreconf, unless EBO_EAUTORECONF is set to no # =20 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 + [[ ${EBO_EAUTORECONF} =3D=3D yes ]] && eautoreconf } =20 # @FUNCTION: emboss_src_prepare -# @USAGE: -# @RETURN: -# @MAINTAINER: # @DESCRIPTION: -# runs econf with following options. Extra options can be passed by sett= ing EBO_ECONF +# runs econf with following options. Extra options can be passed by sett= ing EBO_EXTRA_ECONF # # $(use_with X x) -# $(use_with png pngdriver "${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_with png pngdriver) +# $(use_with pdf hpdf) +# $(use_with mysql mysql) +# $(use_with postgres postgresql) # $(use_enable static-libs static) # --enable-large # --without-java # --enable-systemlibs -# ${EBO_ECONF} +# ${EBO_EXTRA_ECONF} =20 emboss_src_configure() { econf \ $(use_with X x) \ - $(use_with png pngdriver "${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_with png pngdriver) \ + $(use_with pdf hpdf) \ + $(use_with mysql mysql) \ + $(use_with postgres postgresql) \ $(use_enable static-libs static) \ --enable-large \ --without-java \ --enable-systemlibs \ - ${EBO_ECONF} -} - -# @FUNCTION: emboss_src_install -# @USAGE: -# @RETURN: -# @MAINTAINER: -# @DESCRIPTION: -# Standard src_install. Takes care of correct position of docs. - -emboss_src_install() { - default - mv "${ED}"/usr/share/EMBOSS/doc/* "${ED}"/usr/share/doc/${PF}/ - rm -rf "${ED}"/usr/share/EMBOSS/doc + --docdir=3D"${EPREFIX}/usr/share/doc/${PF}/" \ + ${EBO_EXTRA_ECONF} } =20 -[[ ${PN} =3D=3D embassy ]] || EXPORT_FUNCTIONS src_prepare src_configure= src_install +EXPORT_FUNCTIONS src_prepare src_configure