Fix ipager to actually build.

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc5-00283-g70bb089 x86_64)

4 files changed, 81 insertions, 7 deletions

diff --git a/x11-misc/ipager/ChangeLog b/x11-misc/ipager/ChangeLog
index 240f2cb2d0c6..0570c97623d2 100644
--- a/x11-misc/ipager/ChangeLog
+++ b/x11-misc/ipager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/ipager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ChangeLog,v 1.1 2008/09/09 02:26:49 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ChangeLog,v 1.2 2008/09/09 03:48:26 robbat2 Exp $
+
+  09 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ipager-1.1.0-gcc43.patch, +files/ipager-1.1.0-scons_flags.patch,
+  ipager-1.1.0.ebuild:
+  Fix ipager to actually build.
 
 *ipager-1.1.0 (09 Sep 2008)
 
diff --git a/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch
new file mode 100644
index 000000000000..e4fe301a7b89
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-gcc43.patch
@@ -0,0 +1,29 @@
+Fix ipager to compile with GCC 4.3.
+
+Patch taken from Gentoo bug #173562.
+
+X-Gentoo-Bug: 173562
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- iconfig.old	2008-08-22 21:35:16.000000000 +0600
++++ iconfig.cpp	2008-08-22 21:35:20.000000000 +0600
+@@ -30,7 +30,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>
+-
++#include <stdlib.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
+--- wm.old	2008-08-22 21:52:36.000000000 +0600
++++ wm.cpp	2008-08-22 21:52:40.000000000 +0600
+@@ -27,7 +27,7 @@
+ 
+ #include <time.h>
+ #include "atoms.h"
+-
++#include <stdlib.h>
+ 
+ WM * WM::m_instance = 0;
+ bool WM::x_error = false;
diff --git a/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch
new file mode 100644
index 000000000000..6eb8b1ff4f53
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-scons_flags.patch
@@ -0,0 +1,24 @@
+Make sure Scons takes the CFLAGS/CXXFLAGS/LDFLAGS etc for the system.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar ipager-1.1.0.orig/SConstruct ipager-1.1.0/SConstruct
+--- ipager-1.1.0.orig/SConstruct	2008-09-08 20:32:23.007016555 -0700
++++ ipager-1.1.0/SConstruct	2008-09-08 20:32:05.103267940 -0700
+@@ -30,6 +30,16 @@
+ # environment
+ ipager_env = Environment(options = ipager_options, ENV = os.environ)
+ 
++# process env variables
++for K in ['CPPFLAGS', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CC', 'CXX']:
++  if K in os.environ.keys():
++    dict = ipager_env.ParseFlags(os.environ[K])
++    # These headers are supposed static. Don't check at each build.
++    for i in dict['CPPPATH']:
++      dict['CCFLAGS'].append('-I' + i)
++    dict['CPPPATH'] = []
++    ipager_env.MergeFlags(dict)
++
+ ipager_env.Append(
+         CPPFLAGS = [ '-Wall' ],
+         CPPPATH = [ '/usr/X11R6/include' ],
diff --git a/x11-misc/ipager/ipager-1.1.0.ebuild b/x11-misc/ipager/ipager-1.1.0.ebuild
index f45f6c4d8e68..10c5a1a7e91f 100644
--- a/x11-misc/ipager/ipager-1.1.0.ebuild
+++ b/x11-misc/ipager/ipager-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ipager-1.1.0.ebuild,v 1.1 2008/09/09 02:26:49 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ipager/ipager-1.1.0.ebuild,v 1.2 2008/09/09 03:48:26 robbat2 Exp $
 
 inherit eutils
 
@@ -14,22 +14,38 @@ KEYWORDS="~x86 ~amd64"
 IUSE="xinerama"
 
 RDEPEND="media-libs/imlib2
-	xinerama? ( x11-libs/libXinerama )"
+		x11-libs/libXmu
+		xinerama? ( x11-libs/libXinerama )"
 DEPEND="dev-util/scons
 	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-scons_imlib2.patch"
+	epatch "${FILESDIR}"/${P}-scons_imlib2.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-scons_flags.patch
 }
 
 src_compile() {
 	CONFIG_OPTS="xinerama=false"
-	use xinerama && CONFIG_OPTS="xinerama=true"
-	scons PREFIX="/usr" ${CONFIG_OPTS} || die "scons build failed"
+	use xinerama && CONFIG_OPTS="${CONFIG_OPTS} xinerama=true"
+	# FYI: Passing debug=true only adds -ggdb inside the SConstruct
+	
+	scons \
+		--cache-disable \
+		PREFIX="/usr" \
+		${CONFIG_OPTS} \
+		|| die "scons configure failed"
 }
 
 src_install() {
-	scons DESTDIR="${D}" install || die "scons install failed"
+	scons \
+		--cache-disable \
+		PREFIX="/usr" \
+		DESTDIR="${D}" \
+		install \
+		|| die "scons install failed"
+	dodoc ToDo ChangeLog README
+	dodoc themes/*.conf
 }