Cleanup, set TNS_ADMIN and add information on where to put tnsnames.ora, #215100

(Portage version: 2.1.5_rc6)

3 files changed, 16 insertions, 84 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index 0a14e41a8eb9..19ab3407d7c0 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.29 2008/03/08 20:54:26 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.30 2008/05/02 19:41:53 dertobi123 Exp $
+
+  02 May 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -oracle-instantclient-basic-10.1.0.5.ebuild,
+  oracle-instantclient-basic-10.2.0.3.ebuild:
+  Cleanup, set TNS_ADMIN and add information on where to put tnsnames.ora,
+  #215100
 
   08 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   oracle-instantclient-basic-10.1.0.5.ebuild,
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild
deleted file mode 100644
index b20d935bd3d9..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 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.1.0.5.ebuild,v 1.6 2008/03/08 20:54:26 dertobi123 Exp $
-
-inherit eutils
-
-MY_P="${PN/oracle-/}-linux32-${PV}-20060511"
-MY_PSDK="${MY_P/basic/sdk}"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
-SRC_URI="${MY_P}.zip ${MY_PSDK}.zip"
-
-LICENSE="OTN"
-SLOT="${PV}"
-KEYWORDS="x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-# RDEPEND does not needs unzip
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.zip"
-	eerror "  ${MY_PSDK}.zip"
-	eerror "Then after downloading put them in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-	unzip "${DISTDIR}"/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip"
-}
-
-src_install() {
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient10_1
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.10.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
-
-	# includes
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/include
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/include
-	cd "${S}"/instantclient10_1/sdk/include
-	doins *.h
-	# link to original location
-	dodir /usr/include/oracle/${PV}/
-	ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client
-
-	# share info
-	cd "${S}"/instantclient10_1/sdk/demo
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-
-}
-
-pkg_postinst() {
-	elog "The Basic client page for Oracle 10g has been installed."
-	elog "You may also wish to install the oracle-instantclient-jdbc (for"
-	elog "supplemental JDBC functionality with Oracle) and the"
-	elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	elog "packages as well."
-	elog
-	elog "Examples are located in /usr/share/doc/${PF}/"
-	elog
-	ewarn "ORACLE_HOME (and others) are set in /etc/env.d/50oracle-instantclient-basic"
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild
index 57718c280559..5d1caba2ae4a 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.3.ebuild,v 1.8 2008/03/08 20:54:26 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3.ebuild,v 1.9 2008/05/02 19:41:53 dertobi123 Exp $
 
 inherit eutils
 
@@ -92,6 +92,10 @@ src_install() {
 	echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic
 	echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic
 	echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic
+	echo "TNS_ADMIN=/etc/oracle/" >> "${D}"/etc/env.d/50oracle-instantclient-basic
+
+	# create path for tnsnames.ora
+	dodir /etc/oracle
 }
 
 pkg_postinst() {
@@ -105,4 +109,8 @@ pkg_postinst() {
 	elog
 	elog "oracle-instantclient-* packages aren't installed in different"
 	elog "SLOTs any longer. You may want to uninstall older versions."
+	elog
+	elog "TNS_ADMIN has been set to ${ROOT}etc/oracle by default, put your"
+	elog "tnsnames.ora there or configure TNS_ADMIN to point to"
+	elog "your user specific configuration."
 }