Fix issues with latest Subversion snapshot. Bug # 59557.

5 files changed, 14 insertions, 86 deletions

diff --git a/x11-wm/ion3-svn/ChangeLog b/x11-wm/ion3-svn/ChangeLog
index b855e3eaa94e..72811dcecd59 100644
--- a/x11-wm/ion3-svn/ChangeLog
+++ b/x11-wm/ion3-svn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/ion3-svn
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3-svn/ChangeLog,v 1.4 2004/06/24 23:42:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3-svn/ChangeLog,v 1.5 2004/08/09 11:38:04 twp Exp $
+
+*ion3-svn-20040809 (09 Aug 2004)
+
+  09 Aug 2004; <twp@gentoo.org> -files/ion3-svn-20040412-rename.patch,
+  -ion3-svn-20040412.ebuild, +ion3-svn-20040809.ebuild:
+  Fix issues with latest Subversion snapshot. Bug # 59557.
 
   08 May 2004; <twp@gentoo.org> files/ion3-svn-20040412-rename.patch:
   Rename manual page in scripts.
diff --git a/x11-wm/ion3-svn/Manifest b/x11-wm/ion3-svn/Manifest
index cc8ea5d57d5c..dcd1bd497506 100644
--- a/x11-wm/ion3-svn/Manifest
+++ b/x11-wm/ion3-svn/Manifest
@@ -1,7 +1,6 @@
-MD5 02526e22a46351d4d4440eeb08a202bb ion3-svn-20040412.ebuild 1858
+MD5 36d8da062e8307ba1d38dcdd5f7b27b3 ion3-svn-20040809.ebuild 1806
 MD5 f5f1f50637211be2411304a16d6d5afc ChangeLog 431
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ion3-svn-20040412 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ion3-svn-20040809 0
 MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
