Propogate ia64-atomic-ops.patch to more ebuilds

Package-Manager: portage-2.1-r1

7 files changed, 74 insertions, 45 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 262b7d02843f..4ab76cb227b8 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.213 2006/09/04 06:02:53 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.214 2006/09/13 17:52:15 agriffis Exp $
+
+  13 Sep 2006; Aron Griffis <agriffis@gentoo.org> glib-2.10.3.ebuild,
+  glib-2.12.0.ebuild, glib-2.12.1.ebuild, glib-2.12.2.ebuild,
+  glib-2.12.3.ebuild:
+  Propogate ia64-atomic-ops.patch to more ebuilds
 
 *glib-2.12.3 (04 Sep 2006)
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index d6d816cc9c57..feb08d4962ce 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4
 MD5 a84a252e7f8698c36076ab4b586dce21 files/glib-1.2.10-configure-LANG.patch 1464
 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 files/glib-1.2.10-configure-LANG.patch 1464
@@ -43,26 +40,26 @@ EBUILD glib-1.2.10-r5.ebuild 1602 RMD160 a45e5b63cf9650771e10b4d788aa35a49b74695
 MD5 0a7b1c38639898440d5eed0f6430a507 glib-1.2.10-r5.ebuild 1602
 RMD160 a45e5b63cf9650771e10b4d788aa35a49b746957 glib-1.2.10-r5.ebuild 1602
 SHA256 0a415f949fc9875f48c0f187117be4de24419d48d9444081e433c5be1a8cbcf8 glib-1.2.10-r5.ebuild 1602
