fix orbit-2* ebuilds to unset IDL_DIR before compiling (bug #58540)

Package-Manager: portage-2.1.1_pre5-r2

7 files changed, 72 insertions, 30 deletions

diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 47b839843bee..2975d7f3f10a 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/orbit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.74 2006/08/16 13:58:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.75 2006/08/18 19:14:57 compnerd Exp $
+
+  18 Aug 2006; Saleem Abdulrasool <compnerd@gentoo.org> orbit-2.12.2.ebuild,
+  orbit-2.12.5.ebuild, orbit-2.14.0.ebuild, orbit-2.14.2.ebuild:
+  Adding in unset IDL_DIR to fix compile for people using RSI's IDL
 
   16 Aug 2006; Markus Rothe <corsair@gentoo.org> orbit-2.14.0.ebuild:
   Stable on ppc64
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index 6d9d03fbf0e5..d9974b35f319 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -7,7 +7,7 @@ MD5 f9325ad3ff0c1a2d06d5c26442679fd4 files/orbit-0.5.17-rpath-security-fix.patch
 RMD160 915ff6987684983532a0113aac1db98ce4e0e451 files/orbit-0.5.17-rpath-security-fix.patch 3628
 SHA256 75d0af72ae02fe162e04e8d92afc65c8026f188cff03bae1a70bedf92d72aad8 files/orbit-0.5.17-rpath-security-fix.patch 3628
 DIST ORBit-0.5.17.tar.bz2 1065003 RMD160 9087d6659adbd0066d76a3eed5cc2799de640df4 SHA1 c8b2daef43b028d65d0ab82f0a88558942be6217 SHA256 e83403a357d6e2339a3c4b6f191fcd7a1342d6bbe3391d6b03cf66f051b9a95e
-DIST ORBit2-2.12.2.tar.bz2 678266
+DIST ORBit2-2.12.2.tar.bz2 678266 RMD160 f3ade6fe1d99c7becadf65630721378fff603c37 SHA1 1ff3851dbfc8973fdff42246bb91642c925b6609 SHA256 11f21cceb9897139e7772daf1bfcd993cf363e0c5d4caa43f5abb111d5e11813
 DIST ORBit2-2.12.5.tar.bz2 685516 RMD160 8952db9992a199de41fd04d0f3fae22065cfe2bf SHA1 d84270f27af4cb3e821f0c4e38550ddc9833eb4d SHA256 dc6d9c22875b178ed26103b445e6c937a7120225de581ca56d3865c069722591
 DIST ORBit2-2.14.0.tar.bz2 704207 RMD160 1e8eb52b8b95f70fa80b217a41d0bcac35c333c0 SHA1 2358f9917d468c213272ee889dbbb74f91448728 SHA256 412e4880d79533a2bbd33757e031a2bee24a7bc771f22cf4fed3cb81790b1b68
 DIST ORBit2-2.14.2.tar.bz2 706622 RMD160 c308cd5e42a17134f3cc0f5888f8f4f07b06a4c3 SHA1 4e5b83b3852488a49d93eca44a3e4e9f8d5c4c50 SHA256 5db7e046569f66a26c0bb0aa4c40f12ac57da293f469eb373044853996d4e2d0
@@ -19,26 +19,26 @@ EBUILD orbit-0.5.17.ebuild 1666 RMD160 09900ae18119cf61ed3d5012275e62c92a62e4a7
 MD5 08e7a09f09f864022260e261682f371b orbit-0.5.17.ebuild 1666
 RMD160 09900ae18119cf61ed3d5012275e62c92a62e4a7 orbit-0.5.17.ebuild 1666
 SHA256 4472b03bc6090af03ceac8675c2bc4d37abc183bd81f27085dd1dc22ec41ec85 orbit-0.5.17.ebuild 1666
-EBUILD orbit-2.12.2.ebuild 1017 RMD160 8171313c639fe137c170b900a31ef8c4d5f44fe5 SHA1 1dc6dd75e2ae1ebec58a5668c8c979e25b3bdb48 SHA256 c20fcccde94eb02c1338754d3e094993f3067ae5f0f4ecd204bf2e1ff6387937
-MD5 e3a8dc018eb029f302884b2fc80adf56 orbit-2.12.2.ebuild 1017
-RMD160 8171313c639fe137c170b900a31ef8c4d5f44fe5 orbit-2.12.2.ebuild 1017
-SHA256 c20fcccde94eb02c1338754d3e094993f3067ae5f0f4ecd204bf2e1ff6387937 orbit-2.12.2.ebuild 1017
-EBUILD orbit-2.12.5.ebuild 1067 RMD160 96707f41dd6669cae1e14c09599664a374556be1 SHA1 11a960266def45f6cde9dd1d72d22d74f4f21765 SHA256 e5cc130a268fd97967d2d62fd80c1755a705a179b8df39b808fac82c77047760
-MD5 04340a85adfe1b1c066c18645e8381fd orbit-2.12.5.ebuild 1067
-RMD160 96707f41dd6669cae1e14c09599664a374556be1 orbit-2.12.5.ebuild 1067
-SHA256 e5cc130a268fd97967d2d62fd80c1755a705a179b8df39b808fac82c77047760 orbit-2.12.5.ebuild 1067
-EBUILD orbit-2.14.0.ebuild 1065 RMD160 0c6e6e4fd0394ba8cf406167bd0a0fda078def2f SHA1 3bc1ceaabdc07de222e285984aed08ff9b7d2960 SHA256 845189261d3043d77d5ed2d8e6a2d1357a8e24fdb6977fd3b47b26109978c2d9
-MD5 e296fe6ac516c1a53b870f105a00ebfa orbit-2.14.0.ebuild 1065
-RMD160 0c6e6e4fd0394ba8cf406167bd0a0fda078def2f orbit-2.14.0.ebuild 1065
-SHA256 845189261d3043d77d5ed2d8e6a2d1357a8e24fdb6977fd3b47b26109978c2d9 orbit-2.14.0.ebuild 1065
-EBUILD orbit-2.14.2.ebuild 984 RMD160 f31fd81b69ce2df4e37defe05cefe863f1c3d82c SHA1 53714d9a5977cf748c0e09f75a5890064c3f6447 SHA256 d1a561d3540c9938470f3d67c9e32e71e85b812511a9ee0fb5085c9bdce89a4c
-MD5 655d924c9cf8e6819809677909e64572 orbit-2.14.2.ebuild 984
-RMD160 f31fd81b69ce2df4e37defe05cefe863f1c3d82c orbit-2.14.2.ebuild 984
-SHA256 d1a561d3540c9938470f3d67c9e32e71e85b812511a9ee0fb5085c9bdce89a4c orbit-2.14.2.ebuild 984
-MISC ChangeLog 8396 RMD160 45bea76e0665db0cd734b14d1c09ad124758cd89 SHA1 87765f08a61c180dcef28cf7063c5119e5f7e3d7 SHA256 0bf7f3e916c06f60fee2342b7e7bab4e8ac24969b5d63e41f57bd40a3db5013b
-MD5 63237e7adf639e4cc684336aab254c91 ChangeLog 8396
-RMD160 45bea76e0665db0cd734b14d1c09ad124758cd89 ChangeLog 8396
-SHA256 0bf7f3e916c06f60fee2342b7e7bab4e8ac24969b5d63e41f57bd40a3db5013b ChangeLog 8396
+EBUILD orbit-2.12.2.ebuild 1281 RMD160 36269e7181e852a4eb19b2b45cf728934b73b99b SHA1 a77f120aba7c189f0f6a7cbacc4a3eb182aadcf3 SHA256 ff07468820f0ffe868648d55371bb07d4277ac1e8ee2368acb2b75ebcd1dbf14
+MD5 80ce476f012da2a9adacb8b56f9f750a orbit-2.12.2.ebuild 1281
+RMD160 36269e7181e852a4eb19b2b45cf728934b73b99b orbit-2.12.2.ebuild 1281
+SHA256 ff07468820f0ffe868648d55371bb07d4277ac1e8ee2368acb2b75ebcd1dbf14 orbit-2.12.2.ebuild 1281
+EBUILD orbit-2.12.5.ebuild 1334 RMD160 28e02c3b055a9867f3cdec700e808911e619a015 SHA1 5b614ac74e5f51c2d7a562d0dbbf4a73e5b0a2fc SHA256 18353755e91ef43afbb8ed9a0be78ec807964d4c85e260980a4c6c508797bd38
+MD5 ca622e850f3c6e03028f35412896a8ce orbit-2.12.5.ebuild 1334
+RMD160 28e02c3b055a9867f3cdec700e808911e619a015 orbit-2.12.5.ebuild 1334
+SHA256 18353755e91ef43afbb8ed9a0be78ec807964d4c85e260980a4c6c508797bd38 orbit-2.12.5.ebuild 1334
+EBUILD orbit-2.14.0.ebuild 1331 RMD160 2c7cb3e390ed15d79455b7b63998c26caf528301 SHA1 928de795d7cdbf19080ea977ec5ada71cba6a170 SHA256 39ec3dbcc073348838f5253fe9dfede508d1f7fb6b7af648fa1b05f327e552cb
+MD5 01aa47f9cb5b86852ce2b7c7e89c9725 orbit-2.14.0.ebuild 1331
+RMD160 2c7cb3e390ed15d79455b7b63998c26caf528301 orbit-2.14.0.ebuild 1331
+SHA256 39ec3dbcc073348838f5253fe9dfede508d1f7fb6b7af648fa1b05f327e552cb orbit-2.14.0.ebuild 1331
+EBUILD orbit-2.14.2.ebuild 1252 RMD160 a9267fad4dfc48579cee8e1c04effc964b58a5b5 SHA1 7002069eb4a7fffcb126d8aaade676cfdd0a15ac SHA256 2485dd23903d7aa78af9830de32852a6abf4ce7d11f725f64d77577200646a63
+MD5 52d15b8e073e5d1a6f6c97cd8cba8b0b orbit-2.14.2.ebuild 1252
+RMD160 a9267fad4dfc48579cee8e1c04effc964b58a5b5 orbit-2.14.2.ebuild 1252
+SHA256 2485dd23903d7aa78af9830de32852a6abf4ce7d11f725f64d77577200646a63 orbit-2.14.2.ebuild 1252
+MISC ChangeLog 8608 RMD160 0d83c0809dfae01c7daaa5789517524319f3e6d2 SHA1 2cb106e32915d562a18b900449269c120907315a SHA256 776c7ff3f4c0b87bdf262ddbdf0badcaa48516d1d03d59023dc1d08f4ee16409
+MD5 ba0fcacb30f84da159e58327098c0988 ChangeLog 8608
+RMD160 0d83c0809dfae01c7daaa5789517524319f3e6d2 ChangeLog 8608
+SHA256 776c7ff3f4c0b87bdf262ddbdf0badcaa48516d1d03d59023dc1d08f4ee16409 ChangeLog 8608
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -49,9 +49,9 @@ SHA256 07c748da44feb000a79c43055ebb8d7b720cb7f64758d6faafd92581388a54af files/di
 MD5 eea8346f6a67524310f99752ed850119 files/digest-orbit-0.5.17-r1 244
 RMD160 60f739d6d14506fb09b012eac3ea569b72c9f1bd files/digest-orbit-0.5.17-r1 244
 SHA256 07c748da44feb000a79c43055ebb8d7b720cb7f64758d6faafd92581388a54af files/digest-orbit-0.5.17-r1 244
-MD5 66a18f0f92e9cd0f658690bf1e5c862c files/digest-orbit-2.12.2 66
-RMD160 434447bac89fa9e56eecc6f0f8824a8de36f56bd files/digest-orbit-2.12.2 66
-SHA256 cde86b64f198b27d5ac8eb831ce7ae255f338e05e969d1e7bdd41fa400687bfb files/digest-orbit-2.12.2 66
+MD5 3ca7e3fb23b297625602d81aca3885c7 files/digest-orbit-2.12.2 244
+RMD160 d1a710a36e0b25049e1094285f007b1fa18b96f8 files/digest-orbit-2.12.2 244
+SHA256 21b88c43fb726bbb824a61d59a2a85885623554346939a993d7c26b917a13104 files/digest-orbit-2.12.2 244
 MD5 fced0aa255251572aa96373440220366 files/digest-orbit-2.12.5 244
 RMD160 3007e9d4dcb97b8c286314ade6b9e1209640e19f files/digest-orbit-2.12.5 244
 SHA256 2ee25ab5a01443559790ac8c0872029d8cb048ccff97f3910b449bcd3db12c74 files/digest-orbit-2.12.5 244
diff --git a/gnome-base/orbit/files/digest-orbit-2.12.2 b/gnome-base/orbit/files/digest-orbit-2.12.2
index f654bb6e22aa..7c946a3dcdde 100644
--- a/gnome-base/orbit/files/digest-orbit-2.12.2
+++ b/gnome-base/orbit/files/digest-orbit-2.12.2
@@ -1 +1,3 @@
 MD5 7f963dcd0d84e6854460449383cc8c70 ORBit2-2.12.2.tar.bz2 678266
+RMD160 f3ade6fe1d99c7becadf65630721378fff603c37 ORBit2-2.12.2.tar.bz2 678266
+SHA256 11f21cceb9897139e7772daf1bfcd993cf363e0c5d4caa43f5abb111d5e11813 ORBit2-2.12.2.tar.bz2 678266
diff --git a/gnome-base/orbit/orbit-2.12.2.ebuild b/gnome-base/orbit/orbit-2.12.2.ebuild
index cbfe1a3195c9..06fc39d75f30 100644
--- a/gnome-base/orbit/orbit-2.12.2.ebuild
+++ b/gnome-base/orbit/orbit-2.12.2.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/gnome-base/orbit/orbit-2.12.2.ebuild,v 1.10 2005/07/30 12:30:26 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.12.2.ebuild,v 1.11 2006/08/18 19:14:57 compnerd Exp $
 
 inherit gnome2 eutils
 
@@ -35,3 +35,12 @@ MAKEOPTS="${MAKEOPTS} -j1"
 USE_DESTDIR="1"
 
 DOCS="AUTHORS ChangeLog README HACKING NEWS TODO MAINTAINERS"
+
+src_compile() {
+	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
+	# files to be not found by autotools when compiling ORBit.  See bug #58540
+	# for more information.  Please don't remove -- 8/18/06
+	unset IDL_DIR
+
+	gnome2_src_compile
+}
diff --git a/gnome-base/orbit/orbit-2.12.5.ebuild b/gnome-base/orbit/orbit-2.12.5.ebuild
index 6a87763a665e..9fb198d82375 100644
--- a/gnome-base/orbit/orbit-2.12.5.ebuild
+++ b/gnome-base/orbit/orbit-2.12.5.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/gnome-base/orbit/orbit-2.12.5.ebuild,v 1.10 2006/07/05 05:38:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.12.5.ebuild,v 1.11 2006/08/18 19:14:57 compnerd Exp $
 
 inherit gnome2
 
@@ -40,3 +40,12 @@ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 pkg_setup() {
 	G2CONF="$(use_enable static)"
 }
+
+src_compile() {
+	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
+	# files to be not found by autotools when compiling ORBit.  See bug #58540
+	# for more information.  Please don't remove -- 8/18/06
+	unset IDL_DIR
+
+	gnome2_src_compile
+}
diff --git a/gnome-base/orbit/orbit-2.14.0.ebuild b/gnome-base/orbit/orbit-2.14.0.ebuild
index c1d03fe61077..4a001f0d4e84 100644
--- a/gnome-base/orbit/orbit-2.14.0.ebuild
+++ b/gnome-base/orbit/orbit-2.14.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/gnome-base/orbit/orbit-2.14.0.ebuild,v 1.8 2006/08/16 13:58:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.0.ebuild,v 1.9 2006/08/18 19:14:57 compnerd Exp $
 
 inherit gnome2
 
@@ -39,3 +39,12 @@ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable static)"
 }
+
+src_compile() {
+	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
+	# files to be not found by autotools when compiling ORBit.  See bug #58540
+	# for more information.  Please don't remove -- 8/18/06
+	unset IDL_DIR
+
+	gnome2_src_compile
+}
diff --git a/gnome-base/orbit/orbit-2.14.2.ebuild b/gnome-base/orbit/orbit-2.14.2.ebuild
index d953369ca719..a05477dac164 100644
--- a/gnome-base/orbit/orbit-2.14.2.ebuild
+++ b/gnome-base/orbit/orbit-2.14.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/gnome-base/orbit/orbit-2.14.2.ebuild,v 1.2 2006/07/26 04:38:28 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.2.ebuild,v 1.3 2006/08/18 19:14:57 compnerd Exp $
 
 inherit gnome2
 
@@ -33,3 +33,12 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 
 DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
+
+src_compile() {
+	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
+	# files to be not found by autotools when compiling ORBit.  See bug #58540
+	# for more information.  Please don't remove -- 8/18/06
+	unset IDL_DIR
+
+	gnome2_src_compile
+}