Version bump

4 files changed, 171 insertions, 2 deletions

diff --git a/x11-wm/ion-devel/Manifest b/x11-wm/ion-devel/Manifest
index 60a002b8ec12..abfe7197c19a 100644
--- a/x11-wm/ion-devel/Manifest
+++ b/x11-wm/ion-devel/Manifest
@@ -1,11 +1,11 @@
-MD5 0423ebf068fd6f1c55e38baf4d79b06a ChangeLog 1715
+MD5 1cb19dbfce25269c79ccf71f58838d59 ChangeLog 1710
 MD5 bd04e899304b8928c22de9cebbd93268 ion-devel-20020605.ebuild 1439
 MD5 c3c735d9d9f740eb5bdaecc96a8d487c ion-devel-20021104.ebuild 1440
 MD5 3bdd03a83defef6b4103c327cdebeb37 ion-devel-20030131.ebuild 1440
 MD5 d8d03d8fc54c6efe7e2e55546151b8a8 ion-devel-20030327.ebuild 1036
 MD5 8a8056119d50d64849a9c75a4e0efca8 ion-devel-20030416-r1.ebuild 2568
 MD5 2096300d111cb3c37111fec7f9e00725 ion-devel-20030416.ebuild 2623
-MD5 9f797a17155f4367a999abfdbf450689 ion-devel-20030814.ebuild 2694
+MD5 87bd48db87e2da2dc36e403966185567 ion-devel-20030814.ebuild 2691
 MD5 38e36c173b659fa1ee8119a533bf29d8 files/digest-ion-devel-20020605 70
 MD5 4d8792755ad5757487b325eea02f214b files/digest-ion-devel-20021104 70
 MD5 0c42a282fccdcd0f58e9c7c378cb8845 files/digest-ion-devel-20030131 70
diff --git a/x11-wm/ion-devel/files/digest-ion-devel-20030814 b/x11-wm/ion-devel/files/digest-ion-devel-20030814
new file mode 100644
index 000000000000..fb1828342d7e
--- /dev/null
+++ b/x11-wm/ion-devel/files/digest-ion-devel-20030814
@@ -0,0 +1 @@
+MD5 f5c779ff79ef982d76dec2f1e57d4034 ion-devel-20030814.tar.gz 284786
diff --git a/x11-wm/ion-devel/files/system.mk-20030814.patch b/x11-wm/ion-devel/files/system.mk-20030814.patch
new file mode 100644
index 000000000000..57696c553b0e
--- /dev/null
+++ b/x11-wm/ion-devel/files/system.mk-20030814.patch
@@ -0,0 +1,70 @@
+--- 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
+@@ -113,7 +113,7 @@
+ # specified here.
+ 
+ # GNU/Linux and other glibc-2.2 based systems.
+-#DEFINES += -DCF_UTF8 -DCF_ICONV_TARGET=\"WCHAR_T\" -DCF_ICONV_SOURCE=\"UTF-8\"
++DEFINES += -DCF_UTF8 -DCF_ICONV_TARGET=\"WCHAR_T\" -DCF_ICONV_SOURCE=\"UTF-8\"
+ 
+ # Systems that depend on libutf8 and libiconv might want these.
+ #DEFINES += -DCF_UTF8 -DCF_LIBUTF8 -DCF_ICONV_TARGET=\"C99\" -DCF_ICONV_SOURCE=\"UTF-8\"
+@@ -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.ebuild b/x11-wm/ion-devel/ion-devel-20030814.ebuild
new file mode 100644
index 000000000000..bc3542d99aba
--- /dev/null
+++ b/x11-wm/ion-devel/ion-devel-20030814.ebuild
@@ -0,0 +1,98 @@
+# 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.ebuild,v 1.1 2003/08/18 13:55:43 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="truetype xinerama"
+DEPEND="virtual/x11
+	app-misc/run-mailcap
+	>=dev-lang/lua-5
+	truetype? ( virtual/xft )"
+S=${WORKDIR}/${MY_P}
+
+inherit eutils
+
+src_compile() {
+
+	epatch ${FILESDIR}/system.mk-${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 truetype` ]; then
+		einfo Enabling TrueType support
+		local xft_config=`which xft-config 2> /dev/null`
+		if [ -n "${xft_config}" ] && [ -x "${xft_config}" ]; then
+			local xft_cflags=`${xft_config} --cflags`
+			local xft_libs=`${xft_config} --libs`
+		else
+			local xft_cflags=
+			local xft_libs="-lXft"
+		fi
+		cp system.mk ${T}/system.mk
+		sed -e 's:#\(DEFINES += -DCF_XFT\):\1:' \
+			-e "s:#\\(X11_INCLUDES += \\)\`xft-config --cflags\`:\\1${xft_cflags}:" \
+			-e "s:#\\(X11_LIBS += \\)\`xft-config --libs\`:\\1${xft_libs}:" \
+			${T}/system.mk > system.mk
+		eend $?
+	else
+		einfo Disabling TrueType support
+		# disabled by default
+		eend 0
+	fi
+
+	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"
+}