fix problems with -fstack-protector on amd64 with a strange patch from bug 109480; credit goes to Hopeless

Package-Manager: portage-2.1.2_pre2-r5

5 files changed, 103 insertions, 15 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index fd3d84d41998..ecf83d2fdbab 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.80 2006/08/26 01:06:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.81 2006/10/12 15:27:59 blubb Exp $
+
+*cairo-1.0.4-r1 (12 Oct 2006)
+
+  12 Oct 2006; Simon Stelling <blubb@gentoo.org>
+  +files/cairo-1.0.4-ssp-nonsense.patch, +cairo-1.0.4-r1.ebuild:
+  fix problems with -fstack-protector on amd64 with a strange patch from bug
+  109480; credit goes to Hopeless
 
 *cairo-1.2.4 (26 Aug 2006)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 9cc2d50f7b7d..3a2f77021691 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cairo-1.0.2-pkg_macro.patch 542 RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f025ad SHA1 0ab6c2c4aa0f441694eecc8a42e37b13efaad2bf SHA256 4ab7469075776de4fadcc733c9ceb9754b075e5a99b05fcdc247fc597b971149
 MD5 6600a332745a27c0333f2c8193a805fa files/cairo-1.0.2-pkg_macro.patch 542
 RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f025ad files/cairo-1.0.2-pkg_macro.patch 542
 SHA256 4ab7469075776de4fadcc733c9ceb9754b075e5a99b05fcdc247fc597b971149 files/cairo-1.0.2-pkg_macro.patch 542
+AUX cairo-1.0.4-ssp-nonsense.patch 591 RMD160 1189664f878f77bd00457a7db682ea6e5fd8ead7 SHA1 d541cd5b503fb21e396e263b9bdf93a00d2a4dcb SHA256 a6a0c993eec5687dd78325a35ee790597194b331290be0f2ae20783d7c638115
+MD5 2a4e0d69f3712d3974defd1e815d272e files/cairo-1.0.4-ssp-nonsense.patch 591
+RMD160 1189664f878f77bd00457a7db682ea6e5fd8ead7 files/cairo-1.0.4-ssp-nonsense.patch 591
+SHA256 a6a0c993eec5687dd78325a35ee790597194b331290be0f2ae20783d7c638115 files/cairo-1.0.4-ssp-nonsense.patch 591
 DIST cairo-1.0.2.tar.gz 1458903 RMD160 59f309974fdac86253ed9a4d00e564a2fac310eb SHA1 3a425049499b0b067ed4dc60d94b4d0819c0841b SHA256 d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e
 DIST cairo-1.0.4.tar.gz 1475777 RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb SHA1 89e72202e5b51a8914fce60f52f7c51ecdea982a SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5
 DIST cairo-1.2.2.tar.gz 2831305 RMD160 ecb23495efb809b1a7e0af036ad3a260d68be9d5 SHA1 859b9ed4eaa200a03b9e41ccc45f3799742e6c5c SHA256 9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02
@@ -13,6 +14,10 @@ EBUILD cairo-1.0.2.ebuild 1530 RMD160 12790aa490cd8d5441abec121899226c8657757a S
 MD5 e8e5d3bbc39d2d39c75c139e14d10d1a cairo-1.0.2.ebuild 1530
 RMD160 12790aa490cd8d5441abec121899226c8657757a cairo-1.0.2.ebuild 1530
 SHA256 41cc3865da19f668e4083345aae63845ff1a35111edee302ce2a8779af99dff4 cairo-1.0.2.ebuild 1530
+EBUILD cairo-1.0.4-r1.ebuild 1459 RMD160 716e0c6b3da24899a586530b6594ee4b8ad80ea8 SHA1 64824bdb3f411c8da31b3fb3beb564a27efc0d00 SHA256 49e79edbe4fa1b30dae068095edc9d0b9023558840ea3af572d16358626dcfac
+MD5 42cee7c910e5636f5e74a039b2948822 cairo-1.0.4-r1.ebuild 1459
+RMD160 716e0c6b3da24899a586530b6594ee4b8ad80ea8 cairo-1.0.4-r1.ebuild 1459
+SHA256 49e79edbe4fa1b30dae068095edc9d0b9023558840ea3af572d16358626dcfac cairo-1.0.4-r1.ebuild 1459
 EBUILD cairo-1.0.4.ebuild 1352 RMD160 58b5285cea7dae595e5c4742eba50fb6df4c76a0 SHA1 ad3eef838ab9121f7acc68825028e849b3b1c43a SHA256 8281bafb3babbee8b4a6267b6abb8c7d605e3440d94bca574181c4f4bcdba68d
 MD5 d574a0c2102b21c946b015420c2edd3e cairo-1.0.4.ebuild 1352
 RMD160 58b5285cea7dae595e5c4742eba50fb6df4c76a0 cairo-1.0.4.ebuild 1352
@@ -25,10 +30,10 @@ EBUILD cairo-1.2.4.ebuild 1855 RMD160 c63c29a65c9d205996a693bf751ce3ef612ce108 S
 MD5 66f9eab08509b946bd045f12fe9c4366 cairo-1.2.4.ebuild 1855
 RMD160 c63c29a65c9d205996a693bf751ce3ef612ce108 cairo-1.2.4.ebuild 1855
 SHA256 1f5f29cc9a75b9fd467a452a289f6b54351a3000fd78119c7bf05b9d9a8129c1 cairo-1.2.4.ebuild 1855
