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

Package-Manager: portage-2.1.5_rc6

4 files changed, 18 insertions, 89 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/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 3c612fff8a85..8e6261202d4b 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,11 +1,8 @@
 AUX oracle-instantclient-basic-10.2.0.3-makefile.patch 356 RMD160 5bf8584f2f12f74c5481f9211bbfad65929a0091 SHA1 a02921ad2ff3bf7bfcb1f9b0d58cb3dce8b141e8 SHA256 c28e41b5ac8842cfa6248df8936f0681f00eaa8d99206c640dbdd0fcaedcadf0
 DIST instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 RMD160 fa431168723c9c2fe2182c9e480606db4b88932d SHA1 fd28349cedf225c16a5399362cb4919b7fc3a5e1 SHA256 9195ab13e59365bfef6b2b43732a652d77d7ef8b93019f31104bc13832c6a491
-DIST instantclient-basic-linux32-10.1.0.5-20060511.zip 31413713 RMD160 432bf95f4b3d63456624bde1fe93269693a841c7 SHA1 e9ac1688b85117449eb55bb0012824286f01e4a4 SHA256 3adc1bbb9a563cbc64b5225f9573e924c6a73263d46bc325df2931f7be7fd34a
 DIST instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 RMD160 12ac6ca9f94a255ca27de44a2feea6e49c3a4547 SHA1 08092f796c1c362254d18e73c955fd0bff9db78b SHA256 11fce485c405afa4a30f34eba36ad0d566a599617f80dfc565bd08d8c421e1ae
 DIST instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip 603137 RMD160 323d6407c664e9fdbc8a7b829e93deffa7871925 SHA1 d3486539a5b9a4721b7a57fd61c7694be4e2c6f1 SHA256 d9da1494a9d19e96bff79c3ff77d079633d18c7d9b462a37eacc9a2a40641912
-DIST instantclient-sdk-linux32-10.1.0.5-20060511.zip 294618 RMD160 f507160d73e61e2a613243d8cc823a902647b1e1 SHA1 6e7186007ce6897c0d05dfad5451d491cac35edd SHA256 3d8b401bbf461f91791b205949a5ea4e8ffbb54f3778372f6d376de7517f8ee4
 DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 RMD160 06ce90ef1fb7c61e920e3a3e37578f54b3d2db0f SHA1 cb70884b44150f5048c4876e41c58fec8d252705 SHA256 6893a784e1802e18300230dcac1ed2ecd6dc68a7060c02717f73bf268d43f6a5
-EBUILD oracle-instantclient-basic-10.1.0.5.ebuild 2839 RMD160 81fc8bc043c5b42c9921f887d0c1993ff6c0d3f6 SHA1 f427f15bc8d9dde797b298af735c6a3aa1077199 SHA256 7c234627b0b41f3b4d6c39d1c2e933a4d17afb4556ebdb7e1cd99fcc8523ea1b
-EBUILD oracle-instantclient-basic-10.2.0.3.ebuild 3529 RMD160 55e16ceeb489eca7ac71c41dc5d05054f31becf4 SHA1 708fcefbb3a8a0f44666aa20119423ff62b5f4c9 SHA256 c11bddbcb4e9090219c91e13a791df5968821d028a7fabc0ba64ebe9b08dbce7
-MISC ChangeLog 6056 RMD160 61f03c33ba65b17fc32285bdb7d07f92b2299801 SHA1 d12979f88946a864aabb44e0ced549c49e8ab8b9 SHA256 dc54108268f0a21223bb532389f3179ee428ef24f917538782915b6f3f14d869
+EBUILD oracle-instantclient-basic-10.2.0.3.ebuild 3847 RMD160 f55a60a26b4c58b04dab475e7aeee56b7f6e40a2 SHA1 50d48f660831082a335c9ebec104acdad186c303 SHA256 1618d0f6d1b0019d4d70bf0737643257e74a7ad1339bdeb0c2436f3a89bfbbaa
+MISC ChangeLog 6526 RMD160 32ccbcad1d4a94c213605048effd7746b030d68b SHA1 d184f7f48b02520424e4d4a6b5f432b09be60c80 SHA256 472d2b8d464aaae9e8a937a1e9d0b6aec0d71032ad9a99e5b1ec11bb2264fb42
 MISC metadata.xml 388 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 SHA1 f1cf715b4a7a2d39696097b2510967d640948075 SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893
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."
 }