commit:     68fcf11d4db5454e85386e9f666235aa4fbf6d74
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 19:48:34 2018 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 19:51:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fcf11d

Revert "dev-db/oracle-instantclient-basic: cleanup old"

This reverts commit 5719cacb8b4d4f2b0d40e92e667a7c940de1b319.

There have been stable keywords around.

 dev-db/oracle-instantclient-basic/Manifest         |   8 +
 .../files/11.2.0.3-makefile.patch                  |  57 ++++++
 .../files/tnsnames.ora.sample                      |  93 ++++++++++
 .../oracle-instantclient-basic-11.2.0.3.ebuild     | 197 ++++++++++++++++++++
 .../oracle-instantclient-basic-11.2.0.4.ebuild     | 199 +++++++++++++++++++++
 5 files changed, 554 insertions(+)

diff --git a/dev-db/oracle-instantclient-basic/Manifest 
b/dev-db/oracle-instantclient-basic/Manifest
new file mode 100644
index 00000000000..48135bfba5b
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -0,0 +1,8 @@
+DIST instantclient-basic-linux-11.2.0.3.0.zip 58502865 BLAKE2B 
da0f428447a4300dc64b9845d6f55c3dbeff38af06b1cb38b083f661a575a5c1749737ab389b7222f7be2a05ccdf367830642b1656505b078c0c3ca523159ae8
 SHA512 
c790f593e67bcc7c114a6287e1f064c03f292472e0a1a5e617a9f19017f06442f31502f66af8e6cfdf2235a18546104dc9aac164a3aa641db5728b66685c9302
+DIST instantclient-basic-linux-11.2.0.4.0.zip 58793148 BLAKE2B 
e0f92f119a5e8890a4507160179cd49af15ed14bd7c48480d3f685a3e4918a96e6444e75c6ea11d34681a6c66ff0e8011f44840de5f080e2dc3c03079361e4a1
 SHA512 
b333c9334e960617ac7cc68ad1c7b45f990d5c24c7a5bc8e51b3bc8ff6476acfb6a032521f75ba39327c71ee9676d1163b252066d52e97c1dfe9c092a92a62a0
+DIST instantclient-basic-linux.x64-11.2.0.3.0.zip 60331694 BLAKE2B 
8d3e4946c04edd515f0d2495e8ce25b152ded0d903d58244d0d2a2b8bbaf263b0de67829a932f637193c08e96f4a532c131f50b6594009ca4ee1dc228d6a06d1
 SHA512 
708940b5ca5bc4e0617da2c4da61d0a85834e3e0731ac328a201954558a624162f71d342d674b08ec2cf076e8f639c230f88a73f6d9bfe8908b0e76805e617b7
+DIST instantclient-basic-linux.x64-11.2.0.4.0.zip 60704657 BLAKE2B 
77735e81a0acf88221fefff38447536a81a32a6f5cb09dcd4526d43315be1fabb6882bb9e7a5703a4188ac9e112fba611f3e2c064a128eb66512935a1af62b33
 SHA512 
01ed32f1771bfa2f8ef1b81314843fb2b7b81582f33c07d86670c959bbb08355dc7cc8da586852bb353a3a914658d1e7828d6b5df884215de8d76881c956a989
+DIST instantclient-sdk-linux-11.2.0.3.0.zip 639306 BLAKE2B 
80d0cac2061156fd4cfe0792a7bebcaca77ce855335c651472d0ee74cf87350ae4925d92ecd12407b285605fb0d533dcf2a6dfc46d8a0eaa6172461e9c96dc2f
 SHA512 
fa0f98d4b2002982fab4438f734904e0ebfab777d601321423b454f9188c3b863e853fc5486c9958771f7ff8c9a544ce73e80750d745c3142872927ed1777ee1
+DIST instantclient-sdk-linux-11.2.0.4.0.zip 643080 BLAKE2B 
9ea15b227d260f7e24b572be1238074dc3a3033a2ab6313d95b750ae48468bda018c52ac604664caa128396024c0ff4bcbc0d401b7900ae27f5f3877a4b44123
 SHA512 
