Be maintainer. Keyword ~amd64. Bump, fixing bug 206780. Also fixing: Bug 226441, maintainer-mode rebuild. Bug 226441, gcc-4.3 compilation. Bug 240389, new libsigc api failure.

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64

12 files changed, 804 insertions, 16 deletions

diff --git a/app-office/passepartout/ChangeLog b/app-office/passepartout/ChangeLog
index 6d83dcf05aca..22ba5990096b 100644
--- a/app-office/passepartout/ChangeLog
+++ b/app-office/passepartout/ChangeLog
@@ -1,14 +1,21 @@
 # ChangeLog for app-office/passepartout
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.8 2007/10/12 08:21:16 leio Exp $
-
-  12 Oct 2007; Mart Raudsepp <leio@gentoo.org> -passepartout-0.5.ebuild,
-  -passepartout-0.6.ebuild:
-  Clean out older redundant versions for bug 159995
-
-  05 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
-  passepartout-0.6_p1.ebuild:
-  stable x86, bug 194742
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.9 2008/12/20 01:18:48 loki_val Exp $
+
+*passepartout-0.7.0 (20 Dec 2008)
+
+  20 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/passepartout-0.7.0-gcc42.patch,
+  +files/passepartout-0.7.0-gcc43.patch,
+  +files/passepartout-0.7.0-gcc44.patch,
+  +files/passepartout-0.7.0-include-flags.patch,
+  +files/passepartout-0.7.0-libtoolization.patch,
+  +files/passepartout-0.7.0-libxmlpp-2.6-depend.patch,
+  +files/passepartout-0.7.0-safer.patch, metadata.xml,
+  +passepartout-0.7.0.ebuild:
+  Be maintainer. Keyword ~amd64. Bump, fixing bug 206780. Also fixing: Bug
+  226441, maintainer-mode rebuild. Bug 226441, gcc-4.3 compilation. Bug
+  240389, new libsigc api failure.
 
 *passepartout-0.6_p1 (22 Mar 2007)
 
diff --git a/app-office/passepartout/Manifest b/app-office/passepartout/Manifest
index fee0921b83a0..51a14cf2087c 100644
--- a/app-office/passepartout/Manifest
+++ b/app-office/passepartout/Manifest
@@ -1,6 +1,15 @@
 AUX passepartout-0.6-extra_qual.patch 2052 RMD160 e31ad61f8af148c645c543059555d7575a23ba7d SHA1 aeaf90a0b31739124d8466332c21fb5258aa0a6c SHA256 04a195e970439e7dffbb29b83ccd454d0b4939144d99417a967a2782d2be4c27
+AUX passepartout-0.7.0-gcc42.patch 540 RMD160 7b83b1f85dc35913ede63da141215a933fe6a851 SHA1 2696576c05816f23ee2e9d77bbdfb13966d8593a SHA256 0942429cdb2c933b1dc5f2f7fa2c858897fd5be0699cdb857cc2e49a09bea89e
+AUX passepartout-0.7.0-gcc43.patch 2046 RMD160 354ba3cd71609f1a4370a95063a302d30ed6893d SHA1 cd02ed92c2429a838e207253e4e507ffdb6eb453 SHA256 2b1e13940f75465ca1575219885006a7cf74a1d6472da513074914c6de759f3e
+AUX passepartout-0.7.0-gcc44.patch 5954 RMD160 528edb0b403026faf64008652bdc656ef6116d57 SHA1 efb50c5f47b7ce9fe61c430c2dcf3e03ab01f6d0 SHA256 c1ddd5a3e1788de4f2792a1185f93e36e1223b8987a833c7d78cf91263996947
+AUX passepartout-0.7.0-include-flags.patch 6379 RMD160 d7b4e88262bc24b2785efaf4f6aeeb7ba9a80e49 SHA1 17eb0892c0d769d13bd5e647b14604a358647962 SHA256 44de17a43b3d9a44f3fd69e60edb037d66cab09888183cfe75f856546a0b737e
+AUX passepartout-0.7.0-libtoolization.patch 11344 RMD160 33350e89723ce09ab44c6a16395ff6ac0281ce31 SHA1 ccb5e24e168698f4c1b53d48192d9a5639b8484b SHA256 c90451db70cb627f0182f6c99692be98c5c42e93f80e9d23d4a0d3e7ae957407
+AUX passepartout-0.7.0-libxmlpp-2.6-depend.patch 341 RMD160 c929871fad71a201bb6873ab834c52ee5edf3ce8 SHA1 9c32ffc61045acc77407f133f4baeab4eac089b4 SHA256 b1c78a59bc6e73e3ed75a481b041cee71b5a3671953d9424cd7e7e6dc7fe671f
+AUX passepartout-0.7.0-safer.patch 506 RMD160 bd92b9753d3767be64148bd06cb4457c22a98e64 SHA1 5ae0f141598f279d98da68816a82cbde938b2c65 SHA256 33a98d600b9c1c229cc4aa423e54719c256a658d0c7fd5ecbd57a1b1a4c868bf
 DIST passepartout-0.6-patch1.patch 714203 RMD160 ac202bd308dda0d62824be626287565d86dcf838 SHA1 152c52b6f0b81a11a15cb8a6df324afe46efd19e SHA256 b5216c755400128fc77dd3948c530bcdec0a987ba9a651bf0a39faa44ec57ca5
 DIST passepartout-0.6.tar.bz2 346041 RMD160 f89c20d62f16e13bbef4eb8d066f6d1d5be0fbaf SHA1 b551d2873985903649367b38d3ee34a6e76499e4 SHA256 5e95c4a35c4762a8a06429303b727f2dd0e250bd55a2fe087639b366723f815e