-EBUILD glib-2.10.3.ebuild 2090 RMD160 52efdb8a8d2ce7561aa7cc41ebdf36930380d962 SHA1 343604a4cd9297a2bc0fe3372f951a5a8d947d20 SHA256 c10309311f26fb8cfb7f6fed9df53ee84a8b08e32f3117d1e6c8d9797496180b
-MD5 7482e0b861ee7e12522be9f99ba41e19 glib-2.10.3.ebuild 2090
-RMD160 52efdb8a8d2ce7561aa7cc41ebdf36930380d962 glib-2.10.3.ebuild 2090
-SHA256 c10309311f26fb8cfb7f6fed9df53ee84a8b08e32f3117d1e6c8d9797496180b glib-2.10.3.ebuild 2090
-EBUILD glib-2.12.0.ebuild 1846 RMD160 a02e841c23aa3ba22adc884cd8cdf40514365395 SHA1 c4aa63d0bee60033add9c2c906f6c55b80194ce7 SHA256 63aee0a4dc5a0c1582172837b898b3f1ea6756c570f1deb8df021a3229321a3d
-MD5 9e41baddabf873e6f73173665bb1b23a glib-2.12.0.ebuild 1846
-RMD160 a02e841c23aa3ba22adc884cd8cdf40514365395 glib-2.12.0.ebuild 1846
-SHA256 63aee0a4dc5a0c1582172837b898b3f1ea6756c570f1deb8df021a3229321a3d glib-2.12.0.ebuild 1846
-EBUILD glib-2.12.1.ebuild 1846 RMD160 4f7b7ff4985c193995dc128c1d62b5af1cb40821 SHA1 83c5067efd415a14ff3717231c5eea0538b385af SHA256 65d8d350e52a7322e27a94b9ece32d017196531351577afcb4470fa89a39203c
-MD5 12ea84237beaaad08fec19282810788b glib-2.12.1.ebuild 1846
-RMD160 4f7b7ff4985c193995dc128c1d62b5af1cb40821 glib-2.12.1.ebuild 1846
-SHA256 65d8d350e52a7322e27a94b9ece32d017196531351577afcb4470fa89a39203c glib-2.12.1.ebuild 1846
-EBUILD glib-2.12.2.ebuild 1843 RMD160 3eb9eb5a1aaf694481cd2e77ac9e6e2b9e70d58d SHA1 78c9f20a2675542d9621f765fb26c4c7e42b4d5c SHA256 abbce9e5b2632915913da31a7bf57de278377750c9b20e793c3ebc7ff7d9ad5a
-MD5 edc700242dac9984ccf7e48d58e381c2 glib-2.12.2.ebuild 1843
-RMD160 3eb9eb5a1aaf694481cd2e77ac9e6e2b9e70d58d glib-2.12.2.ebuild 1843
-SHA256 abbce9e5b2632915913da31a7bf57de278377750c9b20e793c3ebc7ff7d9ad5a glib-2.12.2.ebuild 1843
-EBUILD glib-2.12.3.ebuild 1848 RMD160 61b832739fdcfeae70c64f4e032f92dc6fae6b0c SHA1 f5e6907234a044e7e6331574158a8a7e29be79f2 SHA256 b4ef4169b9ec4a3600d240ab4086818d7426e5f36982b3116ec3f168db12c907
-MD5 4d13d08c7349e3764cb7222824a829df glib-2.12.3.ebuild 1848
-RMD160 61b832739fdcfeae70c64f4e032f92dc6fae6b0c glib-2.12.3.ebuild 1848
-SHA256 b4ef4169b9ec4a3600d240ab4086818d7426e5f36982b3116ec3f168db12c907 glib-2.12.3.ebuild 1848
+EBUILD glib-2.10.3.ebuild 2078 RMD160 82a9731663941fa07dc1c1bcd9bc955e93bcb54a SHA1 39f5ae98422c206dcc06c6d5e7a90f6a09d787be SHA256 d0062f5fafe5c92964d1489fdb464a5425aca075d06daf78fa1dedbfb2957ad0
+MD5 ce45e352a88ccc8a21ec1ad07741aca0 glib-2.10.3.ebuild 2078
+RMD160 82a9731663941fa07dc1c1bcd9bc955e93bcb54a glib-2.10.3.ebuild 2078
+SHA256 d0062f5fafe5c92964d1489fdb464a5425aca075d06daf78fa1dedbfb2957ad0 glib-2.10.3.ebuild 2078
+EBUILD glib-2.12.0.ebuild 2088 RMD160 9ffc7f23a83d7effda93c9f4fc1b23a84e89fa48 SHA1 281f9631bcd86bf350ad9c2679307a428eb4df50 SHA256 cb3b001939079d83641f7ac736e313576735ceef5ce72d18184f9cce5d248360
+MD5 a9f4240b39e360785e1b0bfe77ea948a glib-2.12.0.ebuild 2088
+RMD160 9ffc7f23a83d7effda93c9f4fc1b23a84e89fa48 glib-2.12.0.ebuild 2088
+SHA256 cb3b001939079d83641f7ac736e313576735ceef5ce72d18184f9cce5d248360 glib-2.12.0.ebuild 2088
+EBUILD glib-2.12.1.ebuild 2087 RMD160 a853ac6e46821c1decfb7cd7f5e0540e8e6e406c SHA1 63d2bcd3e91b279568fc4129514dfa62812b9b47 SHA256 8e487b6dfacd231ba78dc990a794aba244be387bf7b5f519b425e2e3c8a2ab9b
+MD5 4a97ff3a7b780149c6a2268f0513db1d glib-2.12.1.ebuild 2087
+RMD160 a853ac6e46821c1decfb7cd7f5e0540e8e6e406c glib-2.12.1.ebuild 2087
+SHA256 8e487b6dfacd231ba78dc990a794aba244be387bf7b5f519b425e2e3c8a2ab9b glib-2.12.1.ebuild 2087
+EBUILD glib-2.12.2.ebuild 2088 RMD160 b72d393c6cf88a1b318031de33c06ddcde925065 SHA1 622c249b54d29b76e6ad88c6580e56faf08033fc SHA256 604abe999302ebfe6bfddc92cb5971c36fd1ed0ed116182aaa9ae68480179458
+MD5 94f014aac31cdcbf34233800cf412833 glib-2.12.2.ebuild 2088
+RMD160 b72d393c6cf88a1b318031de33c06ddcde925065 glib-2.12.2.ebuild 2088
+SHA256 604abe999302ebfe6bfddc92cb5971c36fd1ed0ed116182aaa9ae68480179458 glib-2.12.2.ebuild 2088
+EBUILD glib-2.12.3.ebuild 2089 RMD160 60cbf404d2779bef55bd1ece9d0d4abb4ad9aedc SHA1 eba9a5b078ec48fda781df1805e9a22fb0465443 SHA256 437f6d828286598bfe1153f983037fe11eceb6303b5839d5d7507e3536f1e156
+MD5 7e5d9e706b908d5afe99be4cfc6279f2 glib-2.12.3.ebuild 2089
+RMD160 60cbf404d2779bef55bd1ece9d0d4abb4ad9aedc glib-2.12.3.ebuild 2089
+SHA256 437f6d828286598bfe1153f983037fe11eceb6303b5839d5d7507e3536f1e156 glib-2.12.3.ebuild 2089
 EBUILD glib-2.6.5.ebuild 1647 RMD160 3afa5b806494ed6ddc321e8dfdf3c19c0201532a SHA1 5647d0bedffb146a0a4e0b01753f1b87c151e7c6 SHA256 c70b2e000d7eb252871462db4beb717e16f031208f8980dece27a0c38c7c83e9
 MD5 3c669304d71f54e783024332877d71d0 glib-2.6.5.ebuild 1647
 RMD160 3afa5b806494ed6ddc321e8dfdf3c19c0201532a glib-2.6.5.ebuild 1647