09e14a0ed88182b685a00b6370da4379710c4179fcf2d5ebdb43684b7099484122f7f5181a80352464f03ae9d0150f5c2ee5f20ede98faa9073294324b9faec8
+DIST instantclient-sdk-linux.x64-11.2.0.3.0.zip 641586 BLAKE2B 
b3a3fa4c362031aa9d9e926f852e2bccc41dd12c8dac0a18b707f22130a8bfc1b04e12c13b7f94a845439d922884d9f83c149ac0d59af498a73f4c74730be715
 SHA512 
08b3fdc68e09f262549e2505867943aff5c3927d158569ea7e0bca4f958af725a46143d325dcf80a6d48d09f9240f147470439ac55ea848a27df3eeedd28f732
+DIST instantclient-sdk-linux.x64-11.2.0.4.0.zip 643089 BLAKE2B 
710f0a2a81dde6cabdfb2e1472f40cb715d1e060377bec1d05d8b1c794ec05b023f4feca30603202487b52527723ed9d60f73371443ce76ad2781da9c1ed5412
 SHA512 
7198ddc7d8804353900e45b36de79659d75dee0197c4dd58bd4d69408e7131c95025223bbd1f39ef208269bff379daa6e05f4371af83a82b83997cafadc1d642

diff --git a/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch 
b/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch
new file mode 100644
index 00000000000..efcc2c6fac7
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch
@@ -0,0 +1,57 @@
+Fake demo_xe.mk found in Oracle eXpress Edition,
+known by CPAN DBD::Oracle (bug#165834).
+This provides absolute paths for headers and libraries.
+
+Paranoia drops those REMOVE lines.
+--- sdk/demo/demo.mk.orig      2012-03-06 17:11:57.636990449 +0100
++++ sdk/demo/demo.mk   2012-03-06 17:19:37.985324293 +0100
+@@ -28,8 +28,9 @@
+ CC=/opt/SunProd/SUNWspro6.1/bin/CC
+ cc=/opt/SunProd/SUNWspro6.1/bin/cc
+ 
+-ICINCHOME=../
+-ICLIBHOME=../../
++LIBDIR=lib
++ICINCHOME=$(ORACLE_HOME)/
++ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
+ ICLIBPATH=-L$(ICLIBHOME)
+ THREADLIBS=-lthread
+ CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
+@@ -64,18 +64,18 @@
+ all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO)
+ 
+ buildoci: $(CLNCACHE) $(LIBCLNT) $(CDEMOOBJS)
+-      $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 
$(ICLIBHOME)libclntsh$(SO_EXT)
+-      $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT)
++#     $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 
$(ICLIBHOME)libclntsh$(SO_EXT)
++#     $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT)
+       $(CC) -o $(CDEMOEXE) $(LDFLAGS) $(CDEMOOBJS) $(CCLIB)
+-      $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+-      $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
++#     $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
++#     $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+ 
+ buildocci: $(CLNCACHE) $(LIBCLNT) $(OBJS)
+-      $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 
$(ICLIBHOME)libclntsh$(SO_EXT)
+-      $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT)
++#     $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 
$(ICLIBHOME)libclntsh$(SO_EXT)
++#     $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT)
+       $(CC) -o $(EXE) $(LDFLAGS) $(OBJS) $(CCLIB)
+-      $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+-      $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
++#     $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
++#     $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+ 
+ $(OCCIDEMO):
+       $(MAKE) -f $(MAKEFILE) buildocci [email protected] EXE=$@
+@@ -93,8 +93,8 @@
+ 
+ cleancache:
+       $(REMOVE) $(CACHEDIR)
+-      $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
+-      $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
++#     $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
++#     $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
+ 
+ clean: $(CLNCACHE)
+       $(REMOVE) cdemo81 cdemo81.o occidml occidml.o occiobj occiobj.o 
occiobjo* occiobjm* occiobj.h occiobjout.type