-EBUILD passepartout-0.6_p1.ebuild 1129 RMD160 c84f33c974173d48316f9399bc317f68323539a5 SHA1 d6b610ec5fda84d120903b75d1cf95d4987f801a SHA256 5b8b772b981d89fbfbf0706c433759d5dbf998e5075e3ae8ff4af0acaf3ba58e
-MISC ChangeLog 1448 RMD160 61b42824433957544b839fb3e674258c3854e42d SHA1 71ee02e5b12d911c991ef21373acc7be401decfa SHA256 c009ee60b500030da6e1693fe7f0e13d2c7ab063196ead0952f5d1d08d49f5c6
-MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+DIST passepartout-0.7.0.tar.bz2 369232 RMD160 0d07673abab8bfd8d086bb19e053052850330eb6 SHA1 05173380776c5a55bceb1128c59135182e9c21a9 SHA256 709890fb1530217e2678b710e996e9e3ee41c969088193711f119fc456f67d0b
+EBUILD passepartout-0.6_p1.ebuild 1132 RMD160 eb94df0a8eec3f38714cc9835fb7a6faf523643e SHA1 38592dfd0bb37f71a60eb9783882e01c725e80c5 SHA256 2d21bc92c57370d57ef4ae1d478d71540fdc92b6de08b4b862a683cca263daf3
+EBUILD passepartout-0.7.0.ebuild 1860 RMD160 b608c1a643bafc882d769d1ed7d5d3754149e8ea SHA1 9276aa5fb55ddd93686c823001d84d9508f8936c SHA256 4cc96512157e6a0b4462bc12029689cff878e5e6138d077ee281e1875460f7d0
+MISC ChangeLog 1820 RMD160 c97e836fc777089992336b06e8c69461da2821fc SHA1 98613bd520a474c4bbf773c5953c64471b093d67 SHA256 aa18a7af50d37993ee0ebdc5de49cf06a97cab0f15d2617cfe1555b01529e53f
+MISC metadata.xml 250 RMD160 a6b6fd9c05458c59ca8b2f12223e7ed6dd9fd9ca SHA1 8336c5eb2bffc2314b34bcdd93f3c8e1860a3fe5 SHA256 acbfa48b512d3868a4d1bacf0e297a06597ed252e19fc74def42aa031a40338f
diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch
new file mode 100644
index 000000000000..feda57bf3938
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.7.0-gcc42.patch
@@ -0,0 +1,14 @@
+diff -urNad passepartout-0.7.0~/src/ps/misc.cc passepartout-0.7.0/src/ps/misc.cc
+--- passepartout-0.7.0~/src/ps/misc.cc	2007-06-13 13:05:07.000000000 +0200
++++ passepartout-0.7.0/src/ps/misc.cc	2007-09-14 17:49:49.000000000 +0200
+@@ -3,6 +3,8 @@
+ ///
+ #include "misc.h"
+ 
+-std::ostream& PS::operator << (std::ostream& out, const PS::Concat& c) {
+-  return out << '[' << c.matrix << "] concat\n";
++namespace PS {
++  std::ostream& operator << (std::ostream& out, const Concat& c) {
++    return out << '[' << c.matrix << "] concat\n";
++  }
+ }
diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch
new file mode 100644
index 000000000000..64703e164a47
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.7.0-gcc43.patch
@@ -0,0 +1,97 @@
+--- a/src/fonts/afm.cc
++++ b/src/fonts/afm.cc
+@@ -10,6 +10,8 @@
+ #include "util/warning.h"
+ #include "util/stringutil.h"
+ 
++#include <limits>
++
+ using std::string;
+ 
+ class font::AFMetrics::GlyphData {
+--- a/src/fonts/fontmanager.cc
++++ b/src/fonts/fontmanager.cc
+@@ -14,6 +14,8 @@
+ #include "util/filesys.h"
+ #include "util/warning.h"
+ 
++#include <memory>
++
+ font::FontManager* font::FontManager::_instance = 0;
+ // StaticMutex can, unlike regular Mutex, be created before the call
+ // to thread_init
+--- a/src/pptout/document/rasterframe.cc
++++ b/src/pptout/document/rasterframe.cc
+@@ -12,6 +12,8 @@
+ #include "ps/misc.h"
+ #include "pptout/config.h" // Todo
+ 
++#include <ctime>
++
+ RasterFrame::RasterFrame(const ElementWrap& xml, Group *parent)
+   : BasicFrame(xml, parent),
+     association(xml.get_filename("file")),
+--- a/src/ps/encode.h
++++ b/src/ps/encode.h
+@@ -8,6 +8,7 @@
+ #include <iostream>
+ #include <string>
+ #include <vector>
++#include <cstring>
+ 
+ // Standard PostScript encoding filters
+ 
+--- a/src/ps/examinepdf.cc
++++ b/src/ps/examinepdf.cc
+@@ -5,6 +5,7 @@
+ #include <fstream>
+ #include <cassert>		// Todo: other assert!
+ #include <iostream>
++#include <cstdlib>
+ 
+ void usage() {}
+ 
+--- a/src/ps/pdf.cc
++++ b/src/ps/pdf.cc
+@@ -15,6 +15,7 @@
+ #include <stdexcept>
+ #include <glibmm/convert.h>
+ #include <fstream>
++#include <typeinfo>
+ 
+ 
+ namespace {
+--- a/src/util/filesys.cc
++++ b/src/util/filesys.cc
+@@ -14,6 +14,9 @@
+ #include <sys/types.h>
+ #endif
+ 
++#include <cstring>
++#include <stdlib.h>
++
+ using std::string;
+ 
+ ClibException::ClibException(const string& msg)
+--- a/src/util/vector.h
++++ b/src/util/vector.h
+@@ -5,6 +5,7 @@
+ ///
+ #include <algorithm> // max
+ #include <cmath> // sqrt
++#include <ostream>
+ template<class C> C sqr(const C& c) { return c*c; }
+ 
+ template <class C>
+--- a/src/util/tempfile.cc
++++ b/src/util/tempfile.cc
+@@ -8,6 +8,9 @@
+ #include <stdexcept>
+ #include <unistd.h>
+ 
++#include <cstring>
++#include <stdlib.h>
++
+ namespace {
+   std::string get_tmplate(std::string base) {
+     base += "XXXXXX";
diff --git a/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch b/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch
new file mode 100644
index 000000000000..97c9badfcb20
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.7.0-gcc44.patch
@@ -0,0 +1,109 @@
+From tbm@cyrius.com Sat Nov 08 17:07:16 2008
+Received: (at submit) by bugs.debian.org; 8 Nov 2008 17:07:16 +0000
+X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02
+	(2007-08-08) on rietz.debian.org
+X-Spam-Level: 
+X-Spam-Bayes: score:0.0000 Tokens: new, 59; hammy, 151; neutral, 105; spammy,
+	0. spammytokens: hammytokens:0.000-+--libxml2, 0.000-+--amd64,
+	0.000-+--sk:libgnom, 0.000-+--Usertags, 0.000-+--H*r:1000
+X-Spam-Status: No, scoreø.8 required0 testsL,BAYES_00,HAS_PACKAGE,
+	MURPHY_DRUGS_REL8,WEIRD_PORT autolearnúm
+	version2.3-bugs.debian.org_2005_01_02
+Return-path: <tbm@cyrius.com>
+Received: from sorrow.cyrius.com ([65.19.161.204])
+	by rietz.debian.org with esmtp (Exim 4.63)
+	(envelope-from <tbm@cyrius.com>)
+	id 1KyrHH-0002u6-Vy
+	for submit@bugs.debian.org; Sat, 08 Nov 2008 17:07:16 +0000
+Received: by sorrow.cyrius.com (Postfix, from userid 10)
+	id 564C8D857; Sat,  8 Nov 2008 17:07:15 +0000 (UTC)
+Received: by deprecation.cyrius.com (Postfix, from userid 1000)
+	id 0F2C1150B58; Sat,  8 Nov 2008 18:06:54 +0100 (CET)
+Date: Sat, 8 Nov 2008 18:06:53 +0100
+From: Martin Michlmayr <tbm@cyrius.com>
+To: submit@bugs.debian.org
+Subject: FTBFS with GCC 4.4: missing #include
+Message-ID: <20081108170653.GD27323@deprecation.cyrius.com>
+References: <20081108132249.5332A460DB@em64t.snowman.net>
+MIME-Version: 1.0
+Content-Type: text/plain; charset-ascii
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+In-Reply-To: <20081108132249.5332A460DB@em64t.snowman.net>
+User-Agent: Mutt/1.5.18 (2008-05-17)
+Delivered-To: submit@bugs.debian.org
+
+Package: passepartout
+Version: 0.7.0-1.1
+User: debian-gcc@lists.debian.org
+Usertags: ftbfs-gcc-4.4
+Tags: patch
+
+Your package fails to build with the upcoming GCC 4.4.  Version 4.4
+has not been released yet but I'm building with a snapshot in order
+to find errors and give people an advance warning.
+
+GCC 4.4 cleaned up some more C++ headers.  You always have to #include
+headers directly and cannot rely for things to be included indirectly.
+
+You can reproduce this problem with gcc-snapshot from unstable.
+
+> Automatic build of passepartout_0.7.0-1.1 on em64t by sbuild/amd64 0.53
+...
+> if x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I. -I../../src     -I/usr/include/libxml++-1.0 -I/usr/lib/libxml++-1.0/include -I/usr/include/libxml2   -D_REENTRANT -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0   -D_REENTRANT -I/usr/include/libgnomecanvasmm-2.6 -I/usr/lib/libgnomecanvasmm-2.6/include -I/usr/include/gtkmm-2.4 -I/usr/lib/gtkmm-2.4/include -I/usr/include/libgnomecanvas-2.0 -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include -I/usr/include/gdkmm-2.4 -I/usr/lib/gdkmm-2.4/include -I/usr/include/pangomm-1.4 -I/usr/include/atkmm-1.6 -I/usr/include/gtk-2.0 -I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/include/cairomm-1.0 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/pixman-1 -I/usr/include/atk-1.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0   -MT stringutil.o -MD -MP -MF ".deps/stringutil.Tpo" -c -o stringutil.o stringutil.cc; \
+> 	then mv -f ".deps/stringutil.Tpo" ".deps/stringutil.Po"; else rm -f ".deps/stringutil.Tpo"; exit 1; fi
+> In file included from stringutil.cc:4:
+> stringutil.h: In function 'C to(const std::string&)':
+> stringutil.h:25: error: 'EOF' was not declared in this scope
+> stringutil.cc: In function 'std::string to_roman(int)':
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> stringutil.cc:80: warning: deprecated conversion from string constant to 'char*'
+> make[4]: *** [stringutil.o] Error 1
+> make[4]: Leaving directory `/build/tbm/passepartout-0.7.0/src/util'
+
+--- src/util/stringutil.h~	2008-11-08 16:48:10.000000000 +0000
++++ src/util/stringutil.h	2008-11-08 16:48:25.000000000 +0000
+@@ -4,6 +4,7 @@
+ // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
+ ///
+ #include "typeinfo.h"
++#include <cstdio>
+ #include <string>
+ #include <sstream>
+ #include <stdexcept>
+--- src/util/warning.cc~	2008-11-08 16:48:33.000000000 +0000
++++ src/util/warning.cc	2008-11-08 16:48:43.000000000 +0000
+@@ -2,6 +2,7 @@
+ // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
+ ///
+ #include "warning.h"
++#include <cstdio>
+ 
+ class NullFdBuf : public std::streambuf {
+ public:
+--- src/util/filedescriptors.cc~	2008-11-08 16:49:15.000000000 +0000
++++ src/util/filedescriptors.cc	2008-11-08 16:49:23.000000000 +0000
+@@ -5,6 +5,7 @@
+ #include "filesys.h"
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <cstdio>
+ 
+ int
+ filedesc::move(int to, int from) {
+
+-- 
+Martin Michlmayr
+http://www.cyrius.com/
+
+
+
+
diff --git a/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch b/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch
new file mode 100644
index 000000000000..ac1b116fbdef
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.7.0-include-flags.patch
@@ -0,0 +1,140 @@
+diff -Nurd -x'*~' passepartout-0.7.0.orig/src/fonts/Makefile.am passepartout-0.7.0/src/fonts/Makefile.am
+--- passepartout-0.7.0.orig/src/fonts/Makefile.am	2007-06-13 07:05:06.000000000 -0400
++++ passepartout-0.7.0/src/fonts/Makefile.am	2007-08-07 19:11:04.000000000 -0400
+@@ -5,9 +5,9 @@
+ 
+ libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
+ 
+-libfonts_a_CXXFLAGS = -I$(top_srcdir)/src
++libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
+ 
+ # for Glib::ustring
+-libfonts_a_CXXFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
++libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
+ 
+ #libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
+\ No newline at end of file
+diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/Makefile.am passepartout-0.7.0/src/pptout/Makefile.am
+--- passepartout-0.7.0.orig/src/pptout/Makefile.am	2007-07-26 07:31:05.000000000 -0400
++++ passepartout-0.7.0/src/pptout/Makefile.am	2007-08-07 19:14:51.000000000 -0400
+@@ -32,10 +32,10 @@
+ 		$(BUILT_SOURCES) \
+ 		$(NULL)
+ 
+-passepartout_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
+-	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
++passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
+ 
+-passepartout_CXXFLAGS += -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
++passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
++	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
+ 
+ passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
+ 		$(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
+diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/document/Makefile.am passepartout-0.7.0/src/pptout/document/Makefile.am
+--- passepartout-0.7.0.orig/src/pptout/document/Makefile.am	2007-06-13 07:05:06.000000000 -0400
++++ passepartout-0.7.0/src/pptout/document/Makefile.am	2007-08-07 19:15:12.000000000 -0400
+@@ -10,6 +10,6 @@
+ 	textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc	\
+ 	loader.cc typesetterthread.cc
+ 
+-libdocument_a_CXXFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
++libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
+ 
+-libdocument_a_CXXFLAGS += -I$(top_srcdir)/src
++libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
+diff -Nurd -x'*~' passepartout-0.7.0.orig/src/pptout/widget/Makefile.am passepartout-0.7.0/src/pptout/widget/Makefile.am
+--- passepartout-0.7.0.orig/src/pptout/widget/Makefile.am	2007-06-14 06:17:20.000000000 -0400
++++ passepartout-0.7.0/src/pptout/widget/Makefile.am	2007-08-07 19:29:32.000000000 -0400
+@@ -8,6 +8,6 @@
+ 		dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc	\
+ 		usererror.cc programs.cc zoomer.cc
+ 
+-libwidget_a_CXXFLAGS = $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
++libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
+ 
+-libwidget_a_CXXFLAGS += -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
++libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
+diff -Nurd -x'*~' passepartout-0.7.0.orig/src/ps/Makefile.am passepartout-0.7.0/src/ps/Makefile.am
+--- passepartout-0.7.0.orig/src/ps/Makefile.am	2007-06-13 07:48:09.000000000 -0400
++++ passepartout-0.7.0/src/ps/Makefile.am	2007-08-07 19:26:30.000000000 -0400
+@@ -9,12 +9,12 @@
+ 
+ examinepdf_SOURCES = examinepdf.cc
+ 
+-# for Glib::ustring
+-libps_a_CXXFLAGS = $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
++libps_a_CPPFLAGS = -I$(top_srcdir)/src
+ 
+-libps_a_CXXFLAGS += -I$(top_srcdir)/src
++# for Glib::ustring
++libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
+ 
+-examinepdf_CXXFLAGS = $(libps_a_CXXFLAGS)
++examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
+ examinepdf_LDADD = $(GTKMM_LIBS) \
+ 	-L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
+ examinepdf_DEPENDENCIES = libps.a
+@@ -24,8 +24,8 @@
+ TESTS = runtest
+ check_PROGRAMS = runtest
+ runtest_SOURCES = test_glyphlist.cc
+-runtest_CXXFLAGS = -I$(top_srcdir)/src
+-runtest_CXXFLAGS += $(GTKMM_CFLAGS)
++runtest_CPPFLAGS = -I$(top_srcdir)/src
++runtest_CPPFLAGS += $(GTKMM_CFLAGS)
+ runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
+ runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
+ 		$(GTKMM_LIBS)
+diff -Nurd -x'*~' passepartout-0.7.0.orig/src/testbed/Makefile.am passepartout-0.7.0/src/testbed/Makefile.am
+--- passepartout-0.7.0.orig/src/testbed/Makefile.am	2007-06-13 07:05:07.000000000 -0400
++++ passepartout-0.7.0/src/testbed/Makefile.am	2007-08-07 19:17:57.000000000 -0400
+@@ -4,8 +4,8 @@
+ 
+ libppttest_a_SOURCES = testbed.cc
+ 
+-libppttest_a_CXXFLAGS = -I$(top_srcdir)/src
++libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
+ 
+ # Just because Glib::Exception is stupid and doesn't inherit the standard
+ # exception the testbed has to know about glib!
+-libppttest_a_CXXFLAGS += $(GTKMM_CFLAGS)
++libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
+diff -Nurd -x'*~' passepartout-0.7.0.orig/src/util/Makefile.am passepartout-0.7.0/src/util/Makefile.am
+--- passepartout-0.7.0.orig/src/util/Makefile.am	2007-06-14 06:12:42.000000000 -0400
++++ passepartout-0.7.0/src/util/Makefile.am	2007-08-07 19:18:50.000000000 -0400
+@@ -12,12 +12,12 @@
+ 	cmdline.cc xmlwrap.cc
+ 
+ # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
+-CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
++AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
+ 
+ TESTS =	runtest
+ check_PROGRAMS = runtest
+ runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
+ 	test_boundary.cc test_procio.cc test_cmdline.cc
+-runtest_CXXFLAGS = -I$(top_srcdir)/src
++runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
+ runtest_DEPENDENCIES = $(noinst_LIBRARIES)
+ runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
+diff -Nurd -x'*~' passepartout-0.7.0.orig/src/xml2ps/Makefile.am passepartout-0.7.0/src/xml2ps/Makefile.am
+--- passepartout-0.7.0.orig/src/xml2ps/Makefile.am	2007-06-22 12:07:26.000000000 -0400
++++ passepartout-0.7.0/src/xml2ps/Makefile.am	2007-08-07 19:36:26.000000000 -0400
+@@ -13,12 +13,12 @@
+ 
+ xml2ps_SOURCES = main.cc
+ 
+-libxml2ps_a_CXXFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
+-		$(GNOMECANVAS_CFLAGS)
++libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
+ 
+-libxml2ps_a_CXXFLAGS += -I$(top_srcdir)/src
++libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
++		$(GNOMECANVAS_CFLAGS)
+ 
+-xml2ps_CXXFLAGS = $(libxml2ps_a_CXXFLAGS)
++xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
+ 
+ xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
+ 	libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a 
diff --git a/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch b/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch
new file mode 100644
index 000000000000..418362c204e2
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.7.0-libtoolization.patch
@@ -0,0 +1,293 @@
+Index: trunk/src/ps/Makefile.am
+===================================================================
+--- trunk/src/ps/Makefile.am	(revision 1530)
++++ trunk/src/ps/Makefile.am	(working copy)
+@@ -1,31 +1,26 @@
+ bin_PROGRAMS = examinepdf
+-noinst_LIBRARIES = libps.a
++noinst_LTLIBRARIES = libps.la
+ 
+ dist_noinst_HEADERS = encode.h pdf.h unicode.h pfb2pfa.h misc.h wineps.h \
+ 		pdfparser.h type42.h
+ 
+-libps_a_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
++libps_la_SOURCES = encode.cc glyphs.cc pdf.cc unicode.cc pfb2pfa.cc misc.cc \
+ 		wineps.cc pdfparser.cc type42.cc
+ 
+ examinepdf_SOURCES = examinepdf.cc
+ 
+-libps_a_CPPFLAGS = -I$(top_srcdir)/src
++libps_la_LIBADD = ../fonts/libfonts.la
+ 
+ # for Glib::ustring
+-libps_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
++libps_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS)
++libps_la_LIBADD += $(GTKMM_LIBS)
+ 
+-examinepdf_CPPFLAGS = $(libps_a_CPPFLAGS)
+-examinepdf_LDADD = $(GTKMM_LIBS) \
+-	-L. -lps -L../fonts -lfonts -lps -L../util -lpptutil
+-examinepdf_DEPENDENCIES = libps.a
++examinepdf_CPPFLAGS = $(libps_la_CPPFLAGS)
++examinepdf_LDADD = libps.la
+ 
+-#libps_a_LIBADD = $(GTKMM_LIBS)
+-
+ TESTS = runtest
+ check_PROGRAMS = runtest
+ runtest_SOURCES = test_glyphlist.cc
+-runtest_CPPFLAGS = -I$(top_srcdir)/src
+-runtest_CPPFLAGS += $(GTKMM_CFLAGS)
+-runtest_DEPENDENCIES = ../util/libpptutil.a $(noinst_LIBRARIES)
+-runtest_LDADD = -L../testbed -lppttest -L. -lps -L../util -lpptutil \
++runtest_CPPFLAGS = $(GTKMM_CFLAGS)
++runtest_LDADD = ../testbed/libppttest.la libps.la ../util/libpptutil.la \
+ 		$(GTKMM_LIBS)
+Index: trunk/src/xml2ps/Makefile.am
+===================================================================
+--- trunk/src/xml2ps/Makefile.am	(revision 1530)
++++ trunk/src/xml2ps/Makefile.am	(working copy)
+@@ -1,28 +1,29 @@
+ bin_PROGRAMS = xml2ps
+ 
+-noinst_LIBRARIES = libxml2ps.a
++noinst_LTLIBRARIES = libxml2ps.la
+ 
+ dist_noinst_HEADERS = blockcontainer.hh boundaries.hh canvas.hh		\
+ 		line.hh paragraph.hh typesetter.hh pagedstream.hh	\
+ 		pdfcanvas.hh pscanvas.hh psstream.hh xly.hh xcanvas.hh
+ 
+-libxml2ps_a_SOURCES = paragraph.cc xly.cc typesetter.cc			\
++libxml2ps_la_SOURCES = paragraph.cc xly.cc typesetter.cc			\
+ 	  	blockcontainer.cc psstream.cc line.cc canvas.cc		\
+ 	  	pagedstream.cc pscanvas.cc boundaries.cc pdfcanvas.cc	\
+ 	  	xcanvas.cc
+ 
+ xml2ps_SOURCES = main.cc
+ 
+-libxml2ps_a_CPPFLAGS = -I$(top_srcdir)/src
+-
+-libxml2ps_a_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
++libxml2ps_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS)	\
+ 		$(GNOMECANVAS_CFLAGS)
+ 
+-xml2ps_CPPFLAGS = $(libxml2ps_a_CPPFLAGS)
++libxml2ps_la_LIBADD =../util/libpptutil.la ../fonts/libfonts.la ../ps/libps.la \
++		$(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
+ 
+-xml2ps_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)\
+-	libxml2ps.a ../fonts/libfonts.a ../ps/libps.a ../util/libpptutil.a 
++xml2ps_CPPFLAGS = $(libxml2ps_la_CPPFLAGS)
+ 
++xml2ps_LDADD = libxml2ps.la \
++		$(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
++
+ #install DTDs and XSLTs in $(datadir)/xml/passepartout/ (xmldir is defined in configure.ac)
+ dist_xml_DATA = xml2ps.dtd xhtml.xslt docbook.xslt
+ 
+Index: trunk/src/fonts/Makefile.am
+===================================================================
+--- trunk/src/fonts/Makefile.am	(revision 1530)
++++ trunk/src/fonts/Makefile.am	(working copy)
+@@ -1,13 +1,15 @@
+-noinst_LIBRARIES = libfonts.a
++noinst_LTLIBRARIES = libfonts.la
+ 
+ dist_noinst_HEADERS = fontinfo.hh fontmanager.hh fontmetrics.hh afm.hh	\
+ 		freetype.hh
+ 
+-libfonts_a_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
++libfonts_la_SOURCES = fontinfo.cc fontmanager.cc afm.cc freetype.cc
+ 
+-libfonts_a_CPPFLAGS = -I$(top_srcdir)/src
+-
+ # for Glib::ustring
+-libfonts_a_CPPFLAGS += $(GTKMM_CFLAGS) $(FREETYPE_CFLAGS)
++libfonts_la_CPPFLAGS = $(FREETYPE_CFLAGS) $(GTKMM_CFLAGS)
+ 
+-#libfonts_a_LIBADD = $(top_srcdir)/src/util/libpptutil.a
+\ No newline at end of file
++libfonts_la_LIBADD = ../util/libpptutil.la $(FREETYPE_LIBS) $(GTKMM_LIBS)
++
++# can't have explicit circular dependency, so rely on consumers
++# to link against them and us
++#libfonts_la_LIBADD += ../ps/libps.la
+Index: trunk/src/Makefile.am
+===================================================================
+--- trunk/src/Makefile.am	(revision 1530)
++++ trunk/src/Makefile.am	(working copy)
+@@ -1 +1 @@
+-SUBDIRS = testbed util fonts ps xml2ps pptout 
++SUBDIRS = util testbed fonts ps xml2ps pptout 
+Index: trunk/src/testbed/Makefile.am
+===================================================================
+--- trunk/src/testbed/Makefile.am	(revision 1530)
++++ trunk/src/testbed/Makefile.am	(working copy)
+@@ -1,11 +1,18 @@
+-noinst_LIBRARIES = libppttest.a
++noinst_LTLIBRARIES = libppttest.la
+ 
+ dist_noinst_HEADERS = testbed.hh
+ 
+-libppttest_a_SOURCES = testbed.cc
++libppttest_la_SOURCES = testbed.cc
+ 
+-libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
+-
+ # Just because Glib::Exception is stupid and doesn't inherit the standard
+ # exception the testbed has to know about glib!
+-libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS)
++libppttest_la_CPPFLAGS = $(GTKMM_CFLAGS)
++
++libppttest_la_LIBADD = ../util/libpptutil.la $(GTKMM_LIBS)
++
++TESTS =	runtest
++check_PROGRAMS = runtest
++runtest_SOURCES = ../util/test_stringutil.cc ../util/test_valuunit.cc ../util/test_matrix.cc \
++	../util/test_boundary.cc ../util/test_procio.cc ../util/test_cmdline.cc
++runtest_CPPFLAGS = $(GTKMM_CFLAGS)
++runtest_LDADD = libppttest.la ../util/libpptutil.la $(GTKMM_LIBS)
+Index: trunk/src/pptout/widget/Makefile.am
+===================================================================
+--- trunk/src/pptout/widget/Makefile.am	(revision 1530)
++++ trunk/src/pptout/widget/Makefile.am	(working copy)
+@@ -1,13 +1,13 @@
+-noinst_LIBRARIES = libwidget.a
++noinst_LTLIBRARIES = libwidget.la
+ 
+ dist_noinst_HEADERS = spinner.h filesel.h imagefilesel.h dialogwrap.h	\
+ 		subpanel.h wmisc.h errordialog.h usererror.h programs.h \
+ 		zoomer.h
+ 
+-libwidget_a_SOURCES = spinner.cc filesel.cc imagefilesel.cc		\
++libwidget_la_SOURCES = spinner.cc filesel.cc imagefilesel.cc		\
+ 		dialogwrap.cc subpanel.cc wmisc.cc errordialog.cc	\
+ 		usererror.cc programs.cc zoomer.cc
+ 
+-libwidget_a_CPPFLAGS = -I$(top_srcdir)/src -D'DOCDIR=$(docdir)'
+-
+-libwidget_a_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
++libwidget_la_CPPFLAGS = -DDOCDIR=\"$(docdir)\"
++libwidget_la_CPPFLAGS += $(GTKMM_CFLAGS) $(GNOMEVFS_CFLAGS) $(GNOME_CFLAGS)
++libwidget_la_LIBADD = ../../util/libpptutil.la $(GTKMM_LDFLAGS) $(GNOMEVFS_LDFLAGS) $(GNOME_LDFLAGS)
+Index: trunk/src/pptout/document/Makefile.am
+===================================================================
+--- trunk/src/pptout/document/Makefile.am	(revision 1530)
++++ trunk/src/pptout/document/Makefile.am	(working copy)
+@@ -1,15 +1,18 @@
+-noinst_LIBRARIES = libdocument.a
++noinst_LTLIBRARIES = libdocument.la
+ 
+ dist_noinst_HEADERS = basicframe.h cachedframe.h document.h group.h	\
+ 	imageframe.h page.h pagent.h rasterframe.h textframe.h		\
+ 	textstream.h fileerrors.h paper_sizes.h getxsltparams.h		\
+ 	loader.h filecontext.h typesetterthread.h
+ 
+-libdocument_a_SOURCES = basicframe.cc cachedframe.cc document.cc	\
++libdocument_la_SOURCES = basicframe.cc cachedframe.cc document.cc	\
+ 	group.cc imageframe.cc page.cc pagent.cc rasterframe.cc		\
+ 	textframe.cc textstream.cc paper_sizes.cc getxsltparams.cc	\
+ 	loader.cc typesetterthread.cc
+ 
+-libdocument_a_CPPFLAGS = -I$(top_srcdir)/src
++libdocument_la_CPPFLAGS = $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
+ 
+-libdocument_a_CPPFLAGS += $(GTKMM_CFLAGS) $(XMLPP_CFLAGS)
++# can't get complete symbol resolution here...rasterframe.cc uses
++# config() from ../passepartout-config.o but subdirs build before
++# parent so cannot easily get it
++libdocument_la_LIBADD = ../../util/libpptutil.la ../../ps/libps.la ../../xml2ps/libxml2ps.la ../widget/libwidget.la $(GTKMM_LIBS) $(XMLPP_LIBS)
+Index: trunk/src/pptout/Makefile.am
+===================================================================
+--- trunk/src/pptout/Makefile.am	(revision 1530)
++++ trunk/src/pptout/Makefile.am	(working copy)
+@@ -1,4 +1,4 @@
+-SUBDIRS = document widget icons
++SUBDIRS = widget document icons
+ 
+ EXTRA_DIST = NOTES
+ 
+@@ -32,19 +32,19 @@
+ 		$(BUILT_SOURCES) \
+ 		$(NULL)
+ 
+-passepartout_CPPFLAGS = -I$(top_srcdir)/src -D'XMLPATH=$(xmldir)'
++passepartout_CPPFLAGS = -DXMLPATH=\"$(xmldir)\"
+ 
+ passepartout_CPPFLAGS += $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS) \
+ 	$(GNOME_CFLAGS) $(GNOMEVFS_CFLAGS)
+ 
+-passepartout_LDADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
+-		$(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
++pptpartlibs= document/libdocument.la ../xml2ps/libxml2ps.la	\
++	../fonts/libfonts.la ../ps/libps.la			\
++	../util/libpptutil.la widget/libwidget.la
+ 
+-pptpartlibs= document/libdocument.a ../xml2ps/libxml2ps.a	\
+-	../fonts/libfonts.a ../ps/libps.a			\
+-	../util/libpptutil.a widget/libwidget.a
++passepartout_LDADD = $(pptpartlibs)
+ 
+-passepartout_LDADD += $(pptpartlibs)
++passepartout_LDADD += $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS) \
++		$(GTHREAD_LIBS) $(GNOME_LIBS) $(GNOMEVFS_LIBS)
+ 
+ # Extra dependencies for builddate, so it is rebuilt every time anything else
+ # is rebuilt
+Index: trunk/src/util/Makefile.am
+===================================================================
+--- trunk/src/util/Makefile.am	(revision 1530)
++++ trunk/src/util/Makefile.am	(working copy)
+@@ -1,23 +1,17 @@
+-noinst_LIBRARIES = libpptutil.a
++noinst_LTLIBRARIES = libpptutil.la
+ 
+ dist_noinst_HEADERS = stringutil.h filesys.h warning.h os.h configfile.h \
+ 	valueunit.h units.h refcount.h matrix.h boundary.h		 \
+ 	rectboundary.h typeinfo.h barrier.h processman.h tempfile.h	 \
+ 	filewatcher.h vector.h filedescriptors.h cmdline.h xmlwrap.h
+ 
+-libpptutil_a_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
++libpptutil_la_SOURCES = stringutil.cc filesys.cc warning.cc os.cc \
+ 	configfile.cc \
+ 	matrix.cc boundary.cc rectboundary.cc typeinfo.cc barrier.cc \
+ 	processman.cc tempfile.cc filewatcher.cc filedescriptors.cc 	\
+ 	cmdline.cc xmlwrap.cc
+ 
+ # gtkmm and gnomecanvas flags is needed just to get RefPtr and AffineTrans.
+-AM_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
++libpptutil_la_CPPFLAGS = $(XMLPP_CFLAGS) $(GTKMM_CFLAGS) $(GNOMECANVAS_CFLAGS)
+ 
+-TESTS =	runtest
+-check_PROGRAMS = runtest
+-runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
+-	test_boundary.cc test_procio.cc test_cmdline.cc
+-runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
+-runtest_DEPENDENCIES = $(noinst_LIBRARIES)
+-runtest_LDADD = -L../testbed -lppttest -L. -lpptutil $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
++libpptutil_la_LIBADD = $(XMLPP_LIBS) $(GTKMM_LIBS) $(GNOMECANVAS_LIBS)
+Index: trunk/configure.ac
+===================================================================
+--- trunk/configure.ac	(revision 1530)
++++ trunk/configure.ac	(working copy)
+@@ -9,14 +9,16 @@
+ AM_CONFIG_HEADER(src/defines.h)
+ # AC_CONFIG_HEADER(src/defines.h)
+ 
+-# Define global compiler flags:
+-MY_CXXFLAGS="-Wall"
+-CXXFLAGS="$CXXFLAGS $MY_CXXFLAGS"
++# We're just a few binaries...not worth doing shared by default?
++AC_DISABLE_SHARED
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ 
++# Define global compiler flags:
++CXXFLAGS="$CXXFLAGS -Wall"
++
+ # AC_APPLY_RPATH(LIBS)
+ # --------------------
+ # Add an -rpath linker option for each -L path in LIBS
diff --git a/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch b/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch
new file mode 100644
index 000000000000..08151e6fe49f
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.7.0-libxmlpp-2.6-depend.patch
@@ -0,0 +1,11 @@
+--- trunk/configure.ac	2007/08/08 17:47:27	1527
++++ trunk/configure.ac	2007/08/09 14:55:36	1529
+@@ -30,7 +30,7 @@
+ # check for libxml++ 
+ AC_SUBST([XMLPP_LIBS])
+ AC_SUBST([XMLPP_CFLAGS])
+-PKG_CHECK_MODULES([XMLPP], libxml++-1.0 >= 1.0)
++PKG_CHECK_MODULES([XMLPP], libxml++-2.6 >= 1.0)
+ AC_APPLY_RPATH([XMLPP_LIBS])
+ 
+ AC_SUBST([GTKMM_LIBS])
diff --git a/app-office/passepartout/files/passepartout-0.7.0-safer.patch b/app-office/passepartout/files/passepartout-0.7.0-safer.patch
new file mode 100644
index 000000000000..4d0e48169c0e
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.7.0-safer.patch
@@ -0,0 +1,13 @@
+Index: src/pptout/postscriptviewent.cc
+===================================================================
+--- src/pptout/postscriptviewent.cc	(revision 1517)
++++ src/pptout/postscriptviewent.cc	(arbetskopia)
+@@ -143,7 +143,7 @@
+     
+     std::ostringstream tmp;
+     tmp << psinterpreter //assuming it is ghostscript
+-	<< " -q -dSAFER -dNOPAUSE -dBATCH"
++	<< " -q -dSAFE -dNOPAUSE -dBATCH"
+ 	<< " -sDEVICE=" << preferredDeviceName();
+ 
+     // gs doesn't use fontconfig, so give font paths as parameters
diff --git a/app-office/passepartout/metadata.xml b/app-office/passepartout/metadata.xml
index e96086477315..16a47c1c6b76 100644
--- a/app-office/passepartout/metadata.xml
+++ b/app-office/passepartout/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sgml</herd>
+<herd>sgml</herd>
+<maintainer>
+	<email>loki_val@gentoo.org</email>
+	<name>Peter Alfredsen</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/passepartout/passepartout-0.6_p1.ebuild b/app-office/passepartout/passepartout-0.6_p1.ebuild
index a101087ee6cb..14cd83228ec8 100644
--- a/app-office/passepartout/passepartout-0.6_p1.ebuild
+++ b/app-office/passepartout/passepartout-0.6_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.6_p1.ebuild,v 1.3 2007/10/05 13:36:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.6_p1.ebuild,v 1.4 2008/12/20 01:18:48 loki_val Exp $
 
 inherit eutils gnome2
 
diff --git a/app-office/passepartout/passepartout-0.7.0.ebuild b/app-office/passepartout/passepartout-0.7.0.ebuild
new file mode 100644
index 000000000000..39218b6da870
--- /dev/null
+++ b/app-office/passepartout/passepartout-0.7.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/passepartout-0.7.0.ebuild,v 1.1 2008/12/20 01:18:48 loki_val Exp $
+
+EAPI=2
+
+inherit base eutils gnome2 libtool  autotools
+
+DESCRIPTION="A DTP application for the X Window System"
+HOMEPAGE="http://www.stacken.kth.se/project/pptout/"
+
+IUSE="gnome"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+COMMON_DEPS="dev-cpp/libxmlpp:2.6
+	>=dev-libs/libxml2-2
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	media-libs/freetype:2
+	virtual/fam
+	gnome? (
+			gnome-base/libgnome
+			gnome-base/gnome-vfs
+	)
+	"
+
+RDEPEND="${COMMON_DEPS}
+	dev-libs/libxslt
+	virtual/ghostscript"
+
+DEPEND="${COMMON_DEPS}
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS BUGS NEWS README"
+
+# GCC-4.2 patch:
+# http://bugzilla.gnome.org/477017
+# GCC-4.3 patch:
+# Snatched from Debian
+# http://bugzilla.gnome.org/565131
+# include-flags:
+# http://bugzilla.gnome.org/464517
+# libtoolization:
+# http://bugzilla.gnome.org/464567
+# libxml-2.6:
+# http://bugzilla.gnome.org/449596
+
+# The include and libtoolization patches are needed for
+# forced as-needed to work.
+
+PATCHES=(
+		"${FILESDIR}/${P}-gcc42.patch"
+		"${FILESDIR}/${P}-gcc43.patch"
+		"${FILESDIR}/${P}-gcc44.patch"
+		"${FILESDIR}/${P}-include-flags.patch"
+		"${FILESDIR}/${P}-libtoolization.patch"
+		"${FILESDIR}/${P}-safer.patch"
+		"${FILESDIR}/${P}-libxmlpp-2.6-depend.patch"
+	)
+
+pkg_setup() {
+	G2CONF="$(use_with gnome)"
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	gnome2_omf_fix
+	base_src_util autopatch
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	gnome2_src_configure
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	gnome2_src_install
+	make_desktop_entry "/usr/bin/passepartout" "Passepartout DTP" "" "GNOME;Application;Graphics" ""
+}