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 1PzRQx-0004gX-Q1 for garchives@archives.gentoo.org; Tue, 15 Mar 2011 10:25:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 472101C003; Tue, 15 Mar 2011 10:24:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 199421C003 for ; Tue, 15 Mar 2011 10:24:43 +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 8AC3C1B42AF for ; Tue, 15 Mar 2011 10:24:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 065A28006A for ; Tue, 15 Mar 2011 10:24:42 +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: <2b548449caec11f02ebc8162197b7b069f24e7bd.jlec@gentoo> 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: 2b548449caec11f02ebc8162197b7b069f24e7bd Date: Tue, 15 Mar 2011 10:24:42 +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: 34eea1f1ee5abefe325ef40fa0423ad5 commit: 2b548449caec11f02ebc8162197b7b069f24e7bd Author: Justin Lecher gentoo org> AuthorDate: Tue Mar 15 10:24:35 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Mar 15 10:24:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D2b548449 Fixed doc installation path --- eclass/emboss.eclass | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/eclass/emboss.eclass b/eclass/emboss.eclass index c026749..74d9d79 100644 --- a/eclass/emboss.eclass +++ b/eclass/emboss.eclass @@ -55,7 +55,7 @@ HOMEPAGE=3D"http://emboss.sourceforge.net" LICENSE=3D"LGPL-2 GPL-2" =20 SLOT=3D"0" -IUSE=3D"doc mysql pdf png postgres static-libs X " +IUSE=3D"mysql pdf png postgres static-libs X " =20 DEPEND=3D" dev-libs/expat @@ -137,7 +137,6 @@ emboss_src_prepare() { # # $(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") @@ -152,7 +151,6 @@ emboss_src_configure() { 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") \ @@ -164,4 +162,17 @@ emboss_src_configure() { ${EBO_ECONF} } =20 -[[ ${PN} =3D=3D embassy ]] || EXPORT_FUNCTIONS src_prepare src_configure +# @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 +} + +[[ ${PN} =3D=3D embassy ]] || EXPORT_FUNCTIONS src_prepare src_configure= src_install