@@ -79,10 +76,10 @@ EBUILD glib-2.8.6.ebuild 1608 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 SH
 MD5 bf003c8a49124eb8f907181ee83ccf4e glib-2.8.6.ebuild 1608
 RMD160 338d8be78856ce5a8ba7d8469c897cb180b8cfa1 glib-2.8.6.ebuild 1608
 SHA256 f9c35f88a5eb9cb668edf620f234ef87dc55c080733122975068679fac7b6bed glib-2.8.6.ebuild 1608
-MISC ChangeLog 24862 RMD160 2a3040a19b083898a58f6da56ed97ee4883a1a70 SHA1 63fff97830b5fbba343db17235038714e4614405 SHA256 49324d4cac53d7aaabeb6565e573377ea6f7e2cef05984663526318684af7a45
-MD5 58e54768f286605d609f9ae4bf20125a ChangeLog 24862
-RMD160 2a3040a19b083898a58f6da56ed97ee4883a1a70 ChangeLog 24862
-SHA256 49324d4cac53d7aaabeb6565e573377ea6f7e2cef05984663526318684af7a45 ChangeLog 24862
+MISC ChangeLog 25067 RMD160 b8ab60cb4d4cb372c0339fb2517032a96f83b651 SHA1 c1b8fd8b5fd4c11a6f386c206a57ba0352f5663e SHA256 58ab49a27bce30ebb9fd3a232e712ccda90cfd9f3de4742446c9a4e9d2660400
+MD5 446ae6321e8e39fec80ff0618b3e2f6a ChangeLog 25067
+RMD160 b8ab60cb4d4cb372c0339fb2517032a96f83b651 ChangeLog 25067
+SHA256 58ab49a27bce30ebb9fd3a232e712ccda90cfd9f3de4742446c9a4e9d2660400 ChangeLog 25067
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -117,10 +114,3 @@ SHA256 d949d3e2f0884e6cf928fb9eeb63ed4997b98bc7ac567a59db905781898ea571 files/di
 MD5 411587311906220fe4765e5ccb81bbe1 files/digest-glib-2.8.6 238
 RMD160 5da8cbdd26807e9d44a548d9064a1405176e2630 files/digest-glib-2.8.6 238
 SHA256 30e7d4f7ac387cfa98e6c775cf1888a204523c609bc32d90ff24b7ff0900efc3 files/digest-glib-2.8.6 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFE/5RJomPajV0RnrERAtX2AJ47CNOnRZNg9sq0J2ZsfjFK1Mm1tQCbBocU
