0.6_p1 includes the latest patch released upstream to fix compilation problems.

Package-Manager: portage-2.1.2.2

5 files changed, 126 insertions, 5 deletions

diff --git a/app-office/passepartout/ChangeLog b/app-office/passepartout/ChangeLog
index 823875c48a93..ff491137b2aa 100644
--- a/app-office/passepartout/ChangeLog
+++ b/app-office/passepartout/ChangeLog
@@ -1,6 +1,14 @@
 # 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.5 2007/03/12 21:32:53 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/passepartout/ChangeLog,v 1.6 2007/03/22 00:48:06 leonardop Exp $
+
+*passepartout-0.6_p1 (22 Mar 2007)
+
+  22 Mar 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/passepartout-0.6-extra_qual.patch, +passepartout-0.6_p1.ebuild:
+  New version including the latest patch released upstream for version 0.6.
+  Updated dependencies. Removed unnecessary or non-existant documents from
+  DOCS. Added extra patch to fix compilations with GCC 4.1.
 
   12 Mar 2007; Leonardo Boshell <leonardop@gentoo.org> metadata.xml:
   Replacing text-markup herd with the new sgml herd.
diff --git a/app-office/passepartout/Manifest b/app-office/passepartout/Manifest
index 2f6a2e0d900c..4e122b198ce9 100644
--- a/app-office/passepartout/Manifest
+++ b/app-office/passepartout/Manifest
@@ -1,4 +1,9 @@
+AUX passepartout-0.6-extra_qual.patch 2052 RMD160 e31ad61f8af148c645c543059555d7575a23ba7d SHA1 aeaf90a0b31739124d8466332c21fb5258aa0a6c SHA256 04a195e970439e7dffbb29b83ccd454d0b4939144d99417a967a2782d2be4c27
+MD5 6f7819524130f9dc67b581457c12c069 files/passepartout-0.6-extra_qual.patch 2052
+RMD160 e31ad61f8af148c645c543059555d7575a23ba7d files/passepartout-0.6-extra_qual.patch 2052
+SHA256 04a195e970439e7dffbb29b83ccd454d0b4939144d99417a967a2782d2be4c27 files/passepartout-0.6-extra_qual.patch 2052
 DIST passepartout-0.5.tar.bz2 311964 RMD160 c14eeaf115ff561b467eddc72141c9525673f6a3 SHA1 2c6261d9c8d9f1d92a90f153a86ad620499fda73 SHA256 3d5f88fe574e2f97484e78c2536ad45ab74dba9f6bcf2ddd2252b72078909604
+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.5.ebuild 688 RMD160 72acb6acfcb71f76021c9c42de5ddb5f430ea2fe SHA1 993573eb5713759a277302c05026262e17e6398d SHA256 e2244197f67efbb6a85a0bc67872ad599c1b732397c1e05a27aedfd2a5ae352a
 MD5 bbd870cdb771f25e028f0882dae45e1c passepartout-0.5.ebuild 688
@@ -8,10 +13,14 @@ EBUILD passepartout-0.6.ebuild 689 RMD160 3bdccbcc5fb16a18c8b401ad04a88a71c77393
 MD5 f1fa3a2e3a6ce22a84beaf710d94c386 passepartout-0.6.ebuild 689
 RMD160 3bdccbcc5fb16a18c8b401ad04a88a71c7739350 passepartout-0.6.ebuild 689
 SHA256 27e4131b914cd248492cf3a92295d5c30fd86de39593dae47609ebcf3da022c5 passepartout-0.6.ebuild 689
