reinit the tree, so we can have metadata

4 files changed, 84 insertions, 0 deletions

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..ca7752ac99d0
--- /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>
+
+--- a/iconfig.cpp	2008-08-22 21:35:16.000000000 +0600
++++ b/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>
+ 
+--- a/wm.cpp	2008-08-22 21:52:36.000000000 +0600
++++ b/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-gcc47.patch b/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch
new file mode 100644
index 000000000000..f4c899302aeb
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-gcc47.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/423215
+
+--- a/ipager.cpp
++++ b/ipager.cpp
+@@ -29,6 +29,7 @@
+ #include <config.h>
+ #endif
+ 
++#include <unistd.h>
+ #include <iostream>
+ #include <string>
+ using namespace std;
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/files/ipager-1.1.0-scons_imlib2.patch b/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch
new file mode 100644
index 000000000000..283dec348ab1
--- /dev/null
+++ b/x11-misc/ipager/files/ipager-1.1.0-scons_imlib2.patch
@@ -0,0 +1,19 @@
+--- ipager-1.1.0/SConstruct	2005-11-06 06:23:24.000000000 -0500
++++ ipager-1.1.0-gentoo/SConstruct	2008-09-08 15:18:07.000000000 -0400
+@@ -115,12 +115,14 @@
+     else:
+         print "yes"
+         ipager_env.AppendUnique(
+-            CPPPATH = imlib2_env.Dictionary()['CPPPATH'], 
+             CCFLAGS = imlib2_env.Dictionary()['CCFLAGS'], 
+             LIBPATH = imlib2_env.Dictionary()['LIBPATH'],
+             LIBS    = imlib2_env.Dictionary()['LIBS']
+-
+         )
++        if imlib2_env.Dictionary().has_key('CPPPATH'): 
++            ipager_env.AppendUnique(
++                CPPPATH = imlib2_env.Dictionary()['CPPPATH'], 
++            )
+ 
+ conf.Finish()
+