-MD5 703068cb52061535f0eb30e5d9c4de2c files/ion3-svn-20040412-rename.patch 2248
diff --git a/x11-wm/ion3-svn/files/digest-ion3-svn-20040412 b/x11-wm/ion3-svn/files/digest-ion3-svn-20040809
index e69de29bb2d1..e69de29bb2d1 100644
--- a/x11-wm/ion3-svn/files/digest-ion3-svn-20040412
+++ b/x11-wm/ion3-svn/files/digest-ion3-svn-20040809
diff --git a/x11-wm/ion3-svn/files/ion3-svn-20040412-rename.patch b/x11-wm/ion3-svn/files/ion3-svn-20040412-rename.patch
deleted file mode 100644
index 565c9f157833..000000000000
--- a/x11-wm/ion3-svn/files/ion3-svn-20040412-rename.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur ion-3ds-20040316-1/configure.ac ion/configure.ac
---- ion-3ds-20040316-1/configure.ac	2004-03-16 21:43:59.000000000 +0100
-+++ ion/configure.ac	2004-05-08 19:18:14.976007088 +0200
-@@ -5,7 +5,7 @@
- AC_INIT([Ion Window Manager],
-         [ION_VERSION],
-         [tuomov@iki.fi],
--        [ion])
-+        [ion3])
- AC_PREREQ([2.58])
- AC_REVISION([$Revision: 1.2 $])
- 
-diff -Naur ion-3ds-20040316-1/man/ion.1.in ion/man/ion.1.in
---- ion-3ds-20040316-1/man/ion.1.in	2004-02-14 23:11:37.000000000 +0100
-+++ ion/man/ion.1.in	2004-05-08 19:18:14.978006784 +0200
-@@ -2,7 +2,7 @@
- .SH NAME
- Ion - an X11 window manager
- .SH SYNOPSIS
--.B ion
-+.B ion3
- .I "[options]"
- .SH "DESCRIPTION"
- 
-@@ -432,7 +432,7 @@
- .PP
- .I DOCDIR/
- .PP
--\fIX(7x)\fP, \fIpwm(1)\fP, \fIjoe(1)\fP
-+\fIX(7x)\fP, \fIpwm3(1)\fP, \fIjoe(1)\fP
- 
- .SH AUTHOR
- Ion was written by Tuomo Valkonen <tuomov at iki.fi>.
-diff -Naur ion-3ds-20040316-1/man/pwm.1.in ion/man/pwm.1.in
---- ion-3ds-20040316-1/man/pwm.1.in	2004-02-10 11:35:04.000000000 +0100
-+++ ion/man/pwm.1.in	2004-05-08 19:18:14.979006632 +0200
-@@ -2,7 +2,7 @@
- .SH NAME
- PWM - An X11 window manager
- .SH SYNOPSIS
--.B pwm
-+.B pwm3
- .I "[options]"
- .SH "DESCRIPTION"
- 
-@@ -75,5 +75,5 @@
- .SH SEE ALSO
- 
- For more information, see
--\fIion(1)\fP.
-+\fIion3(1)\fP.
- 
-diff -Naur ion-3ds-20040316-1/mod_query/querylib.lua ion/mod_query/querylib.lua
---- ion-3ds-20040316-1/mod_query/querylib.lua	2004-03-15 00:40:22.000000000 +0100
-+++ ion/mod_query/querylib.lua	2004-05-08 19:20:58.235187920 +0200
-@@ -541,7 +541,7 @@
- -- \file{ion-completeman} is used to complete manual pages.
- function querylib.query_man(mplex)
-     local script=querylib.lookup_script_warn(mplex, "ion-man")
--    querylib.do_query_execwith(mplex, "Manual page (ion):", "ion",
-+    querylib.do_query_execwith(mplex, "Manual page (ion3):", "ion3",
-                                script, querylib.man_completor)
- end
- 
-diff -Naur ion-3ds-20040316-1/share/ion-man.in ion/share/ion-man.in
---- ion-3ds-20040316-1/share/ion-man.in	2004-02-11 02:25:27.000000000 +0100
-+++ ion/share/ion-man.in	2004-05-08 19:20:07.350923504 +0200
-@@ -1,4 +1,4 @@
- #!/bin/sh
--topic=ion
-+topic=ion3
- test $# -ge 1 && topic=$*
- exec @SHAREDIR@/ion-runinxterm -T "$topic manual" man $topic
diff --git a/x11-wm/ion3-svn/ion3-svn-20040412.ebuild b/x11-wm/ion3-svn/ion3-svn-20040809.ebuild
index e2dba6234e3b..df4c69bc2bd5 100644
--- a/x11-wm/ion3-svn/ion3-svn-20040412.ebuild
+++ b/x11-wm/ion3-svn/ion3-svn-20040809.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3-svn/ion3-svn-20040412.ebuild,v 1.3 2004/06/24 23:42:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3-svn/ion3-svn-20040809.ebuild,v 1.1 2004/08/09 11:38:04 twp Exp $
 
 inherit eutils subversion
 
@@ -22,8 +22,6 @@ ESVN_PROJECT="ion-snapshot"
 
 src_compile() {
 
-	epatch ${FILESDIR}/ion3-svn-20040412-rename.patch
-
 	local myconf=""
 
 	if has_version '>=x11-base/xfree-4.3.0'; then
@@ -46,21 +44,19 @@ src_install() {
 
 	make \
 		prefix=${D}/usr \
+		PREFIX=${D}/usr \
 		ETCDIR=${D}/etc/X11/ion3 \
 		SHAREDIR=${D}/usr/share/ion3 \
 		MANDIR=${D}/usr/share/man \
 		DOCDIR=${D}/usr/share/doc/${PF} \
 		install || die
 
-	mv ${D}/usr/bin/ion ${D}/usr/bin/ion3
-	mv ${D}/usr/bin/pwm ${D}/usr/bin/pwm3
-	mv ${D}/usr/share/man/man1/ion.1 ${D}/usr/share/man/man1/ion3.1
-	mv ${D}/usr/share/man/man1/pwm.1 ${D}/usr/share/man/man1/pwm3.1
-
 	prepalldocs
 
 	insinto /usr/include/ion3
-	doins *.h *.mk mkexports.lua
+	doins *.h *.mk
+	insinto /usr/include/ion3/build
+	doins build/mkexports.lua
 	for i in de ioncore luaextl mod_floatws mod_ionws mod_menu mod_query mod_sm mod_sp; do
 		insinto /usr/include/ion3/${i}
 		doins ${i}/*.h