added patch to fix compilation with gcc3.4, also added ~amd64 to KEYWORDS. fixed #60753

Package-Manager: portage-2.0.51.19

5 files changed, 66 insertions, 10 deletions

diff --git a/media-video/cinepaint/ChangeLog b/media-video/cinepaint/ChangeLog
index f990aecfa6ee..433a5097d350 100644
--- a/media-video/cinepaint/ChangeLog
+++ b/media-video/cinepaint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinepaint
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.4 2004/08/12 20:26:13 chriswhite Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.5 2005/03/13 20:34:59 luckyduck Exp $
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/cinepaint-0.18.3-gcc34.patch, cinepaint-0.18.3.ebuild:
+  added patch to fix compilation with gcc3.4, also added ~amd64 to KEYWORDS.
+  fixed #60753
 
   13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml:
   Added missing metadata.xml.  Taking over as maintainer.
diff --git a/media-video/cinepaint/Manifest b/media-video/cinepaint/Manifest
index 7a6ad9e40d6b..a1234a56da29 100644
--- a/media-video/cinepaint/Manifest
+++ b/media-video/cinepaint/Manifest
@@ -1,6 +1,17 @@
-MD5 780189c0f68fb614342f4737d019f8c3 cinepaint-0.18.ebuild 734
-MD5 51c74a677b47f27e6c0d77b5c4e09ce1 cinepaint-0.18.3.ebuild 896
-MD5 07da3dab78cc5f0fc22c13356fbdcadc ChangeLog 868
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1ee52edbe3665f912c2735fc43aa7448 cinepaint-0.18.ebuild 735
+MD5 0e37bb9998012e8213845f1848f92d7f cinepaint-0.18.3.ebuild 985
+MD5 8e838cbf47dd689052b484d0d9dba67b ChangeLog 1076
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
+MD5 732e3bb45a2f1945a5c3217a87c53a50 files/cinepaint-0.18.3-gcc34.patch 1476
 MD5 18b54df1c9a511a226297daf13dccaec files/digest-cinepaint-0.18 67
 MD5 0f99a4352d9c27f40fe6b07cea9d759d files/digest-cinepaint-0.18.3 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCNKP506ebR+OMO78RAkuJAJ92jXwrv1reuBK2Bc/qTgcZx42G5ACfZ+Ee
+EIDQdkRWqMYw3+VYC4useoo=
+=UNdv
+-----END PGP SIGNATURE-----
diff --git a/media-video/cinepaint/cinepaint-0.18.3.ebuild b/media-video/cinepaint/cinepaint-0.18.3.ebuild
index 12e1c48d9cc5..80f6463616e2 100644
--- a/media-video/cinepaint/cinepaint-0.18.3.ebuild
+++ b/media-video/cinepaint/cinepaint-0.18.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.18.3.ebuild,v 1.1 2004/08/03 09:07:09 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.18.3.ebuild,v 1.2 2005/03/13 20:34:59 luckyduck Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="motion picture editing tool used for painting and retouching of mov
 SRC_URI="mirror://sourceforge/cinepaint/${PN}-${MY_PV}.tar.gz"
 HOMEPAGE="http://cinepaint.sourceforge.net/"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 LICENSE="GPL-2"
 IUSE="png zlib"
 
@@ -21,6 +21,13 @@ DEPEND="=x11-libs/gtk+-1*
 	media-libs/tiff
 	media-libs/jpeg"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 src_compile(){
 	econf --with-openexr-prefix=/usr || die "econf failed"
 	emake || die "emake failed"
diff --git a/media-video/cinepaint/cinepaint-0.18.ebuild b/media-video/cinepaint/cinepaint-0.18.ebuild
index 2046076309af..2c6fc2386450 100644
--- a/media-video/cinepaint/cinepaint-0.18.ebuild
+++ b/media-video/cinepaint/cinepaint-0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.18.ebuild,v 1.2 2004/06/25 00:38:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.18.ebuild,v 1.3 2005/03/13 20:34:59 luckyduck Exp $
 
 DESCRIPTION="motion picture editing tool used for painting and retouching of movies"
 SRC_URI="mirror://sourceforge/cinepaint/${P}.tar.gz"
diff --git a/media-video/cinepaint/files/cinepaint-0.18.3-gcc34.patch b/media-video/cinepaint/files/cinepaint-0.18.3-gcc34.patch
new file mode 100644
index 000000000000..ef6a57d98f20
--- /dev/null
+++ b/media-video/cinepaint/files/cinepaint-0.18.3-gcc34.patch
@@ -0,0 +1,33 @@
+--- plug-ins/psd/psd.c.org	2005-01-04 21:43:35.538672936 -0100
++++ plug-ins/psd/psd.c	2005-01-04 21:56:03.886906712 -0100
+@@ -299,7 +299,7 @@
+                           gint    *nreturn_vals,
+                           GimpParam **return_vals);
+ 
+-static GImageType  psd_type_to_gimp_type      (psd_imagetype  psdtype);
++static GDrawableType  psd_type_to_gimp_type      (psd_imagetype  psdtype);
+ static GImageType  psd_type_to_gimp_base_type (psd_imagetype  psdtype);
+ static GLayerMode  psd_lmode_to_gimp_lmode    (gchar          modekey[4]);
+ static GimpUnit    psd_unit_to_gimp_unit      (gint           psdunit);
+@@ -1759,16 +1759,16 @@
+       gimp_image_set_filename (image_ID, name);
+  
+ /* in libfilmgimp v0.16 only set resolution of individual layers, not of
+-   not of image?  Tom Huffman - March 2003
++   not of image?  Tom Huffman - March 2003*/
+ 
+-      if (psd_image.resolution_is_set)
++      /*if (psd_image.resolution_is_set)
+ 	{
+ 	  gimp_image_set_resolution(image_ID,
+ 				    psd_image.resolution.hRes / 65536.0,
+-				    psd_image.resolution.vRes / 65536.0);
++				    psd_image.resolution.vRes / 65536.0);*/
+ 	  /* currently can only set one unit for the image so we use the
+-	     horizontal unit from the psd image 
+-	  gimp_image_set_unit(image_ID, psd_unit_to_gimp_unit( psd_image.resolution.widthUnit));
++	     horizontal unit from the psd image*/
++	  /*gimp_image_set_unit(image_ID, psd_unit_to_gimp_unit( psd_image.resolution.widthUnit));
+ 	}
+ */
+