diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-06-26 09:05:16 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-06-26 09:05:16 +0000 |
| commit | cad87cc9fbefa160e6b2c01c767218e9b6e74532 (patch) | |
| tree | 2274f257b529c43b92d96a8d84a0a0f390c1affa /sci-chemistry | |
| parent | Straight out QA issues (diff) | |
| download | gentoo-2-cad87cc9fbefa160e6b2c01c767218e9b6e74532.tar.gz gentoo-2-cad87cc9fbefa160e6b2c01c767218e9b6e74532.tar.bz2 gentoo-2-cad87cc9fbefa160e6b2c01c767218e9b6e74532.zip | |
Drop X USE as libX11 is always required, #371179
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/azara/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-chemistry/azara/azara-2.8-r4.ebuild | 20 | ||||
| -rw-r--r-- | sci-chemistry/azara/metadata.xml | 1 |
3 files changed, 16 insertions, 13 deletions
diff --git a/sci-chemistry/azara/ChangeLog b/sci-chemistry/azara/ChangeLog index da4dba5baef1..2efef5dccc48 100644 --- a/sci-chemistry/azara/ChangeLog +++ b/sci-chemistry/azara/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/azara -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/ChangeLog,v 1.8 2010/12/13 07:10:24 jlec Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/ChangeLog,v 1.9 2011/06/26 09:05:16 jlec Exp $ + + 26 Jun 2011; Justin Lecher <jlec@gentoo.org> azara-2.8-r4.ebuild, + metadata.xml: + Drop X USE as libX11 is always required, #371179 *azara-2.8-r4 (13 Dec 2010) diff --git a/sci-chemistry/azara/azara-2.8-r4.ebuild b/sci-chemistry/azara/azara-2.8-r4.ebuild index 1ef5fdbdfcdd..fc0ffb3c550c 100644 --- a/sci-chemistry/azara/azara-2.8-r4.ebuild +++ b/sci-chemistry/azara/azara-2.8-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/azara-2.8-r4.ebuild,v 1.1 2010/12/13 07:10:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/azara/azara-2.8-r4.ebuild,v 1.2 2011/06/26 09:05:16 jlec Exp $ -EAPI="3" +EAPI=3 PYTHON_DEPEND="python? 2" SUPPORT_PYTHON_ABIS="1" @@ -17,11 +17,11 @@ SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${PN}/${P}-src.tgz" LICENSE="AZARA" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="X python xpm" +IUSE="python xpm" RDEPEND=" - xpm? ( x11-libs/libXpm ) - X? ( x11-libs/libX11 )" + x11-libs/libX11 + xpm? ( x11-libs/libXpm )" DEPEND="${RDEPEND}" src_prepare() { @@ -30,10 +30,10 @@ src_prepare() { CFLAGS = ${CFLAGS} LFLAGS = ${LDFLAGS} MATH_LIB = -lm - X11_INCLUDE_DIR = -I${EPREFIX}/usr/X11R6/include - MOTIF_INCLUDE_DIR = -I${EPREFIX}/usr/include -I../global - X11_LIB_DIR = -L${EPREFIX}/usr/$(get_libdir) - MOTIF_LIB_DIR = -L${EPREFIX}/usr/$(get_libdir) + X11_INCLUDE_DIR = -I"${EPREFIX}/usr/X11R6/include" + MOTIF_INCLUDE_DIR = -I"${EPREFIX}/usr/include" -I../global + X11_LIB_DIR = -L"${EPREFIX}/usr/$(get_libdir)" + MOTIF_LIB_DIR = -L"${EPREFIX}/usr/$(get_libdir)" X11_LIB = -lX11 MOTIF_LIB = -lXm -lXt SHARED_FLAGS = -shared diff --git a/sci-chemistry/azara/metadata.xml b/sci-chemistry/azara/metadata.xml index 4aaae064be71..18c54916e3b4 100644 --- a/sci-chemistry/azara/metadata.xml +++ b/sci-chemistry/azara/metadata.xml @@ -7,4 +7,3 @@ <name>Justin Lecher (jlec)</name> </maintainer> </pkgmetadata> - |