gentoo resync : 25.11.2020

5 files changed, 3 insertions, 359 deletions

diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 321310afc41b..df72463dfaad 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,9 +1,2 @@
-AUX 11.2.0.3-makefile.patch 2250 BLAKE2B f680a9dbe7a8fb51c09667b3a49eaa86cc965a36f3d3df6c789e944ce83126fef1f12e0fa083f41e94b0b56ff1bcef5c9128f959f553730ec679051e83523da2 SHA512 1573f20608cf1e8a9c6dc94b40f4a7dac822f7888b2232ff13bf3db5456bbc0f653022acb194bdb2014698665042108d7f2b13e95ce00bd492c4c0eb03f4c9db
-AUX tnsnames.ora.sample 2939 BLAKE2B d02d4be5eae8c8da346f8b0ddd2b6808e59f8e77f805b22154a77d22db325d415ecaf811323de3c7a6764a9167fb7f9a9708d1cf2de891858bc43bd5e050954d SHA512 25bb734bf4b7ea1d2ce2bddfd241204e796cad0d1d49036e567237d7ca92d158ab7bf69ff3abe210050c8ee0a0630f9217ced22dc31770814d822f93b2af5845
-DIST instantclient-basic-linux-11.2.0.4.0.zip 58793148 BLAKE2B e0f92f119a5e8890a4507160179cd49af15ed14bd7c48480d3f685a3e4918a96e6444e75c6ea11d34681a6c66ff0e8011f44840de5f080e2dc3c03079361e4a1 SHA512 b333c9334e960617ac7cc68ad1c7b45f990d5c24c7a5bc8e51b3bc8ff6476acfb6a032521f75ba39327c71ee9676d1163b252066d52e97c1dfe9c092a92a62a0
-DIST instantclient-basic-linux.x64-11.2.0.4.0.zip 60704657 BLAKE2B 77735e81a0acf88221fefff38447536a81a32a6f5cb09dcd4526d43315be1fabb6882bb9e7a5703a4188ac9e112fba611f3e2c064a128eb66512935a1af62b33 SHA512 01ed32f1771bfa2f8ef1b81314843fb2b7b81582f33c07d86670c959bbb08355dc7cc8da586852bb353a3a914658d1e7828d6b5df884215de8d76881c956a989
-DIST instantclient-sdk-linux-11.2.0.4.0.zip 643080 BLAKE2B 9ea15b227d260f7e24b572be1238074dc3a3033a2ab6313d95b750ae48468bda018c52ac604664caa128396024c0ff4bcbc0d401b7900ae27f5f3877a4b44123 SHA512 09e14a0ed88182b685a00b6370da4379710c4179fcf2d5ebdb43684b7099484122f7f5181a80352464f03ae9d0150f5c2ee5f20ede98faa9073294324b9faec8
-DIST instantclient-sdk-linux.x64-11.2.0.4.0.zip 643089 BLAKE2B 710f0a2a81dde6cabdfb2e1472f40cb715d1e060377bec1d05d8b1c794ec05b023f4feca30603202487b52527723ed9d60f73371443ce76ad2781da9c1ed5412 SHA512 7198ddc7d8804353900e45b36de79659d75dee0197c4dd58bd4d69408e7131c95025223bbd1f39ef208269bff379daa6e05f4371af83a82b83997cafadc1d642
-EBUILD oracle-instantclient-basic-11.2.0.4.ebuild 5545 BLAKE2B 787d424a25ba6407ac3e0576929a93912ec5d56edcef22fe464bfd30aefb04848a43417124e5540b7d4e8d9e7376a12fcee6fb86b8fa53d29236871592d9d87f SHA512 f7f97eca82b62f43dd17170d5c9ee492f029f8e99b746511712b56cdc4cd45a96a68757101350ab05aab6e7ed5cfe2fd70154c8b28fa4e3c07bc6f961e1fec2b
-EBUILD oracle-instantclient-basic-12.ebuild 399 BLAKE2B f7f1068e3c81af7a4f78972eaad534d44bac0aaaa22516d21fe21852991883a3f2269286e44f84f142771e99175677c589a8d5ea34f79d745f431679ea78c11c SHA512 9bd43fa3ff7ec7f0c281dcbb4ae68f354b820de8ec454c86efafb84a483a20527e4696305c0882d96250d57d604c317e6e61242804ca7b49f5bf068c7f3249f2
+EBUILD oracle-instantclient-basic-12.ebuild 397 BLAKE2B 66fece8293a4f5c7e81efc2e37c873dd0d7a391595bfc39ca701ac7193ebbcb865098e102d0c9006039c454efed49f4a9793f2703c9b7db26dabca2584e6ed4d SHA512 a3d2b68b218aa49089fe54f19036c897e0f805f6932bf4c56466f39ecd9178ac5516189ca1ae4cdb53c2fa09525a8fa98a4e64a6fc6385f68cc7f7540efa8cf3
 MISC metadata.xml 214 BLAKE2B b60ecbef37fd3eed5949889bfea31a68f4941db8a7a36e4dbbb7d7381d587eaefc230349c83a9eda4bbdfd1d45b4af0928da1ff7ed2f6f4e2c704a10033c6610 SHA512 e4dddc0b51fec262729e9eedd302b3c7d7a91d227e1043134c0242c8aea2f2c6cef5fd8caca6ea1424cc38b3beeb05fed373ffcc2c8751662dd4117639a7b5de
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
deleted file mode 100644
index efcc2c6fac7c..000000000000
--- a/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index f0524f5993cd..000000000000
--- a/dev-db/oracle-instantclient-basic/files/tnsnames.ora.sample
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.4.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
deleted file mode 100644
index 0dfbc6395439..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# 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-basic/oracle-instantclient-basic-12.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild
index cc98d68c83ab..e377ea56810f 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""