Add patch to fix compilation with gcc-4; bug #124818

(Portage version: 2.1_pre4-r1)

5 files changed, 68 insertions, 10 deletions

diff --git a/app-text/mpage/ChangeLog b/app-text/mpage/ChangeLog
index 8fb21e1c2250..8f2906926cd8 100644
--- a/app-text/mpage/ChangeLog
+++ b/app-text/mpage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/mpage
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mpage/ChangeLog,v 1.17 2005/11/12 14:06:31 vanquirius Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/mpage/ChangeLog,v 1.18 2006/03/17 07:49:14 halcy0n Exp $
+
+  17 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/mpage-2.5.4-gcc4.patch, mpage-2.5.3.ebuild, mpage-2.5.4.ebuild:
+  Add patch to fix compilation with gcc-4; bug #124818
 
 *mpage-2.5.4 (12 Nov 2005)
 
diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest
index 44a23930df66..c75944831715 100644
--- a/app-text/mpage/Manifest
+++ b/app-text/mpage/Manifest
@@ -1,6 +1,21 @@
 MD5 69336abd6d3c6cdd992e60a3745e42f3 ChangeLog 1952
+RMD160 9a004eee90e7e877349ae2aff2f6b36a508ffecf ChangeLog 1952
+SHA256 d90f2bd72643f967c0fcb0ea8d0a0067d99413b8f583923deca6a535b57aa834 ChangeLog 1952
 MD5 3f1b883c1256eb756672bb6321fccd0b files/digest-mpage-2.5.3 59
+RMD160 00b6e86f50e766a1d52749913d11352ba72eacb1 files/digest-mpage-2.5.3 59
+SHA256 12775678beb936bbe51c19054f477fdd5ccae76d74ba8a581e4050a6f35f6ce6 files/digest-mpage-2.5.3 59
 MD5 c47eda3d53e5880093da6bb16cf780f2 files/digest-mpage-2.5.4 59
+RMD160 a3c924b44a8a290245a59c1852aed68c8594cb84 files/digest-mpage-2.5.4 59
+SHA256 f41c933c0e8dffeadfc15d79a51840c3c3aa11bf3fc467d3a0f092dc3bb8ea1b files/digest-mpage-2.5.4 59
+MD5 3c70e796b79e0495d63d7dc96d384212 files/mpage-2.5.4-gcc4.patch 836
+RMD160 a45ce0c152728451104aab6e906a3e3d569106d5 files/mpage-2.5.4-gcc4.patch 836
+SHA256 d6c80fc4ca9b1b1c165a0fcbf190dea499f5439dda91ca7f4584ef1c1c48b91f files/mpage-2.5.4-gcc4.patch 836
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
+RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
+SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 metadata.xml 236
 MD5 a5ab8e65eec85a1e17eeb2cf24aa0732 mpage-2.5.3.ebuild 755
-MD5 aac44ed573aac83862e1a26c58000e21 mpage-2.5.4.ebuild 763
+RMD160 77c4ac0bd5683958f7739a365aeebdb23f465e8c mpage-2.5.3.ebuild 755
+SHA256 b356e8e01eb923a53962a25e18e83fe2eccf52887593e6048b197e85b9b8d8ca mpage-2.5.3.ebuild 755
+MD5 e3fadabf2689f411a351082b27306ec3 mpage-2.5.4.ebuild 825
+RMD160 cdbd34198c215515a5f7486cc0dc9aa4e6107b0a mpage-2.5.4.ebuild 825
+SHA256 39b1bef0bb877f8be36d833c2b6dd035821ebf5607ad6a446e2eabc4165650f4 mpage-2.5.4.ebuild 825
diff --git a/app-text/mpage/files/mpage-2.5.4-gcc4.patch b/app-text/mpage/files/mpage-2.5.4-gcc4.patch
new file mode 100644
index 000000000000..6e0cad40a60b
--- /dev/null
+++ b/app-text/mpage/files/mpage-2.5.4-gcc4.patch
@@ -0,0 +1,36 @@
+--- mpage-2.5.4/mpage.h.gcc4	2005-02-17 16:56:35.385185734 +0000
++++ mpage-2.5.4/mpage.h	2005-02-17 16:57:20.440559802 +0000
+@@ -172,6 +172,16 @@
+ extern int ps_width;	/* number of points in the X direction (8.5 inches) */
+ extern int ps_height;	/* number of points in the Y direction (11 inches) */
+ extern char * media;	/* name of output page media */
++
++/*
++ * Structure to describe a physical piece of paper, e.g. A4 or Letter
++ */
++struct page_desc {
++    char *media;
++    int width;
++    int height;
++};
++
+ extern struct page_desc paper[];
+ 
+ /*
+@@ -213,16 +223,6 @@
+ };
+ 
+ 
+-/*
+- * Structure to describe a physical piece of paper, e.g. A4 or Letter
+- */
+-struct page_desc {
+-    char *media;
+-    int width;
+-    int height;
+-};
+-    
+-
+ /* array of sheets where pages are ordered for coli ??? */
+ extern struct sheet coli[];
+ 
diff --git a/app-text/mpage/mpage-2.5.3.ebuild b/app-text/mpage/mpage-2.5.3.ebuild
index 5e9747a10ac4..a711cd4dec75 100644
--- a/app-text/mpage/mpage-2.5.3.ebuild
+++ b/app-text/mpage/mpage-2.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mpage/mpage-2.5.3.ebuild,v 1.9 2005/05/31 22:45:26 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mpage/mpage-2.5.3.ebuild,v 1.10 2006/03/17 07:49:14 halcy0n Exp $
 
 DESCRIPTION="Many to one page printing utility"
 HOMEPAGE="http://www.mesa.nl/"
@@ -11,8 +11,6 @@ LICENSE="freedist"
 SLOT="0"
 IUSE=""
 
-DEPEND="virtual/libc"
-
 src_compile() {
 	emake \
 		CFLAGS="$CFLAGS \$(DEFS)" \
diff --git a/app-text/mpage/mpage-2.5.4.ebuild b/app-text/mpage/mpage-2.5.4.ebuild
index f5b34d4fd443..c18779f8a297 100644
--- a/app-text/mpage/mpage-2.5.4.ebuild
+++ b/app-text/mpage/mpage-2.5.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mpage/mpage-2.5.4.ebuild,v 1.1 2005/11/12 14:06:31 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mpage/mpage-2.5.4.ebuild,v 1.2 2006/03/17 07:49:14 halcy0n Exp $
+
+inherit eutils
 
 DESCRIPTION="Many to one page printing utility"
 HOMEPAGE="http://www.mesa.nl/"
@@ -11,8 +13,11 @@ LICENSE="freedist"
 SLOT="0"
 IUSE=""
 
-DEPEND="virtual/libc"
+src_unpack() {
+	unpack ${A}
 
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+}
 src_compile() {
 	emake \
 		CFLAGS="$CFLAGS \$(DEFS)" \