Merge updates from master

21 files changed, 1286 insertions, 79 deletions

diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
new file mode 100644
index 000000000000..48135bfba5bb
--- /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 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/files/tnsnames.ora.sample b/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample
new file mode 100644
index 000000000000..f0524f5993cd
--- /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 000000000000..a63d14bc52b8
--- /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 000000000000..0dfbc6395439
--- /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"
+}
diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
new file mode 100644
index 000000000000..d92783f21616
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -0,0 +1,4 @@
+DIST instantclient-jdbc-linux-11.2.0.3.0.zip 1562543 BLAKE2B 7f32c39cb7c4fbdd54db0015e081bc8d913e9570c4651d2e41f17155f2a77772826ec823adaf36b44d1264ff686c3735835a483f3cd1551a1f5274c028692fd3 SHA512 f78991e57eed2b095e8659825723bfc107d3c4519d1864769a0190f22e3d5667a1a4213a067470a8fb07c1f0562ec950c9fbe37f70e9475811dd1edfaf3f17f0
+DIST instantclient-jdbc-linux-11.2.0.4.0.zip 1562440 BLAKE2B e3f377802958b22aede4d91c9bc16a85f5c0ff2cec3066a4a49f5c71ab90c17f9b7c6f29da146304327569cb3d5d533a3807941e4061254e0cf57a8387a55b04 SHA512 0a92a6529642203d48846d3f22f3756ada22942ea5e7c36d779d220dc7195301d4016edd8ee5124f9e51429bb77d9890602c1a18884eec58ff40c2aed24e55f9
+DIST instantclient-jdbc-linux.x64-11.2.0.3.0.zip 1562504 BLAKE2B 07f0753ff2add12924d05c6a4b4d07356726c7ca7d8a3118e0d65bf30db04eb89aeb0255591583714cd168782313eb083764d6ca9ed64b2081dc119c46222114 SHA512 afb824786e01f316dfa244e304fae7d9a34f4175de8ff6622bed116a9810bfca9ec5eceda6a1de95d46f7170fb63f1345dc1886efd168f1daa8c8498d2b3c8d7
+DIST instantclient-jdbc-linux.x64-11.2.0.4.0.zip 1562474 BLAKE2B f93a05ad324bb364ddab83b0bc75f6c0bc8d7224f53cf337c9887f99e07c98a8752e7d4581b19ca38c70bbe3fcf1b492d753f715bed7ba8144f37c03cc9524c0 SHA512 289a08bddc81687b73a42fb35ae6ea294dd8f536ae9d3e95142ab78ad72eeebf66947fa6f5585e48e35b7f92e65fe6a295fb564b8353d389e76bfecf35c48c18
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild
new file mode 100644
index 000000000000..303d9dbd2c5b
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils multilib
+
+MY_PLAT_x86="Linux x86"
+MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
+
+DESCRIPTION="Oracle 11g Instant Client: JDBC supplement"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+SRC_URI="
+	x86?   ( ${MY_A_x86}                             )
+	amd64? ( ${MY_A_amd64} multilib? ( ${MY_A_x86} ) )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch"
+IUSE="multilib"
+
+DEPEND="app-arch/unzip"
+RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
+
+default_abi() {
+	[[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${DEFAULT_ABI}
+}
+
+abi_list() {
+	if use multilib; then
+		echo ${MULTILIB_ABIS}
+	else
+		default_abi
+	fi
+	return 0
+}
+
+set_abivars() {
+	local abi=$1
+	# platform name
+	MY_PLAT=MY_PLAT_${abi}
+	MY_PLAT=${!MY_PLAT}
+	# runtime distfile
+	MY_A=MY_A_${abi}
+	MY_A=${!MY_A}
+	# abi sourcedir
+	MY_S="${S}/${abi}/instantclient_11_2"
+	# ABI might not need to be set at all
+	[[ -n ${ABI} ]] && MY_ABI=${abi} || MY_ABI=
+	# abi libdir
+	MY_LIBDIR=$(ABI=${MY_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 "    JDBC: ${MY_A}"
+	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}
+	done
+}
+
+src_install() {
+	# all binaries go here
+	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
+	into "${oracle_home}"
+
+	local abi
+	for abi in $(abi_list)
+	do
+		set_abivars ${abi}
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		ABI=${MY_ABI} dolib.so lib*$(get_libname)*
+
+		insinto "${oracle_home}"/${MY_LIBDIR}
+		doins *.jar
+
+		eend $?
+	done
+}
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild
new file mode 100644
index 000000000000..75696a7a33b6
--- /dev/null
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild
@@ -0,0 +1,92 @@
+# 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_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
+
+DESCRIPTION="Oracle 11g Instant Client: JDBC supplement"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+SRC_URI="
+	abi_x86_32? ( ${MY_A_x86}   )
+	abi_x86_64? ( ${MY_A_amd64} )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch splitdebug"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
+
+set_my_abivars() {
+	MY_PLAT=MY_PLAT_${ABI}; MY_PLAT=${!MY_PLAT} # platform name
+	MY_A=MY_A_${ABI}      ; MY_A=${!MY_A}       # runtime distfile
+	# ABI sourcedir
+	MY_S="${S}/${ABI}/instantclient_11_2"
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+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 "    JDBC: ${MY_A}"
+	done
+	eerror "After downloading, put them in:"
+	eerror "    ${DISTDIR}/"
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_S%/*}" || die
+		cd "${MY_S%/*}" || die
+		unpack ${MY_A}
+	done
+}
+
+src_install() {
+	# all binaries go here
+	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
+	into "${oracle_home}"
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		dolib.so lib*$(get_libname)*
+
+		insinto "${oracle_home}"/$(get_libdir)
+		doins *.jar
+
+		eend $?
+	done
+}
diff --git a/dev-db/oracle-instantclient-odbc/Manifest b/dev-db/oracle-instantclient-odbc/Manifest
new file mode 100644
index 000000000000..b18e4f9979f2
--- /dev/null
+++ b/dev-db/oracle-instantclient-odbc/Manifest
@@ -0,0 +1,4 @@
+DIST instantclient-odbc-linux-11.2.0.3.0.zip 273840 BLAKE2B 54fd920bb69a12f2df387e89907c6c2a64f05fd611cb53737d6773752c3a08fbe4cb36cc43017a62e7861cd6245b4d92cbf635fabc921c0aeeaa8d00f9e012d5 SHA512 4d928e9eb3deb26db7a95a0e5417bd9355e97956d9394dc2792752fd45002b0abc3463fbb7f337f4731084aa6006d1ff635443c5503f94c6bd97d1bae7245885
+DIST instantclient-odbc-linux-11.2.0.4.0.zip 274999 BLAKE2B 33855608fcd61a7f4ebcab3f969b028069d636d5a709676c07733aeb20dcb4335f485844ec72cb0816307e36c7f0b6748c08ea6e5c67c853999ddc1b0c23eae8 SHA512 64d75c6f9aa4e5b74da12a2a293e6ee7017017a12a724596d51606d3a8d7a9d9653c158d389a5faeb02893ca6a6a93650605d71f885f9439427847583f5cc820
+DIST instantclient-odbc-linux.x64-11.2.0.3.0.zip 309061 BLAKE2B 9ddd2569364a383f525052d4c795c423ed4b44a588ec4e11e5f5130604b6d74b4ede2afdb326023d8a0167b1522669c9acc6f9e74928423f62d08c93404cd98d SHA512 a18c040fc780f893ea22fd6c79b3299d9327975a768a6518622a8ff522dd29a7019494ca7a1227483098f13afe1af1655611a32e06806bab94ab2fce2dc55e3a
+DIST instantclient-odbc-linux.x64-11.2.0.4.0.zip 310560 BLAKE2B dc97373ac00f07b4d02beb45ed053d5aa8909fc380990426c118e3fb42b08e8e5e699a518aa137b3fe159107c73929e61d59c997e741a343803f5c26036adf9b SHA512 19f999207e5ea2b5db18b40c0eb40c6ec1ea8a3117915a723338e5c423122b747c5e371446d631c00a5c01005453f85da1d2e680a2c1771a495dc0b68812df69
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
new file mode 100644
index 000000000000..e0fbfdf509ab
--- /dev/null
+++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils multilib
+
+MY_PLAT_x86="Linux x86"
+MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
+
+DESCRIPTION="Oracle 11g Instant Client: ODBC supplement"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+SRC_URI="
+	x86?   ( ${MY_A_x86}                             )
+	amd64? ( ${MY_A_amd64} multilib? ( ${MY_A_x86} ) )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch"
+IUSE="multilib"
+
+DEPEND="app-arch/unzip"
+RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
+
+default_abi() {
+	[[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${DEFAULT_ABI}
+}
+
+abi_list() {
+	if use multilib; then
+		echo ${MULTILIB_ABIS}
+	else
+		default_abi
+	fi
+	return 0
+}
+
+set_abivars() {
+	local abi=$1
+	# platform name
+	MY_PLAT=MY_PLAT_${abi}
+	MY_PLAT=${!MY_PLAT}
+	# runtime distfile
+	MY_A=MY_A_${abi}
+	MY_A=${!MY_A}
+	# abi sourcedir
+	MY_S="${S}/${abi}/instantclient_11_2"
+	# ABI might not need to be set at all
+	[[ -n ${ABI} ]] && MY_ABI=${abi} || MY_ABI=
+	# abi libdir
+	MY_LIBDIR=$(ABI=${MY_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 "    ODBC: ${MY_A}"
+	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}
+	done
+}
+
+src_install() {
+	# all binaries go here
+	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
+	into "${oracle_home}"
+
+	local abi
+	for abi in $(abi_list)
+	do
+		set_abivars ${abi}
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		ABI=${MY_ABI} dolib.so libsqora*$(get_libname)*
+
+		# ensure to be linkable
+		[[ -e libsqora$(get_libname) ]] ||
+		dosym libsqora$(get_libname 11.1) \
+			"${oracle_home}"/${MY_LIBDIR}/libsqora$(get_libname)
+
+		eend $?
+	done
+
+	set_abivars $(default_abi)
+	cd "${MY_S}" || die
+	dobin odbc_update_ini.sh
+	dodoc *htm*
+}
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild
new file mode 100644
index 000000000000..716c88d51cad
--- /dev/null
+++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild
@@ -0,0 +1,96 @@
+# 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_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
+
+DESCRIPTION="Oracle 11g Instant Client: ODBC supplement"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+SRC_URI="
+	abi_x86_32? ( ${MY_A_x86}   )
+	abi_x86_64? ( ${MY_A_amd64} )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch splitdebug"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
+
+set_my_abivars() {
+	MY_PLAT=MY_PLAT_${ABI}; MY_PLAT=${!MY_PLAT} # platform name
+	MY_A=MY_A_${ABI}      ; MY_A=${!MY_A}       # runtime distfile
+	# ABI sourcedir
+	MY_S="${S}/${ABI}/instantclient_11_2"
+
+	[[ -n ${MY_PLAT} ]]
+}
+
+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 "    ODBC: ${MY_A}"
+	done
+	eerror "After downloading, put them in:"
+	eerror "    ${DISTDIR}/"
+}
+
+src_unpack() {
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		set_my_abivars || continue
+		mkdir -p "${MY_S%/*}" || die
+		cd "${MY_S%/*}" || die
+		unpack ${MY_A}
+	done
+}
+
+src_install() {
+	# all binaries go here
+	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
+	into "${oracle_home}"
+
+	local ABI
+	for ABI in $(multilib_get_enabled_abis)
+	do
+		if ! set_my_abivars; then
+			elog "Skipping unsupported ABI ${ABI}."
+			continue
+		fi
+		einfo "Installing runtime for ${MY_PLAT} ..."
+
+		cd "${MY_S}" || die
+
+		dolib.so libsqora*$(get_libname)*
+
+		# ensure to be linkable
+		[[ -e libsqora$(get_libname) ]] ||
+		dosym libsqora$(get_libname 11.1) "${oracle_home}"/$(get_libdir)/libsqora$(get_libname)
+
+		eend $?
+	done
+
+	dobin odbc_update_ini.sh
+	dodoc *htm*
+}
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
new file mode 100644
index 000000000000..6a0c1821c8b1
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -0,0 +1,4 @@
+DIST instantclient-sqlplus-linux-11.2.0.3.0.zip 796570 BLAKE2B 0492185103d5fb36f3acb8f52e937fca35bb8b7308eb9317d43f25f4fbde39f15b8b6de0fc9065d04c809a94731c7c011dcac1daf4e734405d065d9959cf215f SHA512 241d812b3955b11efba7764f463417e79dd973ce7ad0624144e661403b71b1c4fb091c6e42d05759eaf74355dfe432970375064d4018cae9ae67cd1401095460
+DIST instantclient-sqlplus-linux-11.2.0.4.0.zip 792608 BLAKE2B c3e8f0843700df9f95428b01520400d95076df5e19169f2a79982293e54ce6cc74321de0f34a0e7865d5d29535e38b60bcca127be06343c979a40985bf349012 SHA512 8f5ff27043a036eab038080bbdc056325cc2c197e12de34e74a8da17bf69b44e4fd4200b638881d86fdf1dc1450d8e1d033daaa56386bd2c8784d556ba0093ce
+DIST instantclient-sqlplus-linux.x64-11.2.0.3.0.zip 837574 BLAKE2B c1f123b68b60f211843af954e33922e46d05ff89ce68e8357a8839e7fce83cccc31ab3f16b87204343376657839fd582fb2c80be3148cc34f2340191ed261526 SHA512 55bbac5e8267a4de2c7f9f6750f0e38dcf7c775bccc2e1e05df7fda9e6ffa7d394776e605980d8b67176acf52ba88f2dcaa959934740a1ca6f91d10b12d14024
+DIST instantclient-sqlplus-linux.x64-11.2.0.4.0.zip 834491 BLAKE2B 487091d97c0f2ec383018c39a957c8a27b030c4c8754a6c2714237dc875b89b250b47dbd28ca228a98c6199323ddd031452e1cc90c60824fbcca536aa38bff1f SHA512 b7180b5667e604564cf379b9eb55a2fc8994b87cfb993e728b4c1bdd297cab134a55580018429bdbb2b101ebdf8a350bacc1ddf5a30e1cc419092054c79a108b
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild
new file mode 100644
index 000000000000..2af3e70ae266
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils multilib pax-utils
+
+MY_PLAT_x86="Linux x86"
+MY_A_x86="${PN#oracle-}-linux-${PV}.0.zip"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_A_amd64="${PN#oracle-}-linux.x64-${PV}.0.zip"
+
+DESCRIPTION="Oracle 11g Instant Client: SQL*Plus"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+SRC_URI="
+	x86?   ( ${MY_A_x86}   )
+	amd64? ( ${MY_A_amd64} )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
+
+S="${WORKDIR}"/instantclient_11_2
+
+QA_PREBUILT="
+	usr/lib*/oracle/${PV}/client/lib*/lib*
+	usr/lib*/oracle/${PV}/client/bin/sqlplus
+"
+
+my_arch() {
+	# platform name
+	MY_PLAT=MY_PLAT_${ARCH}
+	export MY_PLAT=${!MY_PLAT}
+	# distfile
+	MY_A=MY_A_${ARCH}
+	export MY_A=${!MY_A}
+}
+
+pkg_nofetch() {
+	my_arch
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE%/*}/index-097480.html"
+	eerror "  and download"
+	eerror "Instant Client for ${MY_PLAT}"
+	eerror "    SQL*Plus: ${MY_A}"
+	eerror "After downloading, put it in:"
+	eerror "  ${DISTDIR}/"
+}
+
+src_install() {
+	# all binaries go here
+	local oracle_home=usr/$(get_libdir)/oracle/${PV}/client
+	into /"${oracle_home}"
+
+	dolib.so libsqlplus$(get_libname) libsqlplusic$(get_libname)
+	dobin sqlplus
+
+	insinto /"${oracle_home}"/sqlplus/admin
+	doins glogin.sql
+
+	pax-mark -c "${ED}${oracle_home}"/bin/sqlplus || die
+
+	dosym /"${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+}
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
new file mode 100644
index 000000000000..6df81c9c2bec
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils multilib
+
+MY_PLAT_x86="Linux x86"
+MY_A_x86="${PN#oracle-}-linux-${PV}.0.zip"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_A_amd64="${PN#oracle-}-linux.x64-${PV}.0.zip"
+
+DESCRIPTION="Oracle 11g Instant Client: SQL*Plus"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+SRC_URI="
+	x86?   ( ${MY_A_x86}   )
+	amd64? ( ${MY_A_amd64} )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
+
+S="${WORKDIR}"/instantclient_11_2
+
+QA_PREBUILT="
+	usr/lib*/oracle/${PV}/client/lib*/lib*
+	usr/lib*/oracle/${PV}/client/bin/sqlplus
+"
+
+my_arch() {
+	# platform name
+	MY_PLAT=MY_PLAT_${ARCH}
+	export MY_PLAT=${!MY_PLAT}
+	# distfile
+	MY_A=MY_A_${ARCH}
+	export MY_A=${!MY_A}
+}
+
+pkg_nofetch() {
+	my_arch
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE%/*}/index-097480.html"
+	eerror "  and download"
+	eerror "Instant Client for ${MY_PLAT}"
+	eerror "    SQL*Plus: ${MY_A}"
+	eerror "After downloading, put it in:"
+	eerror "  ${DISTDIR}/"
+}
+
+src_install() {
+	# all binaries go here
+	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
+	into "${oracle_home}"
+
+	dolib.so libsqlplus$(get_libname) libsqlplusic$(get_libname)
+	dobin sqlplus
+
+	insinto "${oracle_home}"/sqlplus/admin
+	doins glogin.sql
+
+	dosym "${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+}
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild
new file mode 100644
index 000000000000..8cb35bf91e1f
--- /dev/null
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils pax-utils
+
+MY_PLAT_x86="Linux x86"
+MY_A_x86="${PN#oracle-}-linux-${PV}.0.zip"
+
+MY_PLAT_amd64="Linux x86-64"
+MY_A_amd64="${PN#oracle-}-linux.x64-${PV}.0.zip"
+
+DESCRIPTION="Oracle 11g Instant Client: SQL*Plus"
+HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+SRC_URI="
+	x86?   ( ${MY_A_x86}   )
+	amd64? ( ${MY_A_amd64} )
+"
+
+LICENSE="OTN"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="fetch splitdebug"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
+
+S="${WORKDIR}"/instantclient_11_2
+
+QA_PREBUILT="
+	usr/lib*/oracle/${PV}/client/lib*/lib*
+	usr/lib*/oracle/${PV}/client/bin/sqlplus
+"
+
+my_arch() {
+	# platform name
+	MY_PLAT=MY_PLAT_${ARCH}
+	export MY_PLAT=${!MY_PLAT}
+	# distfile
+	MY_A=MY_A_${ARCH}
+	export MY_A=${!MY_A}
+}
+
+pkg_nofetch() {
+	my_arch
+	eerror "Please go to"
+	eerror "  ${HOMEPAGE%/*}/index-097480.html"
+	eerror "  and download"
+	eerror "Instant Client for ${MY_PLAT}"
+	eerror "    SQL*Plus: ${MY_A}"
+	eerror "After downloading, put it in:"
+	eerror "  ${DISTDIR}/"
+}
+
+src_install() {
+	# all binaries go here
+	local oracle_home=usr/$(get_libdir)/oracle/${PV}/client
+	into /"${oracle_home}"
+
+	dolib.so libsqlplus$(get_libname) libsqlplusic$(get_libname)
+	dobin sqlplus
+
+	insinto /"${oracle_home}"/sqlplus/admin
+	doins glogin.sql
+
+	pax-mark -c "${ED}${oracle_home}"/bin/sqlplus || die
+
+	dosym /"${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 2c372fabc788..ba9ffd5e7704 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -5,3 +5,4 @@ DIST memcached-1.5.5.tar.gz 449297 BLAKE2B c4c5f35a83b858942292ee7dcf613ad954214
 DIST memcached-1.5.6.tar.gz 452038 BLAKE2B 357197c06a3211a7f2fcd90a3895f0ed3a56bc4e5b685e2dbe605cd9bbab676759b9707c9cedaeec9dbc59dddca92a7e6152cf5f4324ec66edbf7425bd7a7209 SHA512 b8bb3b69358a476c6f11f42e89565dd0261cba3f1eaa6b0999dba7c2cb2d7c5e9ca24dedc6b7fd46ec78e40e52d66fe4694ebafd6bbd4557d25d66757d9024a4
 DIST memcached-1.5.7.tar.gz 458062 BLAKE2B 5ff0b2a0f46472dde5037268ff97e88afa15f9f9406e93a8cb43827e2bf918a935e1a29456e756cca1e5adcbf6634b6f1e9a7b007e9f446c1400ff64c1480a1d SHA512 b20a6b0c79007904146c83c119c17e6af47b8c4d9993c316fe2557fade66a1bf14839fe8fdc371a52a7ab558433048a6d9386962647221743ed0908b277003fc
 DIST memcached-1.5.8.tar.gz 459715 BLAKE2B b151a0c204c392f54551361ac6d12f61b511eaac3837406fc29a6dd64fd7522efb04f33a06f9f316d5e64ef33cf1940d4a90818bbe7401ac27a636cacaeff34b SHA512 6f0e3ce9cae3e424c41223597353b9520e7e7f97fb4719a5d520dfd34e1d917d4ee0e42bced0a5799042227b80bc4ed2778715a71b9941239db13cb367bdb088
+DIST memcached-1.5.9.tar.gz 462605 BLAKE2B e648cd968f64107be11ebb101efd1d61bfb7db677b3cb7ed1325ca1fd810949cb3067ebee07df974f89beff48a38133f4409fcb8cd176b195a5287ea91be3d53 SHA512 06f7f09a0ec1ec02353296f79776ce9229c648f4ca7c6914f82b3e50455c3b5c8d535c62d8a823f5a50375acddb9cb77470bec430c2acb37f107fb660fe29e54
diff --git a/net-misc/memcached/memcached-1.5.9.ebuild b/net-misc/memcached/memcached-1.5.9.ebuild
new file mode 100644
index 000000000000..7b92758285f1
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.9.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+		 https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+		 dev-lang/perl
+		 sasl? ( dev-libs/cyrus-sasl )
+		 seccomp? ( sys-libs/libseccomp )
+		 selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 4cd136305c2d..a3d01e98f55c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -378,12 +378,6 @@ virtual/httpd-php:7.3
 # Masked for removal in 30 days, bug #657400
 media-libs/libgltf
 
-# Mikle Kolyada <zlogene@gentoo.org> (9 June 2018)
-# Fails to buil, dead upstream, EAPI=2
-# Only the live enuild in the tree.
-# Masked for removal in 30 days
-sys-fs/yaffs-utils
-
 # Mike Pagano <mpagano@gentoo.org> (30 May 2018)
 # Masking due to bad commit in the networking stack.
 =sys-kernel/gentoo-sources-4.14.46
diff --git a/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch b/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
deleted file mode 100644
index 901484db9995..000000000000
--- a/sys-fs/yaffs-utils/files/yaffs-utils-9999-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/utils/Makefile b/utils/Makefile
-index 4929e08..51c4e5f 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -16,14 +16,13 @@
- 
- #KERNELDIR = /usr/src/kernel-headers-2.4.18
- 
--CFLAGS =   -I/usr/include -I.. -O2 -Wall -DCONFIG_YAFFS_UTIL
-+CFLAGS+=   -I.. -Wall -DCONFIG_YAFFS_UTIL $(CPPFLAGS)
- CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
- CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
- 
- ## Change if you are using a cross-compiler
- MAKETOOLS = 
- 
--CC=$(MAKETOOLS)gcc
- 
- MKYAFFSOBJS = mkyaffs.o
- 
-@@ -36,13 +35,13 @@ $(MKYAFFSIMAGEOBJS): %.o: %.c
- 	$(CC) -c $(CFLAGS) $< -o $@
- 
- mkyaffsimage: $(MKYAFFSIMAGEOBJS)
--	$(CC) -o $@ $(MKYAFFSIMAGEOBJS)
-+	$(CC) $(CFLAGS) -o $@ $(MKYAFFSIMAGEOBJS) $(LDFLAGS)
- 
- $(MKYAFFSOBJS): %.o: %.c
- 	$(CC) -c $(CFLAGS) $< -o $@
- 
- mkyaffs: $(MKYAFFSOBJS)
--	$(CC) -o $@ $(MKYAFFSOBJS)
-+	$(CC) $(CFLAGS) -o $@ $(MKYAFFSOBJS) $(LDFLAGS)
- 
- yaffs_ecc.c:
- 	ln -s ../yaffs_ecc.c yaffs_ecc.c
diff --git a/sys-fs/yaffs-utils/metadata.xml b/sys-fs/yaffs-utils/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/sys-fs/yaffs-utils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild b/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
deleted file mode 100644
index 9606fd88801f..000000000000
--- a/sys-fs/yaffs-utils/yaffs-utils-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-EGIT_REPO_URI="git://www.aleph1.co.uk/yaffs"
-EGIT_SOURCEDIR=${WORKDIR}
-
-inherit eutils git-2 toolchain-funcs
-
-DESCRIPTION="tools for generating YAFFS images"
-HOMEPAGE="http://www.aleph1.co.uk/yaffs/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-S=${WORKDIR}/utils
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin mkyaffs || die
-	dodoc ../README
-}