gentoo resync : 28.04.2021

5 files changed, 64 insertions, 8 deletions

diff --git a/dev-db/opendbx/Manifest b/dev-db/opendbx/Manifest
index d6bf5eecde4c..55c5b518ec8d 100644
--- a/dev-db/opendbx/Manifest
+++ b/dev-db/opendbx/Manifest
@@ -3,8 +3,8 @@ AUX opendbx-man-optional.patch 1000 BLAKE2B a8e5dc4e0721b94acd0b379a6d27ea8e349e
 DIST libopendbx-1.5.0.tar.gz 583894 BLAKE2B c427bf8d79df6b83d0ce940d974625bd9b54e49e502f864d244a780185b6321f84a6b779e09b603a71ca26549844001268f0357169e9a74e742b9c2668e4b3ec SHA512 7e4e9b8c62fd981276f6747f8184d7e34d743b866bfd76c8126a16371b50dc682177fd563212333d2dbebe2128d0b1527fc69029833329ba8cc0311308fa9bb5
 DIST opendbx-1.4.5.tar.gz 582915 BLAKE2B 7a11947f73ba3a3d407fecf7600589b64a6a80b82f24720ae613d1dc7044e7efe3af8fe273c0cdb043923af2cee1913766054eff3267243345b89c6977124be6 SHA512 e46289f9a7eb8b6e4084863834f8c4ca080eb3343b5f9d5837c476bab0a39e798a6364c8648f9fb53e52ab60cae57749b9f7e9bd23cb95b8ff21160f1bf4247e
 DIST opendbx-1.4.6.tar.gz 587514 BLAKE2B 0a6c983ac1ebdc3ad9390185938f32e13ba9ff2ced6d41390421e1e3a1e9eb639a85d89da7ce2dd67f05fd2fcaebb2f53146f43678e548511403d8cdc4de88da SHA512 dd6d53d29157057dbf4e273fd82c7694e8bc626d3409d6ab9c25627a0fec96418326550fa8004b5341facdc4cd8aae12516224e8bb84e2562482885780ff0e55
