Minor fixes

4 files changed, 91 insertions, 2 deletions

diff --git a/x11-wm/ion-devel/Manifest b/x11-wm/ion-devel/Manifest
index ca3b6176d03e..9adfbe73d5df 100644
--- a/x11-wm/ion-devel/Manifest
+++ b/x11-wm/ion-devel/Manifest
@@ -1,5 +1,5 @@
-MD5 fba2a26520cd351c6cb884bbbca88d64 ChangeLog 1889
-MD5 36476a9b76d3716c63462e2ff3aa0da0 ion-devel-20030814-r1.ebuild 2037
+MD5 040e092dfb2be167392ac87ece6e0ca5 ChangeLog 2022
+MD5 8270b10bd3bd899fb49ba3f07c5a02eb ion-devel-20030814-r1.ebuild 2040
 MD5 3bdd03a83defef6b4103c327cdebeb37 ion-devel-20030131.ebuild 1440
 MD5 d8d03d8fc54c6efe7e2e55546151b8a8 ion-devel-20030327.ebuild 1036
 MD5 87bd48db87e2da2dc36e403966185567 ion-devel-20030814.ebuild 2691
diff --git a/x11-wm/ion-devel/files/digest-ion-devel-20030814-r1 b/x11-wm/ion-devel/files/digest-ion-devel-20030814-r1
new file mode 100644
index 000000000000..fb1828342d7e
--- /dev/null
+++ b/x11-wm/ion-devel/files/digest-ion-devel-20030814-r1
@@ -0,0 +1 @@
+MD5 f5c779ff79ef982d76dec2f1e57d4034 ion-devel-20030814.tar.gz 284786
diff --git a/x11-wm/ion-devel/files/stripws-20030814.patch b/x11-wm/ion-devel/files/stripws-20030814.patch
new file mode 100644
index 000000000000..d31a1f025327
--- /dev/null
+++ b/x11-wm/ion-devel/files/stripws-20030814.patch
@@ -0,0 +1,12 @@
+diff -Naur ion-devel-20030814/query/edln.c ion-devel/query/edln.c
+--- ion-devel-20030814/query/edln.c	2003-08-01 18:32:39.000000000 +0200
++++ ion-devel/query/edln.c	2003-08-20 20:10:06.000000000 +0200
+@@ -697,7 +697,7 @@
+ 	edln->p=NULL;
+ 	edln->psize=edln->palloced=0;
+ 	
+-	stripws(p);
++	/*stripws(p);*/
+ 	return p;
+ }
+ 
diff --git a/x11-wm/ion-devel/ion-devel-20030814-r1.ebuild b/x11-wm/ion-devel/ion-devel-20030814-r1.ebuild
new file mode 100644
index 000000000000..10f2bc4dd894
--- /dev/null
+++ b/x11-wm/ion-devel/ion-devel-20030814-r1.ebuild
@@ -0,0 +1,76 @@
+# 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-r1.ebuild,v 1.1 2003/08/20 17:28:00 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_compile() {
+
+	epatch ${FILESDIR}/system.mk-${PV}.patch
+	epatch ${FILESDIR}/stripws-${PV}.patch
+
+	cp system.mk ${T}/system.mk
+	sed -e "s/@CFLAGS@/${CFLAGS}/g" \
+		-e "s/@PF@/${PF}/g" \
+		${T}/system.mk > system.mk
+
+	if [ `use xinerama` ]; then
+		einfo Enabling Xinerama support
+		# enabled by default
+		eend 0
+	else
+		einfo Disabling Xinerama support
+		cp system.mk ${T}/system.mk
+		sed -e 's/\(XINERAMA_LIBS=-lXinerama\)/#\1/' \
+			-e 's/#\(DEFINES += -DCF_NO_XINERAMA\)/\1/' \
+			${T}/system.mk > system.mk
+		eend $?
+	fi
+
+	if has_version '<x11-base/xfree-4.3.0'; then
+		einfo Enabling Xfree\<4.3.0/Opera/UTF-8 bug workaround
+		# enabled by default
+		eend 0
+	else
+		einfo Disabling Xfree\<4.3.0/Opera/UTF-8 bug workaround
+		cp system.mk ${T}/system.mk
+		sed -e 's/\(DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND\)/#\1/' \
+			${T}/system.mk > system.mk
+		eend $?
+	fi
+	
+	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"
+}