diff options
| -rw-r--r-- | x11-wm/ion2/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-wm/ion2/files/digest-ion2-20040211-r3 | 1 | ||||
| -rw-r--r-- | x11-wm/ion2/files/ion2-20040207-rename.patch | 52 | ||||
| -rw-r--r-- | x11-wm/ion2/files/ion2.desktop | 6 | ||||
| -rw-r--r-- | x11-wm/ion2/files/pwm2.desktop | 9 | ||||
| -rw-r--r-- | x11-wm/ion2/ion2-20040211-r3.ebuild | 99 |
6 files changed, 168 insertions, 4 deletions
diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog index 56b7d93b013b..11ce921dd465 100644 --- a/x11-wm/ion2/ChangeLog +++ b/x11-wm/ion2/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/ion2 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.8 2004/03/31 00:30:57 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.9 2004/04/04 16:19:05 twp Exp $ + + 31 Mar 2004; Tom Payne <twp@gentoo.oth> ion2-20040211-r3.ebuild : + Rename binaries so it can co-exist with x11-wm/ion. Bug # 46225. 31 Mar 2004; Tom Payne <twp@gentoo.oth> ion2-20040211-r2.ebuild : Added sys-devel/libtool-1.4.3 dependency. Bug # 46156. diff --git a/x11-wm/ion2/files/digest-ion2-20040211-r3 b/x11-wm/ion2/files/digest-ion2-20040211-r3 new file mode 100644 index 000000000000..403f80c42ca4 --- /dev/null +++ b/x11-wm/ion2/files/digest-ion2-20040211-r3 @@ -0,0 +1 @@ +MD5 d20cde38bdc15e7e4824cf1140440f51 ion-2-20040207.tar.gz 376466 diff --git a/x11-wm/ion2/files/ion2-20040207-rename.patch b/x11-wm/ion2/files/ion2-20040207-rename.patch new file mode 100644 index 000000000000..d31ffe57f265 --- /dev/null +++ b/x11-wm/ion2/files/ion2-20040207-rename.patch @@ -0,0 +1,52 @@ +diff -Naur ion-2-20040207/configure.ac ion-2/configure.ac +--- ion-2-20040207/configure.ac 2004-02-07 16:37:01.000000000 +0100 ++++ ion-2/configure.ac 2004-04-04 17:41:00.751390576 +0200 +@@ -5,7 +5,7 @@ + AC_INIT([Ion Window Manager], + [2-20040207], + [tuomov@iki.fi], +- [ion]) ++ [ion2]) + AC_PREREQ([2.58]) + AC_REVISION([$Revision: 1.1 $]) + +diff -Naur ion-2-20040207/man/ion.1.in ion-2/man/ion.1.in +--- ion-2-20040207/man/ion.1.in 2004-02-01 12:54:55.000000000 +0100 ++++ ion-2/man/ion.1.in 2004-04-04 17:11:54.000000000 +0200 +@@ -2,7 +2,7 @@ + .SH NAME + Ion - an X11 window manager + .SH SYNOPSIS +-.B ion ++.B ion2 + .I "[options]" + .SH "DESCRIPTION" + +@@ -429,7 +429,7 @@ + .PP + .I DOCDIR/ + .PP +-\fIX(7x)\fP, \fIpwm(1)\fP ++\fIX(7x)\fP, \fIpwm2(1)\fP + + .SH AUTHOR + Ion was written by Tuomo Valkonen <tuomov at iki.fi>. +diff -Naur ion-2-20040207/man/pwm.1.in ion-2/man/pwm.1.in +--- ion-2-20040207/man/pwm.1.in 2004-01-25 19:05:05.000000000 +0100 ++++ ion-2/man/pwm.1.in 2004-04-04 17:12:50.000000000 +0200 +@@ -2,7 +2,7 @@ + .SH NAME + PWM - An X11 window manager + .SH SYNOPSIS +-.B pwm ++.B pwm2 + .I "[options]" + .SH "DESCRIPTION" + +@@ -75,5 +75,5 @@ + .SH SEE ALSO + + For more information, see +-\fIion(1)\fP. ++\fIion2(1)\fP. + diff --git a/x11-wm/ion2/files/ion2.desktop b/x11-wm/ion2/files/ion2.desktop index 95f54aadbe4b..1b5b44e6de62 100644 --- a/x11-wm/ion2/files/ion2.desktop +++ b/x11-wm/ion2/files/ion2.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Encoding=UTF-8 -Name=Ion +Name=Ion2 Comment=A tiling tabbed window manager designed with keyboard users in mind. -Exec=ion -TryExec=ion +Exec=ion2 +TryExec=ion2 # no icon yet, only the top three are currently used Icon= Type=Application diff --git a/x11-wm/ion2/files/pwm2.desktop b/x11-wm/ion2/files/pwm2.desktop new file mode 100644 index 000000000000..13145b064444 --- /dev/null +++ b/x11-wm/ion2/files/pwm2.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=PWM2 +Comment=An X11 window manager +Exec=pwm2 +TryExec=pwm2 +# no icon yet, only the top three are currently used +Icon= +Type=Application diff --git a/x11-wm/ion2/ion2-20040211-r3.ebuild b/x11-wm/ion2/ion2-20040211-r3.ebuild new file mode 100644 index 000000000000..f9ae1a4d7800 --- /dev/null +++ b/x11-wm/ion2/ion2-20040211-r3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040211-r3.ebuild,v 1.1 2004/04/04 16:18:06 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/dl/ion-2-20040207.tar.gz" +LICENSE="LGPL-2.1" +SLOT="2" +KEYWORDS="~alpha ~mips ~ppc ~sparc ~x86" +IUSE="truetype xinerama" +DEPEND="virtual/x11 + app-misc/run-mailcap + >=dev-lang/lua-5.0.2 + >=sys-devel/libtool-1.4.3 + !<=x11-wm/ion2-20040211-r2" +S=${WORKDIR}/ion-2-20040207 + +src_unpack() { + + unpack ${A} + + cd ${S} + + epatch ${FILESDIR}/ion2-20040207-20040211.patch + epatch ${FILESDIR}/ion2-20040207-rename.patch + + if [ `use truetype` ]; then + mkdir xftde + cp de/{*.c,*.h,Makefile} xftde + ( cd xftde && epatch ${FILESDIR}/xftde-20040207.patch ) + sed -i modulelist.mk \ + -e 's/^\(MODULE_LIST =\)/\1 xftde/g' + fi + +} + +src_compile() { + + local myconf="" + + if has_version '>=x11-base/xfree-4.3.0'; then + myconf="${myconf} --disable-xfree86-textprop-bug-workaround" + fi + + autoreconf + + econf \ + --sysconfdir=/etc/X11 \ + `use_enable xinerama` \ + ${myconf} || die + + emake \ + DOCDIR=/usr/share/doc/${PF} || die + +} + +src_install() { + + make \ + 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/include/libtu/* + + 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 + +} + +pkg_postinst() { + ewarn "Binaries and manual pages have been renamed to ion2" + ewarn "You might have to edit your .xsession/.xinitrc." +} |