-EBUILD opendbx-1.4.5-r1.ebuild 1602 BLAKE2B c60c9934a2be4e82de7699d60d0f17a26f272621f285ac7773b2204354528b861b3649fd6d36b96e82ea57a6d87e6ec68ccf48e908eb3f7cbfb17cbcc5f067b7 SHA512 951c6404d3599c47cf81fb2f4655aa000b3991c9df0eea4ea6b81f7a2f3e21342c6417863c48971c9e924fbfbc92be1833303a520ed683a2a3cf32a5a0f988a5
-EBUILD opendbx-1.4.6-r2.ebuild 1604 BLAKE2B 1e77a1b530d45461925490e089846ade568083cde20953b0cd1b79adae6173dd0513f54e72bc30008b8f080b4c679a04ff04e02bdb22e2d8bd2528764e75dd3b SHA512 6ef51b6ae514c238b57a82f785145eb96d6430dde6c011087491328b8fb7817b722f0223cef31f6bfcf253632e7a9014345015d0ce7cb3db24f3b392c86b7a8a
-EBUILD opendbx-1.4.6-r3.ebuild 1758 BLAKE2B 83044eb473eee254c862b45c7f3cfa24277b78c8475688df4d71d07d09f90060f4595edcdf99019a3b290e2d9a2edbaa990b3000e0d09fbe76c68f3ba4741654 SHA512 aef0b11b37096fbacc106f867340cab4c5dd71373002c7921d4c2ec426203987ec7803ebf7c8f0789a77bb96d2e98925e5204bbb74628349c01b719976eb781e
-EBUILD opendbx-1.5.0-r2.ebuild 1672 BLAKE2B 306102765d9f0a879490988bba0c5d2fa69e14fc5bae6d6e27943376278bbfd49412b90e8a497b8dcc4090d047cae6559d1c690e8e19c68f236d167f8d6918c2 SHA512 0be32ee80a73b302f33cf7024b9d11d5432f6d766de2c1144f14b48b13faa02e64121b06aea35b7c3a0509f5091076fae6ff1a462aa503f158544f11439f6a80
+EBUILD opendbx-1.4.5-r1.ebuild 2228 BLAKE2B 832e135e2c0e9b9d67767f49f75d913e456121d4dfaeeddfc0ce54d94da743c72555710ba220beaf50742eacc2bcfde0ae4fa8af4ce9aabb5c9add3de9d772c2 SHA512 05578fa43e0c395ef539cfea5b1c1e5f2d13275a2980220161836a25607c497eb6f77f3f4d2a3fe6d26cb8199158a5b64b92e93773b44a0ad6cc07cbe3d977a1
+EBUILD opendbx-1.4.6-r2.ebuild 2230 BLAKE2B 82bc09a1a2a2fa313b3c9b98ed65cce5b47bc3f1e914b7dca6950bc7df2afca4f29015ab2c01ae7b29f646e3cb4cb2d965a3199b35ff3cd8f07d1d45e0c350ec SHA512 a01eed48b3b438fbc225783d69cda10f57760996dabbda414c2fb9f4a264b22228a92da8b0283456a70bba5ce60e9c0cbd1d41887b58927b7dc66f4792d188cb
+EBUILD opendbx-1.4.6-r3.ebuild 2384 BLAKE2B 687c10c90f28357007d90c9fdb1c4355821b8232622a966cac968564f02c83c8b1b96a2e8e3e033c70cbeb3a02898c42f64cc9f86daa4916534b9a2826a09c27 SHA512 8ef6b5a8eb1177e185146d36f515a71b4d169f158cb45d92f87b2f62553c342b9fa593171e0fbfc5fd0c5b070c0ab371767f27c9969fa1c51f4e98e795416078
+EBUILD opendbx-1.5.0-r2.ebuild 2298 BLAKE2B 934f07d98faa671002a3523f7394c8d7c3d6151b315e190a68316b8909eec1a252ddc34f04ab80993ac3f45362c5020789e87456608e9b063fba9fe046d9d772 SHA512 5c14130f10516e2c24186faed421dd130647e7d739dd7261e972b85a1cf428e249aed227e2d322d40047b732687462713528489cfdae1f8cb710336a70e5775d
 MISC metadata.xml 243 BLAKE2B 1d641d0445b6ef43e1ca3ca3f967b0580b0a5ba444509e092a8a51bba18564136091c2dacd69ed723e36cb851b3962176a8aca06d3b2e604cf089c4983dbb7f5 SHA512 2bbd30d145173aa1c10a47ec43bfc1f6b1aeda4b25ec40e534d08a35fc9a63ba9ba7826204cf4d561566ea0678f2d865cb7a947814f5e5e436a839d750f2db2e
diff --git a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
index 6def19a1ee09..222716f22f73 100644
--- a/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.5-r1.ebuild
@@ -44,7 +44,21 @@ src_configure() {
 
 	use mysql && append-cppflags -I/usr/include/mysql
 	use firebird && append-cppflags -I/opt/firebird/include
-	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+
+	if use oracle ; then
+		# Traditionally, OCI header files are provided in:
+		append-cppflags -I"${ORACLE_HOME}"/rdbms/public
+		# But newer versions merged them with additional SDKs:
+		append-cppflags -I"${ORACLE_HOME}"/sdk/include
+		# Depending on the client package ORACLE_HOME refers to,
+		# we need to find the libraries in varying locations:
+		# - gentoo instantclient has multilib (dev-db/oracle-instantclient)
+		append-ldflags -L"${ORACLE_HOME}"/$(get_libdir)
+		# - vanilla full client lacks multilib (LINUX*_client{,_home}.zip)
+		append-ldflags -L"${ORACLE_HOME}"/lib
+		# - vanilla instantclient lacks libdir (instantclient-*.zip)
+		append-ldflags -L"${ORACLE_HOME}"
+	fi
 
 	econf --with-backends="${backends}"
 }
