Revbump. Use EAPI 4. Update homepage. Drop useless postinst info.

Add multilib support.
Fix installed makefile template for bug#165834 again.

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 265 insertions, 1 deletions

diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index 7975ed1832f6..c85e412500cc 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.44 2012/02/09 14:22:51 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.45 2012/03/07 14:07:46 haubi Exp $
+
+*oracle-instantclient-basic-11.2.0.3 (07 Mar 2012)
+
+  07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
+  +files/11.2.0.3-makefile.patch, +oracle-instantclient-basic-11.2.0.3.ebuild:
+  Revbump. Use EAPI 4. Update homepage. Drop useless postinst info.
+  Add multilib support.
+  Fix installed makefile template for bug#165834 again.
 
   09 Feb 2012; Michael Haubenwallner <haubi@gentoo.org> metadata.xml:
   Taking over maintainership.
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 000000000000..efcc2c6fac7c
--- /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 OBJS=$@.o 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/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 000000000000..fa59e9586f40
--- /dev/null
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2012 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.3.ebuild,v 1.1 2012/03/07 14:07:46 haubi Exp $
+
+EAPI="4"
+
+inherit eutils
+
+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="~x86 ~amd64"
+RESTRICT="fetch"
+IUSE="multilib"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/libaio"
+
+S="${WORKDIR}"
+
+default_abi() {
+	[[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${DEFAULT_ABI}
+}
+
+# install SDK for the default ABI only
+need_sdk_for_abi() {
+	[[ $1 == $(default_abi) ]]
+}
+
+abi_list() {
+	if use multilib; then
+		echo ${MULTILIB_ABIS}
+	elif [[ ${DEFAULT_MULTILIB} == default ]]; then
+		# no multilib-able platform
+		echo ${ARCH}
+	else
+		echo ${DEFAULT_ABI}
+	fi
+	return 0
+}
+
+set_abivars() {
+	local abi=$1
+	# platform name
+	MY_PLAT=MY_PLAT_${abi}
+	MY_PLAT=${!MY_PLAT}
+	# platform bitwidth
+	MY_BITS=MY_BITS_${abi}
+	MY_BITS=${!MY_BITS}
+	# runtime distfile
+	MY_A=MY_A_${abi}
+	MY_A=${!MY_A}
+	# sdk distfile
+	MY_ASDK=MY_ASDK_${abi}
+	MY_ASDK=${!MY_ASDK}
+	# abi sourcedir
+	MY_S="${S}/${abi}/instantclient_11_2"
+	# abi libdir
+	MY_LIBDIR=$(ABI=${abi} get_libdir)
+}
+
+pkg_nofetch() {
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE%/*}/index-097480.html"
+	eerror "  and download"
+	local abi
+	for abi in $(abi_list)
+	do
+		set_abivars ${abi}
+		eerror "Instant Client for ${MY_PLAT}"
+		eerror "    Basic: ${MY_A}"
+		if need_sdk_for_abi ${abi}; then
+			eerror "    SDK:   ${MY_ASDK}"
+		fi
+	done
+	eerror "After downloading, put them in:"
+	eerror "    ${DISTDIR}/"
+}
+
+src_unpack() {
+	local abi
+	for abi in $(abi_list)
+	do
+		set_abivars ${abi}
+		mkdir -p "${MY_S%/*}" || die
+		cd "${MY_S%/*}" || die
+		unpack ${MY_A}
+		if need_sdk_for_abi ${abi}; then
+			unpack ${MY_ASDK}
+		fi
+	done
+}
+
+src_prepare() {
+	set_abivars $(default_abi)
+	cd "${MY_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 abi ldpath=
+	for abi in $(abi_list)
+	do
+		set_abivars ${abi}
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		# shared libraries
+		ABI=${abi} dolib.so lib*$(get_libname)*
+
+		# ensure to be linkable
+		[[ -e libocci$(get_libname) ]] ||
+		dosym libocci$(get_libname 11.1) \
+			"${oracle_home}"/${MY_LIBDIR}/libocci$(get_libname)
+		[[ -e libclntsh$(get_libname) ]] ||
+		dosym libclntsh$(get_libname 11.1) \
+			"${oracle_home}"/${MY_LIBDIR}/libclntsh$(get_libname)
+
+		# java archives
+		insinto "${oracle_home}"/${MY_LIBDIR}
+		doins *.jar
+
+		# runtime library path
+		ldpath+=${ldpath:+:}${oracle_home}/${MY_LIBDIR}
+
+		eend $?
+	done
+
+	# ensure ORACLE_HOME/lib exists
+	[[ -e ${D}${oracle_home}/lib ]] ||
+	dosym $(get_libdir) "${oracle_home}"/lib
+
+	# SDK is for the default abi only
+	set_abivars $(default_abi)
+
+	einfo "Installing SDK ..."
+	cd "${MY_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
+	dodir /etc/oracle
+
+	# Add OCI libs to library path
+	{
+		echo "ORACLE_HOME=${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 "TNS_ADMIN has been set to ${ROOT}etc/oracle by default,"
+	elog "put your tnsnames.ora there or configure TNS_ADMIN"
+	elog "to point to your user specific configuration."
+}