+oracle-instantclient-basic-11.2.0.4: Revbump. Fix bugs #505522, #505536. Convert to USE abi_x86_*, #506228.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A630CCB8)

2 files changed, 205 insertions, 2 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index e859bc69db5d..5cd5ee2dbb90 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 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.56 2013/11/11 09:35:34 haubi Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.57 2014/04/04 08:19:10 haubi Exp $
+
+*oracle-instantclient-basic-11.2.0.4 (04 Apr 2014)
+
+  04 Apr 2014; Michael Haubenwallner <haubi@gentoo.org>
+  +oracle-instantclient-basic-11.2.0.4.ebuild:
+  Revbump. Fix bugs #505522, #505536. Convert to USE abi_x86_*, #506228.
 
   11 Nov 2013; Michael Haubenwallner <haubi@gentoo.org>
   oracle-instantclient-basic-11.2.0.3.ebuild:
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 000000000000..bd747a602087
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2014 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-11.2.0.4.ebuild,v 1.1 2014/04/04 08:19:10 haubi Exp $
+
+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() {
+	# 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
+}
+
+# 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"
+}