-MISC ChangeLog 812 RMD160 30411016423c2ca6a0a9e4e6520400e8c8a8afd2 SHA1 d1f9df033e7c55193e8dd7a8ce105a9eb7d39f9e SHA256 b478162f608f603530119cba5364f3a582591481ee286724cd2240aadec25f27
-MD5 261928e4b6efa5be6895c9f58c080d6e ChangeLog 812
-RMD160 30411016423c2ca6a0a9e4e6520400e8c8a8afd2 ChangeLog 812
-SHA256 b478162f608f603530119cba5364f3a582591481ee286724cd2240aadec25f27 ChangeLog 812
+EBUILD passepartout-0.6_p1.ebuild 1135 RMD160 03a034e2629c520b43a7a8022c634576f4cc138f SHA1 1b993492369873c60d806e6e16f17ccfe41bfb99 SHA256 67885c922d587e6ad71cf24969a6b39d9be2972636c8de6d7ee3144eb85b7c80
+MD5 69b14799ea8df936b0a3bc9f56922237 passepartout-0.6_p1.ebuild 1135
+RMD160 03a034e2629c520b43a7a8022c634576f4cc138f passepartout-0.6_p1.ebuild 1135
+SHA256 67885c922d587e6ad71cf24969a6b39d9be2972636c8de6d7ee3144eb85b7c80 passepartout-0.6_p1.ebuild 1135
+MISC ChangeLog 1188 RMD160 41652e31c328982294b79ed6a34cd6f7d8dbb8da SHA1 3d65ee61c4d7c787b566b17cd0113cd4a3d19f06 SHA256 05a964833ad1922ea350c07cf812d1a1079ea5fc277accc716fb037b7815f27f
+MD5 f5bdbea7419889a94f4f861578b9f139 ChangeLog 1188
+RMD160 41652e31c328982294b79ed6a34cd6f7d8dbb8da ChangeLog 1188
+SHA256 05a964833ad1922ea350c07cf812d1a1079ea5fc277accc716fb037b7815f27f ChangeLog 1188
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
 MD5 f6f50979d39d8d194c09b8f7833219aa metadata.xml 159
 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 metadata.xml 159
@@ -22,3 +31,6 @@ SHA256 bb5d799cf063734f957e8d993e8f654d14ba5c22d31172a9658187c799963e6b files/di
 MD5 eb49f1915c99829b64ebb0d48325d036 files/digest-passepartout-0.6 253
 RMD160 8fd40f9f3c15faf66ba7ea2e8ebd2594cb71ee7f files/digest-passepartout-0.6 253
 SHA256 39f8cd3457d22036402df236a35d6c14d4b0f8f0115c1eff18b487c03aeea78c files/digest-passepartout-0.6 253