diff --git a/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample 
b/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample
new file mode 100644
index 00000000000..f0524f5993c
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample
@@ -0,0 +1,93 @@
+# This file contains the syntax information for 
+# the entries to be put in any tnsnames.ora file
+# The entries in this file are need based. 
+# There are no defaults for entries in this file
+# that Sqlnet/Net3 use that need to be overridden 
+#
+# Typically you could have two tnsnames.ora files
+# in the system, one that is set for the entire system
+# and is called the system tnsnames.ora file, and a
+# second file that is used by each user locally so that
+# he can override the definitions dictated by the system
+# tnsnames.ora file.
+
+# The entries in tnsnames.ora are an alternative to using
+# the names server with the onames adapter.
+# They are a collection of aliases for the addresses that 
+# the listener(s) is(are) listening for a database or 
+# several databases.
+
+# The following is the general syntax for any entry in 
+# a tnsnames.ora file. There could be several such entries 
+# tailored to the user's needs.
+
+<alias>= [ (DESCRIPTION_LIST =  # Optional depending on whether u have 
+                               # one or more descriptions
+                               # If there is just one description, unnecessary 
]
+         (DESCRIPTION=
+           [ (SDU=2048) ]      # Optional, defaults to 2048
+                               # Can take values between 512 and 32K
+           [ (ADDRESS_LIST=    # Optional depending on whether u have
+                               # one or more addresses
+                               # If there is just one address, unnecessary ]
+             (ADDRESS=
+               [ (COMMUNITY=<community_name>) ] 
+               (PROTOCOL=tcp)
+               (HOST=<hostname>)
+               (PORT=<portnumber (1521 is a standard port used)>)
+             )
+             [ (ADDRESS=
+                 (PROTOCOL=ipc)
+                 (KEY=<ipckey (PNPKEY is a standard key used)>)        
+               )
+             ]
+             [ (ADDRESS=
+                 [ (COMMUNITY=<community_name>) ]
+                 (PROTOCOL=decnet)
+                 (NODE=<nodename>)
+                 (OBJECT=<objectname>)
+               )
+             ]
+              ... # More addresses
+           [ ) ] # Optional depending on whether ADDRESS_LIST is used or not 
+           [ (CONNECT_DATA=
+               (SID=<oracle_sid>)
+               [ (GLOBAL_NAME=<global_database_name>) ]
+             )
+           ]
+           [ (SOURCE_ROUTE=yes) ]  
+         )
+         (DESCRIPTION=     
+           [ (SDU=2048) ]      # Optional, defaults to 2048
+                               # Can take values between 512 and 32K
+           [ (ADDRESS_LIST= ]  # Optional depending on whether u have more
+                               # than one address or not
+                               # If there is just one address, unnecessary
+             (ADDRESS
+               [ (COMMUNITY=<community_name>) ]
+               (PROTOCOL=tcp)
+               (HOST=<hostname>)
+               (PORT=<portnumber (1521 is a standard port used)>)
+             )
+             [ (ADDRESS=
+                 (PROTOCOL=ipc)
+                 (KEY=<ipckey (PNPKEY is a standard key used)>)
+                )
+             ]
+             ...               # More addresses
+           [ ) ]               # Optional depending on whether ADDRESS_LIST  
+                               # is being used
+           [ (CONNECT_DATA=
+               (SID=<oracle_sid>)
+               [ (GLOBAL_NAME=<global_database_name>) ]
+             )
+           ]
+           [ (SOURCE_ROUTE=yes) ]
+         )
+         [ (CONNECT_DATA=
+             (SID=<oracle_sid>)
+             [ (GLOBAL_NAME=<global_database_name>) ]
+           )
+         ]
+         ...   # More descriptions 
+       [ ) ]   # Optional depending on whether DESCRIPTION_LIST is used or not

diff --git 
a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild 
b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
new file mode 100644
index 00000000000..a63d14bc52b
--- /dev/null
+++ 
b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils multilib
+
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
+MY_ASDK_x86="${MY_A_x86/basic/sdk}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${PN/oracle-}-linux.x64-${PV}.0.zip"
+MY_ASDK_amd64="${MY_A_amd64/basic/sdk}"
+
+DESCRIPTION="Oracle 11g Instant Client with SDK"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html";
+SRC_URI="
+       x86?   ( ${MY_A_x86}   ${MY_ASDK_x86}                             )
+       amd64? ( ${MY_A_amd64} ${MY_ASDK_amd64} multilib? ( ${MY_A_x86} ) )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch"
+IUSE="multilib"
+
+EMULTILIB_PKG="true"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+       dev-libs/libaio
+       multilib? ( >=dev-libs/libaio-0.3.109-r3 )
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
+
+set_my_abivars() {
+       S="${WORKDIR}/${ABI}/instantclient_11_2"
+
+       local abi=${ABI}
+       [[ ${abi} == 'default' ]] && abi=${ARCH}
+       MY_PLAT=MY_PLAT_${abi}; MY_PLAT=${!MY_PLAT} # platform name
+       MY_BITS=MY_BITS_${abi}; MY_BITS=${!MY_BITS} # platform bitwidth
+       MY_A=MY_A_${abi}      ; MY_A=${!MY_A}       # runtime distfile
+       MY_ASDK=MY_ASDK_${abi}; MY_ASDK=${!MY_ASDK} # sdk distfile
+
+       [[ -n ${MY_PLAT} ]]
+}
+
+oic_distfile_status() {
+       if [[ -r ${DISTDIR}/${1} ]]; then
+               echo "already here"
+       else
+               echo "still absent"
+       fi
+}
+
+pkg_nofetch() {
+       eerror "Please go to"
+       eerror "  ${HOMEPAGE%/*}/index-097480.html"
+       eerror "  and download"
+       for ABI in $(get_install_abis)
+       do
+               set_my_abivars || continue
+               eerror "Instant Client for ${MY_PLAT}"
+               eerror "    Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}"
+               if is_final_abi; then
+                       eerror "    SDK:   ($(oic_distfile_status ${MY_ASDK})) 
${MY_ASDK}"
+               fi
+       done
+       eerror "After downloading these files (for *all* shown architectures), 
put them in:"
+       eerror "    ${DISTDIR}/"
+}
+
+src_unpack() {
+       for ABI in $(get_install_abis)
+       do
+               set_my_abivars || continue
+               mkdir "${WORKDIR}"/${ABI} || die
+               cd "${WORKDIR}"/${ABI} || die
+               unpack ${MY_A}
+               if is_final_abi; then
+                       unpack ${MY_ASDK}
+               fi
+       done
+}
+
+src_prepare() {
+       # need to patch for the final ABI only
+       set_my_abivars || die "${ABI} ABI not supported!"
+       cd "${S}" || die
+       epatch "${FILESDIR}"/11.2.0.3-makefile.patch
+}
+
+src_install() {
+       # all binaries go here
+       local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
+       into "${oracle_home}"
+
+       local ldpath=
+       for ABI in $(get_install_abis) # last iteration is final ABI
+       do
+               if ! set_my_abivars; then
+                       elog "Skipping unsupported ABI ${ABI}."
+                       continue
+               fi
+               einfo "Installing runtime for ${MY_PLAT} ..."
+
+               cd "${S}" || die
+
+               # shared libraries
+               dolib.so lib*$(get_libname)*
+
+               # ensure to be linkable
+               [[ -e libocci$(get_libname) ]] ||
+               dosym libocci$(get_libname 11.1) \
+                       "${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+               [[ -e libclntsh$(get_libname) ]] ||
+               dosym libclntsh$(get_libname 11.1) \
+                       "${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+               # java archives
+               insinto "${oracle_home}"/$(get_libdir)
+               doins *.jar
+
+               # runtime library path
+               ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+               eend $?
+       done
+
+       # ensure ORACLE_HOME/lib exists
+       [[ -e ${ED}${oracle_home}/lib ]] ||
+       dosym $(get_libdir) "${oracle_home}"/lib
+
+       einfo "Installing SDK ..."
+       cd "${S}"/sdk || die
+
+       # SDK makefile, for #165834
+       # As we change the relative filesystem layout compared
+       # to vanilla instantclient.zip content, it feels easier
+       # to fake the layout found in Oracle eXpress Edition.
+       # Both layouts are known to DBD::Oracle (cpan).
+       insinto "${oracle_home}"/rdbms/demo
+       newins demo/demo.mk demo_xe.mk
+
+       # Remove ldap.h, #299562
+       rm include/ldap.h || die
+       # DBD::Oracle needs rdbms/public as real directory
+       insinto "${oracle_home}"/rdbms/public
+       doins include/*.h
+       dosym rdbms/public "${oracle_home}"/include
+       # ruby-oci8 expects the headers here
+       dosym "${oracle_home}"/rdbms/public /usr/include/oracle/${PV}/client
+
+       dodoc demo/*
+
+       eend $?
+
+       # create path for tnsnames.ora
+       insinto /etc/oracle
+       doins "${FILESDIR}"/tnsnames.ora.sample
+
+       # Add OCI libs to library path
+       {
+               echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+               echo "LDPATH=${ldpath}"
+# who does need this?
+#              echo "C_INCLUDE_PATH=${oracle_home}/include"
+               echo "TNS_ADMIN=/etc/oracle/"
+       } > "${T}"/50oracle-instantclient-basic
+       doenvd "${T}"/50oracle-instantclient-basic
+}
+
+pkg_postinst() {
+       elog "${P} does not provide an sqlnet.ora"
+       elog "configuration file, redirecting oracle diagnostics for database-"
+       elog "and network-issues into ~USER/oradiag_USER/ instead."
+       elog "It should be safe to ignore this message in sqlnet.log there:"
+       elog "   Directory does not exist for read/write 
[ORACLE_HOME/client/log] []"
+       elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+       elog "If you want to directly analyse low-level debug info or don't 
want"
+       elog "to see it at all, so you really need an sqlnet.ora file, please"
+       elog "consult http://search.oracle.com/search/search?q=sqlnet.ora";
+       elog ""
+       elog "TNS_ADMIN has been set to ${EROOT}etc/oracle by default,"
+       elog "put your tnsnames.ora there or configure TNS_ADMIN"
+       elog "to point to your user specific configuration."
+       ewarn "Please re-source your shell settings for ORACLE_HOME"
+       ewarn "  changes, such as: source /etc/profile"
+}

diff --git 
a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild 
b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
new file mode 100644
index 00000000000..0dfbc639543
--- /dev/null
+++ 
b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils multilib-minimal
+
+MY_PLAT_x86="Linux x86"
+MY_BITS_x86=32
+MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
+MY_ASDK_x86="${MY_A_x86/basic/sdk}"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_BITS_amd64=64
+MY_A_amd64="${PN/oracle-}-linux.x64-${PV}.0.zip"
+MY_ASDK_amd64="${MY_A_amd64/basic/sdk}"
+
+DESCRIPTION="Oracle 11g Instant Client with SDK"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html";
+SRC_URI="
+       abi_x86_32? ( ${MY_A_x86} !abi_x86_64? ( ${MY_ASDK_x86} ) )
+       abi_x86_64? ( ${MY_A_amd64} ${MY_ASDK_amd64} )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch splitdebug"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
+
+set_my_abivars() {
+       S="${WORKDIR}/${ABI}/instantclient_11_2"
+
+       local abi=${ABI}
+       [[ ${abi} == 'default' ]] && abi=${ARCH}
+       MY_PLAT=MY_PLAT_${abi}; MY_PLAT=${!MY_PLAT} # platform name
+       MY_BITS=MY_BITS_${abi}; MY_BITS=${!MY_BITS} # platform bitwidth
+       MY_A=MY_A_${abi}      ; MY_A=${!MY_A}       # runtime distfile
+       MY_ASDK=MY_ASDK_${abi}; MY_ASDK=${!MY_ASDK} # sdk distfile
+
+       [[ -n ${MY_PLAT} ]]
+}
+
+oic_distfile_status() {
+       if [[ -r ${DISTDIR}/${1} ]]; then
+               echo "already here"
+       else
+               echo "still absent"
+       fi
+}
+
+pkg_nofetch() {
+       eerror "Please go to"
+       eerror "  ${HOMEPAGE%/*}/index-097480.html"
+       eerror "  and download"
+       local ABI
+       for ABI in $(multilib_get_enabled_abis)
+       do
+               set_my_abivars || continue
+               eerror "Instant Client for ${MY_PLAT}"
+               eerror "    Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}"
+               multilib_is_native_abi &&
+               eerror "    SDK:   ($(oic_distfile_status ${MY_ASDK})) 
${MY_ASDK}"
+       done
+       eerror "After downloading these files (for *all* shown architectures), 
put them in:"
+       eerror "    ${DISTDIR}/"
+}
+
+src_unpack() {
+       local ABI
+       for ABI in $(multilib_get_enabled_abis)
+       do
+               set_my_abivars || continue
+               mkdir "${WORKDIR}"/${ABI} || die
+               cd "${WORKDIR}"/${ABI} || die
+               unpack ${MY_A}
+               multilib_is_native_abi &&
+               unpack ${MY_ASDK}
+       done
+}
+
+src_prepare() {
+       local ABI
+       for ABI in $(multilib_get_enabled_abis)
+       do : # need to patch for the final ABI only
+       done
+       set_my_abivars || die "${ABI} ABI not supported!"
+       cd "${S}" || die
+       epatch "${FILESDIR}"/11.2.0.3-makefile.patch
+}
+
+# suppress configure&compile messages from multilib-minimal
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+       # all binaries go here
+       local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
+       into "${oracle_home}"
+
+       local ldpath= ABI
+       for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
+       do
+               if ! set_my_abivars; then
+                       elog "Skipping unsupported ABI ${ABI}."
+                       continue
+               fi
+               einfo "Installing runtime for ${MY_PLAT} ..."
+
+               cd "${S}" || die
+
+               # shared libraries
+               dolib.so lib*$(get_libname)*
+
+               # ensure to be linkable
+               [[ -e libocci$(get_libname) ]] ||
+               dosym libocci$(get_libname 11.1) \
+                       "${oracle_home}"/$(get_libdir)/libocci$(get_libname)
+               [[ -e libclntsh$(get_libname) ]] ||
+               dosym libclntsh$(get_libname 11.1) \
+                       "${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
+
+               # java archives
+               insinto "${oracle_home}"/$(get_libdir)
+               doins *.jar
+
+               # runtime library path
+               ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
+
+               eend $?
+       done
+
+       # ensure ORACLE_HOME/lib exists
+       [[ -e ${ED}${oracle_home}/lib ]] ||
+       dosym $(get_libdir) "${oracle_home}"/lib
+
+       einfo "Installing SDK ..."
+       cd "${S}"/sdk || die
+
+       # SDK makefile, for #165834
+       # As we change the relative filesystem layout compared
+       # to vanilla instantclient.zip content, it feels easier
+       # to fake the layout found in Oracle eXpress Edition.
+       # Both layouts are known to DBD::Oracle (cpan).
+       insinto "${oracle_home}"/rdbms/demo
+       newins demo/demo.mk demo_xe.mk
+
+       # Remove ldap.h, #299562
+       rm include/ldap.h || die
+       # DBD::Oracle needs rdbms/public as real directory
+       insinto "${oracle_home}"/rdbms/public
+       doins include/*.h
+       dosym rdbms/public "${oracle_home}"/include
+       # ruby-oci8 expects the headers here
+       dosym "${oracle_home}"/rdbms/public /usr/include/oracle/${PV}/client
+
+       dodoc demo/*
+
+       eend $?
+
+       # create path for tnsnames.ora
+       insinto /etc/oracle
+       doins "${FILESDIR}"/tnsnames.ora.sample
+
+       # Add OCI libs to library path
+       {
+               echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
+               echo "LDPATH=${ldpath}"
+# who does need this?
+#              echo "C_INCLUDE_PATH=${oracle_home}/include"
+               echo "TNS_ADMIN=/etc/oracle/"
+       } > "${T}"/50oracle-instantclient-basic
+       doenvd "${T}"/50oracle-instantclient-basic
+}
+
+pkg_postinst() {
+       elog "${P} does not provide an sqlnet.ora"
+       elog "configuration file, redirecting oracle diagnostics for database-"
+       elog "and network-issues into ~USER/oradiag_USER/ instead."
+       elog "It should be safe to ignore this message in sqlnet.log there:"
+       elog "   Directory does not exist for read/write 
[ORACLE_HOME/client/log] []"
+       elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
+       elog "If you want to directly analyse low-level debug info or don't 
want"
+       elog "to see it at all, so you really need an sqlnet.ora file, please"
+       elog "consult http://search.oracle.com/search/search?q=sqlnet.ora";
+       elog ""
+       elog "TNS_ADMIN has been set to ${EROOT}etc/oracle by default,"
+       elog "put your tnsnames.ora there or configure TNS_ADMIN"
+       elog "to point to your user specific configuration."
+       ewarn "Please re-source your shell settings for ORACLE_HOME"
+       ewarn "  changes, such as: source /etc/profile"
+}

Reply via email to