summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2012-02-17 10:57:00 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2012-02-17 10:57:00 +0000
commit62f7dcfca2dfaa725d968d1489e338796bf00471 (patch)
treef6527a6b35090babe0b48724e0fd1e6ae382b898 /gnustep-base
parentClean and make gnustep-back-* ebuilds closer (diff)
downloadgentoo-2-62f7dcfca2dfaa725d968d1489e338796bf00471.tar.gz
gentoo-2-62f7dcfca2dfaa725d968d1489e338796bf00471.tar.bz2
gentoo-2-62f7dcfca2dfaa725d968d1489e338796bf00471.zip
Clean and make gnustep-back-* ebuilds closer
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'gnustep-base')
-rw-r--r--gnustep-base/gnustep-back-cairo/ChangeLog6
-rw-r--r--gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild25
2 files changed, 17 insertions, 14 deletions
diff --git a/gnustep-base/gnustep-back-cairo/ChangeLog b/gnustep-base/gnustep-back-cairo/ChangeLog
index 7260fa92c9c8..0db303e411d7 100644
--- a/gnustep-base/gnustep-back-cairo/ChangeLog
+++ b/gnustep-base/gnustep-back-cairo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnustep-base/gnustep-back-cairo
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/ChangeLog,v 1.30 2012/02/08 14:52:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/ChangeLog,v 1.31 2012/02/17 10:57:00 voyageur Exp $
+
+ 17 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
+ gnustep-back-cairo-0.22.0.ebuild:
+ Clean and make gnustep-back-* ebuilds closer
*gnustep-back-cairo-0.22.0 (08 Feb 2012)
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild
index 5ca627201946..d6a3749ef7fb 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild
@@ -1,26 +1,22 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild,v 1.1 2012/02/08 14:52:32 voyageur Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.22.0.ebuild,v 1.2 2012/02/17 10:57:00 voyageur Exp $
+EAPI=4
inherit gnustep-base
-S=${WORKDIR}/gnustep-back-${PV}
-
DESCRIPTION="Cairo back-end component for the GNUstep GUI Library."
-
HOMEPAGE="http://www.gnustep.org"
SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-SLOT="0"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="opengl xim"
+
RDEPEND="${GNUSTEP_CORE_DEPEND}
=gnustep-base/gnustep-gui-${PV%.*}*
opengl? ( virtual/opengl virtual/glu )
-
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -30,21 +26,24 @@ RDEPEND="${GNUSTEP_CORE_DEPEND}
x11-libs/libXt
x11-libs/libXft
x11-libs/libXrender
-
>=media-libs/freetype-2.1.9
+
>=x11-libs/cairo-1.2.0[X]
+
!gnustep-base/gnustep-back-art
!gnustep-base/gnustep-back-xlib"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+S=${WORKDIR}/gnustep-back-${PV}
+
src_configure() {
egnustep_env
- use opengl || myconf="--disable-glx"
+ myconf="$(use_enable opengl glx)"
myconf="$myconf $(use_enable xim)"
myconf="$myconf --enable-server=x11"
myconf="$myconf --enable-graphics=cairo"
- econf $myconf || die "configure failed"
+ econf $myconf
}