Updated dependencies for modular X. Thanks Mike Auty.

(Portage version: 2.1_pre3-r1)

4 files changed, 110 insertions, 6 deletions

diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog
index f4bec6c45e3e..f17a6ef3d7c4 100644
--- a/x11-wm/ion2/ChangeLog
+++ b/x11-wm/ion2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/ion2
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.26 2005/09/17 10:24:18 agriffis Exp $
+# 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 $
+
+*ion2-20040729-r1 (15 Jan 2006)
+
+  15 Jan 2006; Tom Payne <twp@gentoo.org> +ion2-20040729-r1.ebuild:
+  Updated dependencies for modular X. Thanks Mike Auty.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ion2-20040729.ebuild:
   Mark 20040729 stable on alpha
diff --git a/x11-wm/ion2/Manifest b/x11-wm/ion2/Manifest
index 12f5246357dc..39f1c33a7a02 100644
--- a/x11-wm/ion2/Manifest
+++ b/x11-wm/ion2/Manifest
@@ -1,7 +1,9 @@
-MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 97ad42b3da4397f4faaae63b2cf98dca ChangeLog 3159
-MD5 b5d59197edcbfc5b059667c2b08d8c32 ion2-20040729.ebuild 2051
-MD5 fece066216c6fcfa1936d068bd6ca998 files/pwm2.desktop 170
-MD5 7057ed0ec950ad5f77b47a32dbcb4fb4 files/ion2-20040601-rename.patch 1720
 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 7977e7a1bcefa56619af3756c0b23f90 ion2-20040729-r1.ebuild 2126
+MD5 b5d59197edcbfc5b059667c2b08d8c32 ion2-20040729.ebuild 2051
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
diff --git a/x11-wm/ion2/files/digest-ion2-20040729-r1 b/x11-wm/ion2/files/digest-ion2-20040729-r1
new file mode 100644
index 000000000000..fd49e44d2445
--- /dev/null
+++ b/x11-wm/ion2/files/digest-ion2-20040729-r1
@@ -0,0 +1 @@
+MD5 d7d98baa41635c1989e423adf76eb2ac ion-2-20040729.tar.gz 399367
diff --git a/x11-wm/ion2/ion2-20040729-r1.ebuild b/x11-wm/ion2/ion2-20040729-r1.ebuild
new file mode 100644
index 000000000000..96196b81bae5
--- /dev/null
+++ b/x11-wm/ion2/ion2-20040729-r1.ebuild
@@ -0,0 +1,96 @@
+# 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 $
+
+inherit eutils
+
+DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind"
+HOMEPAGE="http://www.iki.fi/tuomov/ion/"
+SRC_URI="http://modeemi.fi/~tuomov/ion/dl/ion-2-${PV}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="xinerama"
+DEPEND="
+	|| (
+		(
+			x11-libs/libICE
+			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"
+S=${WORKDIR}/ion-2-${PV}
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/ion2-20040601-rename.patch
+
+}
+
+src_compile() {
+
+	local myconf=""
+
+	if has_version '>=x11-base/xfree-4.3.0'; then
+		myconf="${myconf} --disable-xfree86-textprop-bug-workaround"
+	fi
+
+	autoreconf
+
+	use hppa && myconf="${myconf} --disable-shared"
+
+	econf \
+		--sysconfdir=/etc/X11 \
+		`use_enable xinerama` \
+		${myconf} || die
+
+	emake \
+		DOCDIR=/usr/share/doc/${PF} || die
+
+}
+
+src_install() {
+
+	make \
+		MODULEDIR=${D}/usr/$(get_libdir)/ion2 \
+		LCDIR=${D}/usr/$(get_libdir)/ion2/lc \
+		prefix=${D}/usr \
+		ETCDIR=${D}/etc/X11/ion2 \
+		SHAREDIR=${D}/usr/share/ion2 \
+		MANDIR=${D}/usr/share/man \
+		DOCDIR=${D}/usr/share/doc/${PF} \
+		install || die
+
+	mv ${D}/usr/bin/ion ${D}/usr/bin/ion2
+	mv ${D}/usr/bin/pwm ${D}/usr/bin/pwm2
+	mv ${D}/usr/share/man/man1/ion.1 ${D}/usr/share/man/man1/ion2.1
+	mv ${D}/usr/share/man/man1/pwm.1 ${D}/usr/share/man/man1/pwm2.1
+
+	prepalldocs
+
+	insinto /usr/include/ion2
+	doins *.h *.mk mkexports.lua
+	for i in de floatws ioncore ionws luaextl menu query; do
+		insinto /usr/include/ion2/${i}
+		doins ${i}/*.h
+	done
+	insinto /usr/include/ion2/libtu
+	doins libtu/*.h
+
+	echo -e "#!/bin/sh\n/usr/bin/ion2" > ${T}/ion2
+	echo -e "#!/bin/sh\n/usr/bin/pwm2" > ${T}/pwm2
+	exeinto /etc/X11/Sessions
+	doexe ${T}/ion2 ${T}/pwm2
+
+	insinto /usr/share/xsessions
+	doins ${FILESDIR}/ion2.desktop ${FILESDIR}/pwm2.desktop
+
+}