-e2cY5qviySfRHf/ksnMIvR8=
-=R8br
------END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.10.3.ebuild b/dev-libs/glib/glib-2.10.3.ebuild
index 19f5924382b9..a59ba91b2713 100644
--- a/dev-libs/glib/glib-2.10.3.ebuild
+++ b/dev-libs/glib/glib-2.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.10.3.ebuild,v 1.11 2006/08/18 22:18:31 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.10.3.ebuild,v 1.12 2006/09/13 17:52:15 agriffis Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -36,10 +36,9 @@ src_unpack() {
 
 	if use ia64; then
 		# Only apply for < 4.1
-		local ma="$(gcc-major-version)"
-		local mi="$(gcc-minor-version)"
-		if [[ "${ma}" -lt 4 ]] || [[ "${ma}" -eq 4 && "${mi}" -eq 0 ]]
-		then
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
 			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
 		fi
 	fi
diff --git a/dev-libs/glib/glib-2.12.0.ebuild b/dev-libs/glib/glib-2.12.0.ebuild
index dbeda07081eb..8d6fdc6f65fd 100644
--- a/dev-libs/glib/glib-2.12.0.ebuild
+++ b/dev-libs/glib/glib-2.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.0.ebuild,v 1.1 2006/07/05 15:01:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.0.ebuild,v 1.2 2006/09/13 17:52:15 agriffis Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -34,6 +34,15 @@ src_unpack() {
 		epatch "${FILESDIR}"/glib-2.6.3-testglib-ssp.patch
 	fi
 
+	if use ia64; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
 	epatch ${FILESDIR}/${PN}-2.8.3-macos.patch
 
 }
diff --git a/dev-libs/glib/glib-2.12.1.ebuild b/dev-libs/glib/glib-2.12.1.ebuild
index 92449c93905f..3b3fdc30bb22 100644
--- a/dev-libs/glib/glib-2.12.1.ebuild
+++ b/dev-libs/glib/glib-2.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.1.ebuild,v 1.1 2006/07/24 21:10:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.1.ebuild,v 1.2 2006/09/13 17:52:15 agriffis Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -34,8 +34,16 @@ src_unpack() {
 		epatch "${FILESDIR}"/glib-2.6.3-testglib-ssp.patch
 	fi
 
-	epatch ${FILESDIR}/${PN}-2.8.3-macos.patch
+	if use ia64; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
 
+	epatch ${FILESDIR}/${PN}-2.8.3-macos.patch
 }
 
 src_compile() {
diff --git a/dev-libs/glib/glib-2.12.2.ebuild b/dev-libs/glib/glib-2.12.2.ebuild
index 580438e5b116..9a7cdfd6d5bc 100644
--- a/dev-libs/glib/glib-2.12.2.ebuild
+++ b/dev-libs/glib/glib-2.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.2.ebuild,v 1.1 2006/09/07 03:38:40 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.2.ebuild,v 1.2 2006/09/13 17:52:15 agriffis Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -34,6 +34,15 @@ src_unpack() {
 		epatch "${FILESDIR}"/glib-2.6.3-testglib-ssp.patch
 	fi
 
+	if use ia64; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
 	epatch ${FILESDIR}/${PN}-2.8.3-macos.patch
 
 }
diff --git a/dev-libs/glib/glib-2.12.3.ebuild b/dev-libs/glib/glib-2.12.3.ebuild
index 7e78a267fded..f7b25ae08b3a 100644
--- a/dev-libs/glib/glib-2.12.3.ebuild
+++ b/dev-libs/glib/glib-2.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.3.ebuild,v 1.1 2006/09/04 06:02:53 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.3.ebuild,v 1.2 2006/09/13 17:52:15 agriffis Exp $
 
 inherit gnome.org libtool eutils flag-o-matic debug
 
@@ -33,6 +33,15 @@ src_unpack() {
 		epatch "${FILESDIR}"/glib-2.6.3-testglib-ssp.patch
 	fi
 
+	if use ia64; then
+		# Only apply for < 4.1
+		local major=$(gcc-major-version)
+		local minor=$(gcc-minor-version)
+		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
+			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
+		fi
+	fi
+
 	epatch ${FILESDIR}/${PN}-2.8.3-macos.patch
 }