+MD5 3334a88f147fdc3de384b434a29589b1 files/digest-passepartout-0.6_p1 521
+RMD160 eca211e2fbbef5b2beca824030b55e48dae0abc5 files/digest-passepartout-0.6_p1 521
+SHA256 b3ee741fa983857db8088b6b5292f7e67a6a9aa01047e740277988db457c5c88 files/digest-passepartout-0.6_p1 521
diff --git a/app-office/passepartout/files/digest-passepartout-0.6_p1 b/app-office/passepartout/files/digest-passepartout-0.6_p1
new file mode 100644
index 000000000000..799bf4d0a068
--- /dev/null
+++ b/app-office/passepartout/files/digest-passepartout-0.6_p1
@@ -0,0 +1,6 @@
+MD5 a2c591608d11ff9e1d36c58898ae8b51 passepartout-0.6-patch1.patch 714203
+RMD160 ac202bd308dda0d62824be626287565d86dcf838 passepartout-0.6-patch1.patch 714203
+SHA256 b5216c755400128fc77dd3948c530bcdec0a987ba9a651bf0a39faa44ec57ca5 passepartout-0.6-patch1.patch 714203
+MD5 5d35d32dce802a627e48531207db62ce passepartout-0.6.tar.bz2 346041
+RMD160 f89c20d62f16e13bbef4eb8d066f6d1d5be0fbaf passepartout-0.6.tar.bz2 346041
+SHA256 5e95c4a35c4762a8a06429303b727f2dd0e250bd55a2fe087639b366723f815e passepartout-0.6.tar.bz2 346041
diff --git a/app-office/passepartout/files/passepartout-0.6-extra_qual.patch b/app-office/passepartout/files/passepartout-0.6-extra_qual.patch
new file mode 100644
index 000000000000..a9d33929c1b0
--- /dev/null
+++ b/app-office/passepartout/files/passepartout-0.6-extra_qual.patch
@@ -0,0 +1,45 @@
+diff -NurdpB passepartout-0.6/src/pptout/document/group.h passepartout-0.6-patched/src/pptout/document/group.h
+--- passepartout-0.6/src/pptout/document/group.h	2004-10-02 16:18:45.000000000 -0500
++++ passepartout-0.6-patched/src/pptout/document/group.h	2007-03-21 19:00:13.000000000 -0500
+@@ -30,7 +30,7 @@ public:
+   void set_flow_around(bool);
+   bool get_flow_around() const;
+   Boundary get_obstacle_boundary() const;
+-  BoundaryVect Group::obstacle_list() const;
++  BoundaryVect obstacle_list() const;
+   
+   void add(Pagent* obj);
+   Pagent* ungroup(Pagent* obj);
+@@ -55,7 +55,7 @@ public:
+   /** Raised on direct changes to the group (i.e. new / ungrouped member) */
+   SigC::Signal1<void, Pagent*> group_changed_signal; 
+ private:
+-  Boundary Group::get_untransformed_box() const;
++  Boundary get_untransformed_box() const;
+   
+   ChildVec childs;
+ };
+diff -NurdpB passepartout-0.6/src/pptout/propertiesdialog.h passepartout-0.6-patched/src/pptout/propertiesdialog.h
+--- passepartout-0.6/src/pptout/propertiesdialog.h	2004-04-16 14:03:56.000000000 -0500
++++ passepartout-0.6-patched/src/pptout/propertiesdialog.h	2007-03-21 19:18:26.000000000 -0500
+@@ -39,7 +39,7 @@ private:
+   // no destructor
+   ~PropertiesDialog();
+ 
+-  void PropertiesDialog::show_page_contents(GtkNotebookPage*, guint index);
++  void show_page_contents(GtkNotebookPage*, guint index);
+ 
+   Gtk::Notebook book;
+   std::vector<PropBase*> pages;
+diff -NurdpB passepartout-0.6/src/xml2ps/canvas.hh passepartout-0.6-patched/src/xml2ps/canvas.hh
+--- passepartout-0.6/src/xml2ps/canvas.hh	2004-07-21 17:00:34.000000000 -0500
++++ passepartout-0.6-patched/src/xml2ps/canvas.hh	2007-03-21 18:47:12.000000000 -0500
+@@ -52,7 +52,7 @@ namespace xml2ps {
+     HBox hbox(bool span, float margin_left, float margin_right, 
+ 	      float ascender, float descender);
+     
+-    virtual void xml2ps::Canvas::addRelObstacle
++    virtual void addRelObstacle
+     (const float left, const float bottom, const float right, const float top);
+     
+     // Check where the current column starts.
diff --git a/app-office/passepartout/passepartout-0.6_p1.ebuild b/app-office/passepartout/passepartout-0.6_p1.ebuild
new file mode 100644
index 000000000000..388357e513ea
--- /dev/null
+++ b/app-office/passepartout/passepartout-0.6_p1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 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.1 2007/03/22 00:48:06 leonardop Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="A DTP application for the X Window System"
+HOMEPAGE="http://www.stacken.kth.se/project/pptout/"
+
+MY_PV="0.6"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+URL_BASE="http://www.stacken.kth.se/project/pptout/files/"
+SRC_URI="${URL_BASE}${MY_P}.tar.bz2
+	${URL_BASE}${MY_P}-patch1.patch"
+
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+COMMON_DEPS="=dev-cpp/libxmlpp-1*
+	>=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"
+
+RDEPEND="${COMMON_DEPS}
+	dev-libs/libxslt
+	virtual/ghostscript"
+
+DEPEND="${COMMON_DEPS}
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS BUGS NEWS README"
+
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	cd "${S}"
+
+	epatch "${DISTDIR}/${MY_P}-patch1.patch"
+
+	# Fix compilation problems with gcc 4.1
+	epatch "${FILESDIR}/${MY_P}-extra_qual.patch"
+}