summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Góes <vanquirius@gentoo.org>2006-02-04 02:37:03 +0000
committerMarcelo Góes <vanquirius@gentoo.org>2006-02-04 02:37:03 +0000
commit72746194d9e773a4f26650dabb9ebc79fd091743 (patch)
tree2353dca8329f8836f73d2234285ca86e5f85a7f4
parentVersion Bump (diff)
downloadgentoo-2-72746194d9e773a4f26650dabb9ebc79fd091743.tar.gz
gentoo-2-72746194d9e773a4f26650dabb9ebc79fd091743.tar.bz2
gentoo-2-72746194d9e773a4f26650dabb9ebc79fd091743.zip
Make modular X friendly, add missing X to IUSE.
(Portage version: 2.0.54)
-rw-r--r--dev-libs/ace/ChangeLog7
-rw-r--r--dev-libs/ace/Manifest16
-rw-r--r--dev-libs/ace/ace-5.4.6.ebuild30
3 files changed, 28 insertions, 25 deletions
diff --git a/dev-libs/ace/ChangeLog b/dev-libs/ace/ChangeLog
index 7f099fe478d3..e0677252974f 100644
--- a/dev-libs/ace/ChangeLog
+++ b/dev-libs/ace/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/ace
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.30 2005/07/30 01:52:58 dragonheart Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.31 2006/02/04 02:37:03 vanquirius Exp $
+
+ 04 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> ace-5.4.6.ebuild:
+ Make modular X friendly, add missing X to IUSE.
*ace-5.4.6 (30 Jul 2005)
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 834e4ca20669..09bac9a4059a 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 1cb382ade06db1ef2e14068397a68f26 ChangeLog 3550
-MD5 37941ec072eecc05f4d28f36f98f006a metadata.xml 502
-MD5 4f01439f4a495513b777f13053d8891d ace-5.4.6.ebuild 1473
MD5 316b7c9b9145b570e200a8d77d1853a2 ace-5.4-r2.ebuild 2580
MD5 2b6a34f92be76a58355550870aa47b5b ace-5.4.3.ebuild 1786
+MD5 0914abb7becef80203b29c71bab4be61 ace-5.4.6.ebuild 1605
+MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r2 61
MD5 cda67156d3d7e40ae83547ed35c17bd4 files/digest-ace-5.4.3 63
MD5 92a5ea661e004e4b9e6b6047c05ef61d files/digest-ace-5.4.6 63
-MD5 3e3d835be64fd3d448525a09dec99bba files/digest-ace-5.4-r2 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC6t2LmdTrptrqvGERAkzVAKCXK4ws+YkIchp0U1+4RiM9YLrjtQCfUH4w
-up900qeo5zazmvJbUcM5SWQ=
-=NQrJ
------END PGP SIGNATURE-----
+MD5 37941ec072eecc05f4d28f36f98f006a metadata.xml 502
diff --git a/dev-libs/ace/ace-5.4.6.ebuild b/dev-libs/ace/ace-5.4.6.ebuild
index 5ee21f2abef7..8908e0d6a601 100644
--- a/dev-libs/ace/ace-5.4.6.ebuild
+++ b/dev-libs/ace/ace-5.4.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.4.6.ebuild,v 1.1 2005/07/30 01:52:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.4.6.ebuild,v 1.2 2006/02/04 02:37:03 vanquirius Exp $
inherit eutils
-S=${WORKDIR}/ACE_wrappers
+S="${WORKDIR}/ACE_wrappers"
DESCRIPTION="The Adaptive Communications Environment"
SRC_URI="http://deuce.doc.wustl.edu/old_distribution/ACE-${PV}.tar.bz2"
HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
@@ -12,18 +12,28 @@ HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
SLOT="0"
LICENSE="BSD as-is"
KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
-IUSE="ipv6"
+IUSE="X ipv6"
-DEPEND="virtual/libc
- X? ( virtual/x11 )"
+DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ X? ( || (
+ ( x11-libs/libXt
+ x11-libs/libXaw )
+ virtual/x11 )
+ )"
+
+DEPEND="${DEPEND}
+ X? ( || (
+ ( x11-proto/xproto )
+ virtual/x11 )
+ )"
src_compile() {
- export ACE_ROOT=${S}
+ export ACE_ROOT="${S}"
mkdir build
cd build
- ECONF_SOURCE=${S}
+ ECONF_SOURCE="${S}"
econf --enable-lib-all $(use_with X) $(use_enable ipv6)
# --with-qos needs ACE_HAS_RAPI
emake static_libs=1 || die
@@ -38,7 +48,7 @@ src_test() {
src_install() {
cd build
- emake ACE_ROOT=${S} DESTDIR=${D} install || die "failed to install"
+ make ACE_ROOT="${S}" DESTDIR="${D}" install || die "failed to install"
}