Fixes

6 files changed, 156 insertions, 3 deletions

diff --git a/x11-wm/ion-devel/ChangeLog b/x11-wm/ion-devel/ChangeLog
index 2402a9dfab38..5ed36edcd4c8 100644
--- a/x11-wm/ion-devel/ChangeLog
+++ b/x11-wm/ion-devel/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2003/09/09 20:55:56 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion-devel/ChangeLog,v 1.17 2003/09/27 15:39:18 twp Exp $
+
+  27 Sep 2003; Tom Payne <twp@gentoo.org> ion-devel-20030814-r3.ebuild :
+  Remove UTF-8 support. Tidy ebuild. Changes submitted by Martin Guy.
+  Added metadata.xml.
 
   9 Sep 2003; Tom Payne <twp@gentoo.org> ion-devel-20030814-r2.ebuild :
   Added tabdrag patch.
diff --git a/x11-wm/ion-devel/Manifest b/x11-wm/ion-devel/Manifest
index 1e73a08bc9f0..af299472c03b 100644
--- a/x11-wm/ion-devel/Manifest
+++ b/x11-wm/ion-devel/Manifest
@@ -1,9 +1,10 @@
-MD5 4be4b14fe72c827fb0c96fb2ac69b460 ChangeLog 2119
+MD5 5ab457243dd847516390457b627cf754 ChangeLog 2285
 MD5 801f0f38476e0176a46576074d296005 ion-devel-20030814-r1.ebuild 2044
 MD5 393b3bc407717cf7eae403f531476ec6 ion-devel-20030814-r2.ebuild 2079
 MD5 3bdd03a83defef6b4103c327cdebeb37 ion-devel-20030131.ebuild 1440
 MD5 4bf4cee3f750c7da52bd12d4a5d4c990 ion-devel-20030327.ebuild 1035
-MD5 e4a5888cf8a1bd82f9d713c496e91f28 ion-devel-20030814-r3.ebuild 1958
+MD5 1eef30dc0886afa4e83ced96b5b2cbaa ion-devel-20030814-r3.ebuild 1950
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 959484a17e263506435e0bf5a208112e ion-devel-20030814.ebuild 2695
 MD5 8fdcbc4385bc96bf46343ecdec97d02b files/stripws-20030814.patch 321
 MD5 7f3e096c736a8cea2eeae99794a863ff files/digest-ion-devel-20030814-r1 70
diff --git a/x11-wm/ion-devel/files/digest-ion-devel-20030814-r3 b/x11-wm/ion-devel/files/digest-ion-devel-20030814-r3
new file mode 100644
index 000000000000..fb1828342d7e
--- /dev/null
+++ b/x11-wm/ion-devel/files/digest-ion-devel-20030814-r3
@@ -0,0 +1 @@
+MD5 f5c779ff79ef982d76dec2f1e57d4034 ion-devel-20030814.tar.gz 284786
diff --git a/x11-wm/ion-devel/files/system.mk-20030814-no-utf8.patch b/x11-wm/ion-devel/files/system.mk-20030814-no-utf8.patch
new file mode 100644
index 000000000000..b4ec6c3700e3
--- /dev/null
+++ b/x11-wm/ion-devel/files/system.mk-20030814-no-utf8.patch
@@ -0,0 +1,61 @@
+--- ion-devel-20030814/system.mk	2003-07-30 16:14:46.000000000 +0200
++++ ion-devel/system.mk	2003-08-18 14:04:32.000000000 +0200
+@@ -7,7 +7,7 @@
+ ## Installation paths
+ ##
+ 
+-PREFIX=/usr/local/ion-devel
++PREFIX=/usr
+ 
+ # Unless you are creating a package conforming to some OS's standards, you
+ # probably do not want to modify the following directories:
+@@ -15,13 +15,13 @@
+ # 'ioncore' binary and 'ion' script
+ BINDIR=$(PREFIX)/bin
+ # Configuration .lua files
+-ETCDIR=$(PREFIX)/etc/ion-devel
++ETCDIR=/etc/X11/ion-devel
+ # Some .lua files and ion-* shell scripts
+ SHAREDIR=$(PREFIX)/share/ion-devel
+ # Manual pages
+-MANDIR=$(PREFIX)/man
++MANDIR=$(PREFIX)/share/man
+ # Some documents
+-DOCDIR=$(PREFIX)/doc/ion-devel
++DOCDIR=$(PREFIX)/share/doc/@PF@
+ # Nothing at the moment
+ INCDIR=$(PREFIX)/include/ion-devel
+ # Nothing at the moment
+@@ -72,9 +72,9 @@
+ 
+ # If you have installed Lua 5.0 from the official tarball without changing
+ # paths, this so do it.
+-LUA_PATH=/usr/local
+-LUA_LIBS = -L$(LUA_PATH)/lib -R$(LUA_PATH)/lib -llua -llualib
+-LUA_INCLUDES = -I$(LUA_PATH)/include
++LUA_PATH=/usr
++LUA_LIBS = -llua -llualib
++LUA_INCLUDES = 
+ LUA=$(LUA_PATH)/bin/lua
+ 
+ # If you are using the Debian packages, the following settings should be
+@@ -137,7 +137,7 @@
+ # asprintf and vasprintf in the c library. (gnu libc has.)
+ # If HAS_SYSTEM_ASPRINTF is not defined, an implementation
+ # in sprintf_2.2/ is used.
+-#HAS_SYSTEM_ASPRINTF=1
++HAS_SYSTEM_ASPRINTF=1
+ 
+ 
+ ##
+@@ -174,8 +174,8 @@
+ # following should optimize function calls to Lua a little.
+ #C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY
+ 
+-CFLAGS=-g -Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+-LDFLAGS=-g -Os $(LIBS) $(EXTRA_LIBS)
++CFLAGS=@CFLAGS@ $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
++LDFLAGS=@CFLAGS@ $(LIBS) $(EXTRA_LIBS)
+ 
+ 
+ ##
diff --git a/x11-wm/ion-devel/ion-devel-20030814-r3.ebuild b/x11-wm/ion-devel/ion-devel-20030814-r3.ebuild
new file mode 100644
index 000000000000..e94d4f753682
--- /dev/null
+++ b/x11-wm/ion-devel/ion-devel-20030814-r3.ebuild
@@ -0,0 +1,77 @@
+# 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-r3.ebuild,v 1.1 2003/09/27 15:39: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
+
+	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"
+}
diff --git a/x11-wm/ion-devel/metadata.xml b/x11-wm/ion-devel/metadata.xml
new file mode 100644
index 000000000000..d9bb4626fb2b
--- /dev/null
+++ b/x11-wm/ion-devel/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>twp@gentoo.org</email>
+  <name>Tom Payne</name>
+</maintainer>
+</pkgmetadata>