Fix nofetch message, bug #129039

(Portage version: 2.1_pre7-r4)

4 files changed, 27 insertions, 12 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index 9f1fad5768d8..488f1b288b12 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.13 2006/04/05 18:56:49 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.14 2006/04/06 19:12:15 dertobi123 Exp $
+
+  06 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  oracle-instantclient-basic-10.2.0.1-r1.ebuild,
+  oracle-instantclient-basic-10.2.0.2.ebuild:
+  Fix nofetch message, bug #129039
 
 *oracle-instantclient-basic-10.2.0.2 (05 Apr 2006)
 
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 80262b11f530..0719fce5d2a9 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -37,12 +37,12 @@ SHA256 fb885100c26b8504ccb348fe8b97db8db1c6fb3e9c26d1bb322bdac2ffd88c5e oracle-i
 MD5 717af28fbe94dbe8dfc5dc5a85b1c258 oracle-instantclient-basic-10.1.0.4.ebuild 2674
 RMD160 9e51f895ed7db5d037ec114ca351b20558fe6458 oracle-instantclient-basic-10.1.0.4.ebuild 2674
 SHA256 e9f8c1b0f57228d38699fd6f700de2223c7a3b9abeb95efec5c7a7142eedaba4 oracle-instantclient-basic-10.1.0.4.ebuild 2674
-MD5 48435d436a9a24c47a36a7abb7658145 oracle-instantclient-basic-10.2.0.1-r1.ebuild 3017
-RMD160 a8296ec2aade1f8dbd5e09e8412b05724c3578f3 oracle-instantclient-basic-10.2.0.1-r1.ebuild 3017
-SHA256 fcd074cd9469c355f30ec9c76a8d9437884564b30c04a88fe18d5010d09fd09a oracle-instantclient-basic-10.2.0.1-r1.ebuild 3017
+MD5 0afeac95fbf12007240471fd0f4425fb oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050
+RMD160 62db384ade06f3f532e760be44fdb97b754fde3b oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050
+SHA256 3bd932092d6ec3395526debb789612e2d7a07d8ce1aca62b4634343272ce2117 oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050
 MD5 c199aa62820ed740c2a5392fb8844cd4 oracle-instantclient-basic-10.2.0.1.ebuild 2678
 RMD160 a2323b64b7908b954dafa28118426e7c67479d9b oracle-instantclient-basic-10.2.0.1.ebuild 2678
 SHA256 a3fb625cee8569ac4403f010dfd5630fce72a42f54caa228c87da3e733466a13 oracle-instantclient-basic-10.2.0.1.ebuild 2678
-MD5 3b86e69a0955e9910dba6074b4832ced oracle-instantclient-basic-10.2.0.2.ebuild 2794
-RMD160 c3958c94cf76fab25ff8493801993b01638a7dcb oracle-instantclient-basic-10.2.0.2.ebuild 2794
-SHA256 3050dede7b3a3a69943f219954164a796b2b2976e4540a694442f3f6ace2742b oracle-instantclient-basic-10.2.0.2.ebuild 2794
+MD5 4060b00f8d190408caf371cd3eef4fe6 oracle-instantclient-basic-10.2.0.2.ebuild 2827
+RMD160 64f129a7acf37baee26c815b814fd185d03d416c oracle-instantclient-basic-10.2.0.2.ebuild 2827
+SHA256 d342e4dbeeaf04050c3d9b3c3d5b1cd2a03acf67a506d5e9411d5b623c5c581a oracle-instantclient-basic-10.2.0.2.ebuild 2827
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild
index 5b0c33ab06ef..b865dc16ae6f 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.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-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild,v 1.3 2006/02/13 18:30:52 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild,v 1.4 2006/04/06 19:12:16 dertobi123 Exp $
 
 inherit eutils
 
@@ -25,14 +25,19 @@ IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND="|| ( =sys-libs/libstdc++-v3-3.3* =sys-devel/gcc-3.3* )"
 
-pkg_setup() {
+my_arch() {
 	MY_P=MY_P_${ARCH}
 	export MY_P=${!MY_P}
 	MY_PSDK=MY_PSDK_${ARCH}
 	export MY_PSDK=${!MY_PSDK}
 }
 
+pkg_setup() {
+	my_arch
+}
+
 pkg_nofetch() {
+	my_arch
 	eerror "Please go to:"
 	eerror "  ${HOMEPAGE}"
 	eerror "and download the Basic client package with SDK, which are:"
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild
index 85f7f207dfb0..cf07ae26351b 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.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-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild,v 1.1 2006/04/05 18:56:49 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.2.ebuild,v 1.2 2006/04/06 19:12:16 dertobi123 Exp $
 
 inherit eutils
 
@@ -26,14 +26,19 @@ DEPEND="app-arch/unzip"
 RDEPEND="|| ( =sys-libs/libstdc++-v3-3.3* =sys-devel/gcc-3.3* )
 	app-admin/eselect-oracle"
 
-pkg_setup() {
+my_arch() {
 	MY_P=MY_P_${ARCH}
 	export MY_P=${!MY_P}
 	MY_PSDK=MY_PSDK_${ARCH}
 	export MY_PSDK=${!MY_PSDK}
 }
 
+pkg_setup() {
+	my_arch
+}
+
 pkg_nofetch() {
+	my_arch
 	eerror "Please go to:"
 	eerror "  ${HOMEPAGE}"
 	eerror "and download the Basic client package with SDK, which are:"
@@ -83,6 +88,6 @@ pkg_postinst() {
 	einfo "Examples are located in /usr/share/doc/${PF}/"
 	einfo
 	ewarn "A new eselect module has been added to easily switch between"
-	ewarn "different Instantclient versions and to set your ORACLE_HOME"
+	ewarn "different Instantclient versions and to set your ORACLE_HOME."
 	ewarn "See 'eselect oracle help' for reference"
 }