summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom William Payne <twp@gentoo.org>2006-01-25 17:18:43 +0000
committerTom William Payne <twp@gentoo.org>2006-01-25 17:18:43 +0000
commitdfdb2966d0e96daf90e6faf8dee03abe718c939c (patch)
tree9e66e134f61163e6c9dcaca85d503d32c2927d8f /x11-wm/ion2
parentFix ADSL module stopping, #120135. (diff)
downloadgentoo-2-dfdb2966d0e96daf90e6faf8dee03abe718c939c.tar.gz
gentoo-2-dfdb2966d0e96daf90e6faf8dee03abe718c939c.tar.bz2
gentoo-2-dfdb2966d0e96daf90e6faf8dee03abe718c939c.zip
Further updates for Modular X.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'x11-wm/ion2')
-rw-r--r--x11-wm/ion2/ChangeLog5
-rw-r--r--x11-wm/ion2/Manifest4
-rw-r--r--x11-wm/ion2/ion2-20040729-r1.ebuild19
3 files changed, 22 insertions, 6 deletions
diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog
index f17a6ef3d7c4..aa590c199f90 100644
--- a/x11-wm/ion2/ChangeLog
+++ b/x11-wm/ion2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-wm/ion2
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.27 2006/01/15 17:50:02 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.28 2006/01/25 17:18:43 twp Exp $
+
+ 25 Jan 2006; Tom Payne <twp@gentoo.org> ion2-20040729-r1.ebuild:
+ Further updates for Modular X.
*ion2-20040729-r1 (15 Jan 2006)
diff --git a/x11-wm/ion2/Manifest b/x11-wm/ion2/Manifest
index 228773363420..a45241e40c03 100644
--- a/x11-wm/ion2/Manifest
+++ b/x11-wm/ion2/Manifest
@@ -1,9 +1,9 @@
-MD5 9a346b28fdb2e5a6f3ed5fa203ae8aea ChangeLog 3312
+MD5 cde629c4a15785a58cee293db25920ff ChangeLog 3413
MD5 59a0157884665387039b7de882e85f1c files/digest-ion2-20040729 66
MD5 59a0157884665387039b7de882e85f1c files/digest-ion2-20040729-r1 66
MD5 7057ed0ec950ad5f77b47a32dbcb4fb4 files/ion2-20040601-rename.patch 1720
MD5 fba46fa26a6acc7159f6eb942abc002d files/ion2.desktop 217
MD5 fece066216c6fcfa1936d068bd6ca998 files/pwm2.desktop 170
-MD5 eda7b0228914c9a67c4a6ded5f0783d5 ion2-20040729-r1.ebuild 2124
+MD5 12674ab8b621eedbd8b6f811a922fe86 ion2-20040729-r1.ebuild 2318
MD5 b5d59197edcbfc5b059667c2b08d8c32 ion2-20040729.ebuild 2051
MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
diff --git a/x11-wm/ion2/ion2-20040729-r1.ebuild b/x11-wm/ion2/ion2-20040729-r1.ebuild
index 96196b81bae5..dfbb3508b049 100644
--- a/x11-wm/ion2/ion2-20040729-r1.ebuild
+++ b/x11-wm/ion2/ion2-20040729-r1.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-wm/ion2/ion2-20040729-r1.ebuild,v 1.1 2006/01/15 17:50:02 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040729-r1.ebuild,v 1.2 2006/01/25 17:18:43 twp Exp $
inherit eutils
@@ -15,14 +15,27 @@ DEPEND="
|| (
(
x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
x11-libs/libXext
xinerama? ( x11-libs/libXinerama )
)
virtual/x11
)
- app-misc/run-mailcap
>=dev-lang/lua-5.0.2
>=sys-devel/libtool-1.4.3"
+RDEPEND="${DEPEND}
+ || (
+ (
+ x11-apps/xmessage
+ x11-proto/xproto
+ x11-proto/xextproto
+ xinerama? ( x11-proto/xinermaproto )
+ )
+ virtual/x11
+ )
+ app-misc/run-mailcap"
+
S=${WORKDIR}/ion-2-${PV}
src_unpack() {
@@ -39,7 +52,7 @@ src_compile() {
local myconf=""
- if has_version '>=x11-base/xfree-4.3.0'; then
+ if ! has_version '<x11-base/xfree-4.3.0'; then
myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
fi