diff --git a/dev-db/opendbx/opendbx-1.4.6-r2.ebuild b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild
index f3c0607e740f..5c3009011be6 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r2.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r2.ebuild
@@ -44,7 +44,21 @@ src_configure() {
 
 	use mysql && append-cppflags -I/usr/include/mysql
 	use firebird && append-cppflags -I/opt/firebird/include
-	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+
+	if use oracle ; then
+		# Traditionally, OCI header files are provided in:
+		append-cppflags -I"${ORACLE_HOME}"/rdbms/public
+		# But newer versions merged them with additional SDKs:
+		append-cppflags -I"${ORACLE_HOME}"/sdk/include
+		# Depending on the client package ORACLE_HOME refers to,
+		# we need to find the libraries in varying locations:
+		# - gentoo instantclient has multilib (dev-db/oracle-instantclient)
+		append-ldflags -L"${ORACLE_HOME}"/$(get_libdir)
+		# - vanilla full client lacks multilib (LINUX*_client{,_home}.zip)
+		append-ldflags -L"${ORACLE_HOME}"/lib
+		# - vanilla instantclient lacks libdir (instantclient-*.zip)
+		append-ldflags -L"${ORACLE_HOME}"
+	fi
 
 	econf --with-backends="${backends}"
 }
diff --git a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
index daae3dd90bd8..7bdd9b3e613f 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
@@ -52,7 +52,21 @@ src_configure() {
 
 	use mysql && append-cppflags -I/usr/include/mysql
 	use firebird && append-cppflags -I/opt/firebird/include
-	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+
+	if use oracle ; then
+		# Traditionally, OCI header files are provided in:
+		append-cppflags -I"${ORACLE_HOME}"/rdbms/public
+		# But newer versions merged them with additional SDKs:
+		append-cppflags -I"${ORACLE_HOME}"/sdk/include
+		# Depending on the client package ORACLE_HOME refers to,
+		# we need to find the libraries in varying locations:
+		# - gentoo instantclient has multilib (dev-db/oracle-instantclient)
+		append-ldflags -L"${ORACLE_HOME}"/$(get_libdir)
+		# - vanilla full client lacks multilib (LINUX*_client{,_home}.zip)
+		append-ldflags -L"${ORACLE_HOME}"/lib
+		# - vanilla instantclient lacks libdir (instantclient-*.zip)
+		append-ldflags -L"${ORACLE_HOME}"
+	fi
 
 	econf --with-backends="${backends}" --enable-manpages="$(usex man yes no)"
 }
diff --git a/dev-db/opendbx/opendbx-1.5.0-r2.ebuild b/dev-db/opendbx/opendbx-1.5.0-r2.ebuild
index 9f23d103a95d..75d65ca1fe3b 100644
--- a/dev-db/opendbx/opendbx-1.5.0-r2.ebuild
+++ b/dev-db/opendbx/opendbx-1.5.0-r2.ebuild
@@ -49,7 +49,21 @@ src_configure() {
 
 	use mysql && append-cppflags -I/usr/include/mysql
 	use firebird && append-cppflags -I/opt/firebird/include
-	use oracle && append-ldflags -L"${ORACLE_HOME}"/lib
+
+	if use oracle ; then
+		# Traditionally, OCI header files are provided in:
+		append-cppflags -I"${ORACLE_HOME}"/rdbms/public
+		# But newer versions merged them with additional SDKs:
+		append-cppflags -I"${ORACLE_HOME}"/sdk/include
+		# Depending on the client package ORACLE_HOME refers to,
+		# we need to find the libraries in varying locations:
+		# - gentoo instantclient has multilib (dev-db/oracle-instantclient)
+		append-ldflags -L"${ORACLE_HOME}"/$(get_libdir)
+		# - vanilla full client lacks multilib (LINUX*_client{,_home}.zip)
+		append-ldflags -L"${ORACLE_HOME}"/lib
+		# - vanilla instantclient lacks libdir (instantclient-*.zip)
+		append-ldflags -L"${ORACLE_HOME}"
+	fi
 
 	econf --with-backends="${backends}"
 }