-MISC ChangeLog 11979 RMD160 e166ccbe2e781be473ff2423c68a4878d7628ca6 SHA1 43df47bccce8e667dd30c494dd954869ff2886fd SHA256 5b58be9bb03a02140fff96f5acbd85c778d32c9ed949fda050614ab487252169
-MD5 3aa404b2517b182c8e9db4e14390d464 ChangeLog 11979
-RMD160 e166ccbe2e781be473ff2423c68a4878d7628ca6 ChangeLog 11979
-SHA256 5b58be9bb03a02140fff96f5acbd85c778d32c9ed949fda050614ab487252169 ChangeLog 11979
+MISC ChangeLog 12235 RMD160 96595f0fb8c4cdbecf5ec314af13ca49dfa197b3 SHA1 f8502cd10705c7b489b6b9f7c6314627b2bfe855 SHA256 c721b14af9024c1255477a328469b1f6454dffe75b4a4e90e5619796592d3942
+MD5 81c80a502fad50ce943a00f75edff962 ChangeLog 12235
+RMD160 96595f0fb8c4cdbecf5ec314af13ca49dfa197b3 ChangeLog 12235
+SHA256 c721b14af9024c1255477a328469b1f6454dffe75b4a4e90e5619796592d3942 ChangeLog 12235
 MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
 MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
@@ -39,16 +44,12 @@ SHA256 9070cfcc6ab84d39744d2ccbac0bc1bc6c8063cee9ab3d6934c795c0189032c4 files/di
 MD5 dd098b533608d6250bc6d4fbe016256d files/digest-cairo-1.0.4 238
 RMD160 014452a883fabada98aae5064c27a524ff0594ff files/digest-cairo-1.0.4 238
 SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/digest-cairo-1.0.4 238
+MD5 dd098b533608d6250bc6d4fbe016256d files/digest-cairo-1.0.4-r1 238
+RMD160 014452a883fabada98aae5064c27a524ff0594ff files/digest-cairo-1.0.4-r1 238
+SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/digest-cairo-1.0.4-r1 238
 MD5 4b3ced9cdbd2aa686576db4b60bfbf20 files/digest-cairo-1.2.2 238
 RMD160 dbccbb0df1edc7765a38c40a9c8352166057c41a files/digest-cairo-1.2.2 238
 SHA256 7f15e3daf5be673f3c54177f52f1851e3f17b3b2bf0a853c9f5fc5c666e074ca files/digest-cairo-1.2.2 238
 MD5 ad8f70972aca60be3e0459b112265b0e files/digest-cairo-1.2.4 238
 RMD160 72f3842866c3dba95a661b08a00010b85945244b files/digest-cairo-1.2.4 238
 SHA256 b04bf38f8f8c64f7e1256aa588f200c2f5619f0710745279beac16b7955eb2fe files/digest-cairo-1.2.4 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE756JoeSe8B0zEfwRAoO0AJ9HYS0OVgYsPITaV3e+dMJ78sf+jACdHeHM
-6QSaSSN32VHJ9Z4D90VLbQg=
-=k8cg
------END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.0.4-r1.ebuild b/x11-libs/cairo/cairo-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..bfeeb4550579
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.0.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.0.4-r1.ebuild,v 1.1 2006/10/12 15:27:59 blubb Exp $
+
+inherit eutils
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc glitz png X"
+# bug 118106: not entirely broken, just too flakey
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2.1
+	X? ( || ( (	x11-libs/libXrender
+			x11-libs/libX11 )
+			virtual/x11 )
+		virtual/xft )
+	glitz? ( =media-libs/glitz-0.4.4* )
+	png? ( media-libs/libpng )
+	!<x11-libs/cairo-0.2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	X? ( || ( x11-proto/renderproto virtual/x11 ) )
+	doc? (	>=dev-util/gtk-doc-1.3
+		~app-text/docbook-xml-dtd-4.2 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}"/${P}-ssp-nonsense.patch #109480
+}
+
+src_compile() {
+
+	econf $(use_enable X xlib) \
+		$(use_enable png) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable glitz) \
+		--enable-freetype || die "./configure failed"
+
+	emake || die "Compilation failed"
+
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+}
diff --git a/x11-libs/cairo/files/cairo-1.0.4-ssp-nonsense.patch b/x11-libs/cairo/files/cairo-1.0.4-ssp-nonsense.patch
new file mode 100644
index 000000000000..9e8efe903847
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.0.4-ssp-nonsense.patch
@@ -0,0 +1,18 @@
+--- cairo-1.0.2.orig/src/cairo-path-stroke.c	2005-10-03 21:44:43.000000000 +0100
++++ cairo-1.0.2/src/cairo-path-stroke.c	2006-01-27 01:50:06.000000000 +0000
+@@ -180,6 +180,7 @@
+     cairo_gstate_t	*gstate = stroker->gstate;
+     int		clockwise = _cairo_stroker_face_clockwise (out, in);
+     cairo_point_t	*inpt, *outpt;
++    cairo_polygon_t     polygon;
+ 
+     if (in->cw.x == out->cw.x
+ 	&& in->cw.y == out->cw.y
+@@ -271,7 +272,6 @@
+ 	    double		x1, y1, x2, y2;
+ 	    double		mx, my;
+ 	    double		dx1, dx2, dy1, dy2;
+-	    cairo_polygon_t	polygon;
+ 	    cairo_point_t	outer;
+ 
+ 	    /* 
diff --git a/x11-libs/cairo/files/digest-cairo-1.0.4-r1 b/x11-libs/cairo/files/digest-cairo-1.0.4-r1
new file mode 100644
index 000000000000..cb0dba37b278
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.0.4-r1
@@ -0,0 +1,3 @@
+MD5 9002b0e69b3f94831a22d3f2a7735ce2 cairo-1.0.4.tar.gz 1475777
+RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb cairo-1.0.4.tar.gz 1475777
+SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5 cairo-1.0.4.tar.gz 1475777