summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-10-29 03:27:50 +0000
committerMike Frysinger <vapier@gentoo.org>2006-10-29 03:27:50 +0000
commit07a53d52e854811756eec0b07033f731f6b69e94 (patch)
tree6afb13d6ca9e3c9d6721308bcdfdc034f9419872 /x11-libs
parentuse virtual/tetex #152410 by David Klempner (diff)
downloadgentoo-2-07a53d52e854811756eec0b07033f731f6b69e94.tar.gz
gentoo-2-07a53d52e854811756eec0b07033f731f6b69e94.tar.bz2
gentoo-2-07a53d52e854811756eec0b07033f731f6b69e94.zip
merge fixes from diff ebuilds
(Portage version: 2.1.2_pre3-r9)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/ecore/ecore-0.9.9.030.ebuild41
-rw-r--r--x11-libs/ecore/ecore-9999.ebuild6
-rw-r--r--x11-libs/ecore/files/digest-ecore-99991
3 files changed, 31 insertions, 17 deletions
diff --git a/x11-libs/ecore/ecore-0.9.9.030.ebuild b/x11-libs/ecore/ecore-0.9.9.030.ebuild
index 3b6a41c23f89..dbdf3c6dfe26 100644
--- a/x11-libs/ecore/ecore-0.9.9.030.ebuild
+++ b/x11-libs/ecore/ecore-0.9.9.030.ebuild
@@ -1,29 +1,44 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/ecore/ecore-0.9.9.030.ebuild,v 1.1 2006/07/16 05:06:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/ecore/ecore-0.9.9.030.ebuild,v 1.2 2006/10/29 03:27:50 vapier Exp $
inherit enlightenment
DESCRIPTION="core event abstraction layer and X abstraction layer (nice convenience library)"
-IUSE="X fbcon opengl"
+IUSE="X directfb fbcon opengl ssl curl threads dbus"
-DEPEND=">=x11-libs/evas-0.9.9
- || ( x11-libs/libXcursor virtual/x11 )
+RDEPEND=">=x11-libs/evas-0.9.9
+ X? ( x11-libs/libXcursor )
+ ssl? ( dev-libs/openssl )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto x11-proto/xextproto )"
+
src_compile() {
export MY_ECONF="
- $(use_enable X ecore-x) \
- --enable-ecore-job \
- $(use_enable fbcon ecore-fb) \
- --enable-ecore-evas \
- $(use_enable opengl ecore-evas-gl) \
- $(use_enable fbcon ecore-evas-fb) \
- --enable-ecore-con \
- --enable-ecore-ipc \
- --enable-ecore-txt \
+ --enable-ecore-txt
+ $(use_enable X ecore-x)
+ --enable-ecore-job
+ $(use_enable fbcon ecore-fb)
+ $(use_enable directfb ecore-dfb)
+ --enable-ecore-evas
+ $(use_enable opengl ecore-evas-gl)
+ $(use_enable X evas-xrender)
+ $(use_enable directfb ecore-evas-dfb)
+ $(use_enable fbcon ecore-evas-fb)
+ --enable-ecore-evas-buffer
+ --enable-ecore-con
+ $(use_enable ssl openssl)
+ --enable-ecore-ipc
+ $(use_enable dbus ecore-dbus)
--enable-ecore-config
+ --enable-ecore-file
+ $(use_enable curl)
+ $(use_enable threads pthreads)
"
enlightenment_src_compile
}
diff --git a/x11-libs/ecore/ecore-9999.ebuild b/x11-libs/ecore/ecore-9999.ebuild
index 50e0fe4b0a23..ec136ced7e82 100644
--- a/x11-libs/ecore/ecore-9999.ebuild
+++ b/x11-libs/ecore/ecore-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/ecore/ecore-9999.ebuild,v 1.13 2006/04/27 04:53:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/ecore/ecore-9999.ebuild,v 1.14 2006/10/29 03:27:50 vapier Exp $
inherit enlightenment
@@ -9,7 +9,7 @@ DESCRIPTION="core event abstraction layer and X abstraction layer (nice convenie
IUSE="X directfb fbcon opengl ssl curl threads dbus"
RDEPEND=">=x11-libs/evas-0.9.9
- X? ( || ( x11-libs/libXcursor virtual/x11 ) )
+ X? ( x11-libs/libXcursor )
ssl? ( dev-libs/openssl )
curl? ( net-misc/curl )
dbus? ( sys-apps/dbus )
@@ -20,7 +20,7 @@ RDEPEND=">=x11-libs/evas-0.9.9
# x11-libs/libXp
DEPEND="${RDEPEND}
- X? ( || ( ( x11-proto/xproto x11-proto/xextproto ) virtual/x11 ) )"
+ X? ( x11-proto/xproto x11-proto/xextproto )"
src_compile() {
export MY_ECONF="
diff --git a/x11-libs/ecore/files/digest-ecore-9999 b/x11-libs/ecore/files/digest-ecore-9999
index 8b137891791f..e69de29bb2d1 100644
--- a/x11-libs/ecore/files/digest-ecore-9999
+++ b/x11-libs/ecore/files/digest-ecore-9999
@@ -1 +0,0 @@
-