Added find-suitable-screen patch

5 files changed, 109 insertions, 3 deletions

diff --git a/x11-wm/ion-devel/ChangeLog b/x11-wm/ion-devel/ChangeLog
index fd94f5600387..e09ade145ef4 100644
--- a/x11-wm/ion-devel/ChangeLog
+++ b/x11-wm/ion-devel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/ion-devel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion-devel/ChangeLog,v 1.19 2003/11/05 17:21:59 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion-devel/ChangeLog,v 1.20 2003/11/10 17:02:18 twp Exp $
+
+  10 Nov 2003; Tom Payne <twp@gentoo.org> ion-devel-20030814-r5.ebuild :
+  Added find-suitable-screen patch.
 
   05 Nov 2003; Tom Payne <twp@gentoo.org> ion-devel-20030814-r4.ebuild :
   Added stacking patch.
diff --git a/x11-wm/ion-devel/Manifest b/x11-wm/ion-devel/Manifest
index 7ca19e5514dd..b62822f4d5ab 100644
--- a/x11-wm/ion-devel/Manifest
+++ b/x11-wm/ion-devel/Manifest
@@ -1,6 +1,6 @@
-MD5 cf1e94d9f493fdff0131700bcea0ef60 ChangeLog 2702
+MD5 f74b1e37cf7ecfd7e299dbb2705317dd ChangeLog 2702
 MD5 2312c521f3268fb034b7532fa6f68fbf ion-devel-20030814-r4.ebuild 1992
-MD5 5e490824b797daab4fdd7cf13fcb7f99 ion-devel-20030814-r5.ebuild 2045
+MD5 e820a923b42459fbf9b6de037a71fb0a ion-devel-20030814-r5.ebuild 2045
 MD5 1eef30dc0886afa4e83ced96b5b2cbaa ion-devel-20030814-r3.ebuild 1950
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 8fdcbc4385bc96bf46343ecdec97d02b files/stripws-20030814.patch 321
diff --git a/x11-wm/ion-devel/files/digest-ion-devel-20030814-r5 b/x11-wm/ion-devel/files/digest-ion-devel-20030814-r5
new file mode 100644
index 000000000000..fb1828342d7e
--- /dev/null
+++ b/x11-wm/ion-devel/files/digest-ion-devel-20030814-r5
@@ -0,0 +1 @@
+MD5 f5c779ff79ef982d76dec2f1e57d4034 ion-devel-20030814.tar.gz 284786
diff --git a/x11-wm/ion-devel/files/find-suitable-screen-20030814.patch b/x11-wm/ion-devel/files/find-suitable-screen-20030814.patch
new file mode 100644
index 000000000000..8626dc91dea6
--- /dev/null
+++ b/x11-wm/ion-devel/files/find-suitable-screen-20030814.patch
@@ -0,0 +1,23 @@
+--- ion-devel-20030814/ioncore/manage.c	2003-07-27 02:00:49.000000000 +0200
++++ ion-devel/ioncore/manage.c	2003-11-07 16:46:12.000000000 +0100
+@@ -24,8 +24,7 @@
+ /*{{{ Add */
+ 
+ 
+-static WScreen *find_suitable_screen(WClientWin *cwin, 
+-									 const WManageParams *param)
++WScreen *find_suitable_screen(WClientWin *cwin, const WManageParams *param)
+ {
+ 	WScreen *scr=NULL, *found=NULL;
+ 	bool respectpos=(param->tfor!=NULL || param->userpos);
+--- ion-devel-20030814/ioncore/manage.h	2003-07-08 20:08:26.000000000 +0200
++++ ion-devel/ioncore/manage.h	2003-11-07 16:46:35.000000000 +0100
+@@ -33,6 +33,8 @@
+ } WManageParams;
+ 
+ 
++extern WScreen *find_suitable_screen(WClientWin *cwin,
++									 const WManageParams *param);
+ 
+ extern bool add_clientwin_default(WClientWin *cwin,
+ 								  const WManageParams *param);
diff --git a/x11-wm/ion-devel/ion-devel-20030814-r5.ebuild b/x11-wm/ion-devel/ion-devel-20030814-r5.ebuild
new file mode 100644
index 000000000000..a0d17bbd4f85
--- /dev/null
+++ b/x11-wm/ion-devel/ion-devel-20030814-r5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion-devel/ion-devel-20030814-r5.ebuild,v 1.1 2003/11/10 17:02:18 twp Exp $
+
+MY_P=${PN}-${PV/_p/-}
+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/dl/${MY_P}.tar.gz"
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="xinerama"
+DEPEND="virtual/x11
+	app-misc/run-mailcap
+	>=dev-lang/lua-5"
+S=${WORKDIR}/${MY_P}
+
+inherit eutils
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/system.mk-${PV}-no-utf8.patch
+	epatch ${FILESDIR}/stripws-${PV}.patch
+	epatch ${FILESDIR}/tabdrag-${PV}.patch
+	epatch ${FILESDIR}/stacking-${PV}.patch
+	epatch ${FILESDIR}/find-suitable-screen-${PV}.patch
+
+	sed -i system.mk \
+		-e "s/@CFLAGS@/${CFLAGS}/g" \
+		-e "s/@PF@/${PF}/g"
+	if [ `use xinerama` ]; then
+		einfo Enabling Xinerama support
+		eend 0
+	else
+		einfo Disabling Xinerama support
+		sed -i system.mk \
+			-e 's/\(XINERAMA_LIBS=-lXinerama\)/#\1/' \
+			-e 's/#\(DEFINES += -DCF_NO_XINERAMA\)/\1/'
+		eend $?
+	fi
+
+	if has_version '<x11-base/xfree-4.3.0'; then
+		einfo Enabling Xfree\<4.3.0/Opera/UTF-8 bug workaround
+		eend 0
+	else
+		einfo Disabling Xfree\<4.3.0/Opera/UTF-8 bug workaround
+		sed -i system.mk \
+			-e 's/\(DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND\)/#\1/'
+		eend $?
+	fi
+
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+
+	make PREFIX=${D}/usr ETCDIR=${D}/etc/X11/ion-devel install || die
+	dobin scripts/pwm
+
+	echo -e "#!/bin/sh\n/usr/bin/ion" > ${T}/ion-devel
+	echo -e "#!/bin/sh\n/usr/bin/pwm" > ${T}/pwm
+	exeinto /etc/X11/Sessions
+	doexe ${T}/ion-devel ${T}/pwm
+
+}
+
+pkg_postinst() {
+	ewarn The configuration file format has changed. You may have to re-write your
+	ewarn configuration files.
+	ewarn To delete stale system-wide configuration files, run the command:
+	ewarn "\trm -f ${R}/etc/X11/ion-devel/*.conf"
+}