| 1 |
commit: ee1fe635f4c4d656bf5e7596853f7c3bc0dfe66c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 2 00:16:19 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 2 00:16:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1fe635 |
| 7 |
|
| 8 |
dev-db/oracle-instantclient-basic: cleanup old EAPI 4 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/744721 |
| 11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-db/oracle-instantclient-basic/Manifest | 4 - |
| 15 |
.../files/11.2.0.3-makefile.patch | 57 ------ |
| 16 |
.../oracle-instantclient-basic-11.2.0.4.ebuild | 199 --------------------- |
| 17 |
3 files changed, 260 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest |
| 20 |
deleted file mode 100644 |
| 21 |
index 761a199639f..00000000000 |
| 22 |
--- a/dev-db/oracle-instantclient-basic/Manifest |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,4 +0,0 @@ |
| 25 |
-DIST instantclient-basic-linux-11.2.0.4.0.zip 58793148 BLAKE2B e0f92f119a5e8890a4507160179cd49af15ed14bd7c48480d3f685a3e4918a96e6444e75c6ea11d34681a6c66ff0e8011f44840de5f080e2dc3c03079361e4a1 SHA512 b333c9334e960617ac7cc68ad1c7b45f990d5c24c7a5bc8e51b3bc8ff6476acfb6a032521f75ba39327c71ee9676d1163b252066d52e97c1dfe9c092a92a62a0 |
| 26 |
-DIST instantclient-basic-linux.x64-11.2.0.4.0.zip 60704657 BLAKE2B 77735e81a0acf88221fefff38447536a81a32a6f5cb09dcd4526d43315be1fabb6882bb9e7a5703a4188ac9e112fba611f3e2c064a128eb66512935a1af62b33 SHA512 01ed32f1771bfa2f8ef1b81314843fb2b7b81582f33c07d86670c959bbb08355dc7cc8da586852bb353a3a914658d1e7828d6b5df884215de8d76881c956a989 |
| 27 |
-DIST instantclient-sdk-linux-11.2.0.4.0.zip 643080 BLAKE2B 9ea15b227d260f7e24b572be1238074dc3a3033a2ab6313d95b750ae48468bda018c52ac604664caa128396024c0ff4bcbc0d401b7900ae27f5f3877a4b44123 SHA512 09e14a0ed88182b685a00b6370da4379710c4179fcf2d5ebdb43684b7099484122f7f5181a80352464f03ae9d0150f5c2ee5f20ede98faa9073294324b9faec8 |
| 28 |
-DIST instantclient-sdk-linux.x64-11.2.0.4.0.zip 643089 BLAKE2B 710f0a2a81dde6cabdfb2e1472f40cb715d1e060377bec1d05d8b1c794ec05b023f4feca30603202487b52527723ed9d60f73371443ce76ad2781da9c1ed5412 SHA512 7198ddc7d8804353900e45b36de79659d75dee0197c4dd58bd4d69408e7131c95025223bbd1f39ef208269bff379daa6e05f4371af83a82b83997cafadc1d642 |
| 29 |
|
| 30 |
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 |
| 31 |
deleted file mode 100644 |
| 32 |
index efcc2c6fac7..00000000000 |
| 33 |
--- a/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,57 +0,0 @@ |
| 36 |
-Fake demo_xe.mk found in Oracle eXpress Edition, |
| 37 |
-known by CPAN DBD::Oracle (bug#165834). |
| 38 |
-This provides absolute paths for headers and libraries. |
| 39 |
- |
| 40 |
-Paranoia drops those REMOVE lines. |
| 41 |
---- sdk/demo/demo.mk.orig 2012-03-06 17:11:57.636990449 +0100 |
| 42 |
-+++ sdk/demo/demo.mk 2012-03-06 17:19:37.985324293 +0100 |
| 43 |
-@@ -28,8 +28,9 @@ |
| 44 |
- CC=/opt/SunProd/SUNWspro6.1/bin/CC |
| 45 |
- cc=/opt/SunProd/SUNWspro6.1/bin/cc |
| 46 |
- |
| 47 |
--ICINCHOME=../ |
| 48 |
--ICLIBHOME=../../ |
| 49 |
-+LIBDIR=lib |
| 50 |
-+ICINCHOME=$(ORACLE_HOME)/ |
| 51 |
-+ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR) |
| 52 |
- ICLIBPATH=-L$(ICLIBHOME) |
| 53 |
- THREADLIBS=-lthread |
| 54 |
- CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS) |
| 55 |
-@@ -64,18 +64,18 @@ |
| 56 |
- all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO) |
| 57 |
- |
| 58 |
- buildoci: $(CLNCACHE) $(LIBCLNT) $(CDEMOOBJS) |
| 59 |
-- $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 $(ICLIBHOME)libclntsh$(SO_EXT) |
| 60 |
-- $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT) |
| 61 |
-+# $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 $(ICLIBHOME)libclntsh$(SO_EXT) |
| 62 |
-+# $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT) |
| 63 |
- $(CC) -o $(CDEMOEXE) $(LDFLAGS) $(CDEMOOBJS) $(CCLIB) |
| 64 |
-- $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT) |
| 65 |
-- $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT) |
| 66 |
-+# $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT) |
| 67 |
-+# $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT) |
| 68 |
- |
| 69 |
- buildocci: $(CLNCACHE) $(LIBCLNT) $(OBJS) |
| 70 |
-- $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 $(ICLIBHOME)libclntsh$(SO_EXT) |
| 71 |
-- $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT) |
| 72 |
-+# $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 $(ICLIBHOME)libclntsh$(SO_EXT) |
| 73 |
-+# $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT) |
| 74 |
- $(CC) -o $(EXE) $(LDFLAGS) $(OBJS) $(CCLIB) |
| 75 |
-- $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT) |
| 76 |
-- $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT) |
| 77 |
-+# $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT) |
| 78 |
-+# $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT) |
| 79 |
- |
| 80 |
- $(OCCIDEMO): |
| 81 |
- $(MAKE) -f $(MAKEFILE) buildocci OBJS=$@.o EXE=$@ |
| 82 |
-@@ -93,8 +93,8 @@ |
| 83 |
- |
| 84 |
- cleancache: |
| 85 |
- $(REMOVE) $(CACHEDIR) |
| 86 |
-- $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT) |
| 87 |
-- $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT) |
| 88 |
-+# $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT) |
| 89 |
-+# $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT) |
| 90 |
- |
| 91 |
- clean: $(CLNCACHE) |
| 92 |
- $(REMOVE) cdemo81 cdemo81.o occidml occidml.o occiobj occiobj.o occiobjo* occiobjm* occiobj.h occiobjout.type |
| 93 |
|
| 94 |
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 |
| 95 |
deleted file mode 100644 |
| 96 |
index 0dfbc639543..00000000000 |
| 97 |
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild |
| 98 |
+++ /dev/null |
| 99 |
@@ -1,199 +0,0 @@ |
| 100 |
-# Copyright 1999-2015 Gentoo Foundation |
| 101 |
-# Distributed under the terms of the GNU General Public License v2 |
| 102 |
- |
| 103 |
-EAPI="4" |
| 104 |
- |
| 105 |
-inherit eutils multilib-minimal |
| 106 |
- |
| 107 |
-MY_PLAT_x86="Linux x86" |
| 108 |
-MY_BITS_x86=32 |
| 109 |
-MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip" |
| 110 |
-MY_ASDK_x86="${MY_A_x86/basic/sdk}" |
| 111 |
- |
| 112 |
-MY_PLAT_amd64="Linux x86-64" |
| 113 |
-MY_BITS_amd64=64 |
| 114 |
-MY_A_amd64="${PN/oracle-}-linux.x64-${PV}.0.zip" |
| 115 |
-MY_ASDK_amd64="${MY_A_amd64/basic/sdk}" |
| 116 |
- |
| 117 |
-DESCRIPTION="Oracle 11g Instant Client with SDK" |
| 118 |
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html" |
| 119 |
-SRC_URI=" |
| 120 |
- abi_x86_32? ( ${MY_A_x86} !abi_x86_64? ( ${MY_ASDK_x86} ) ) |
| 121 |
- abi_x86_64? ( ${MY_A_amd64} ${MY_ASDK_amd64} ) |
| 122 |
-" |
| 123 |
- |
| 124 |
-LICENSE="OTN" |
| 125 |
-SLOT="0" |
| 126 |
-KEYWORDS="amd64 x86" |
| 127 |
-RESTRICT="fetch splitdebug" |
| 128 |
-IUSE="" |
| 129 |
- |
| 130 |
-DEPEND="app-arch/unzip" |
| 131 |
-RDEPEND=">=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]" |
| 132 |
- |
| 133 |
-S="${WORKDIR}" |
| 134 |
- |
| 135 |
-QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*" |
| 136 |
- |
| 137 |
-set_my_abivars() { |
| 138 |
- S="${WORKDIR}/${ABI}/instantclient_11_2" |
| 139 |
- |
| 140 |
- local abi=${ABI} |
| 141 |
- [[ ${abi} == 'default' ]] && abi=${ARCH} |
| 142 |
- MY_PLAT=MY_PLAT_${abi}; MY_PLAT=${!MY_PLAT} # platform name |
| 143 |
- MY_BITS=MY_BITS_${abi}; MY_BITS=${!MY_BITS} # platform bitwidth |
| 144 |
- MY_A=MY_A_${abi} ; MY_A=${!MY_A} # runtime distfile |
| 145 |
- MY_ASDK=MY_ASDK_${abi}; MY_ASDK=${!MY_ASDK} # sdk distfile |
| 146 |
- |
| 147 |
- [[ -n ${MY_PLAT} ]] |
| 148 |
-} |
| 149 |
- |
| 150 |
-oic_distfile_status() { |
| 151 |
- if [[ -r ${DISTDIR}/${1} ]]; then |
| 152 |
- echo "already here" |
| 153 |
- else |
| 154 |
- echo "still absent" |
| 155 |
- fi |
| 156 |
-} |
| 157 |
- |
| 158 |
-pkg_nofetch() { |
| 159 |
- eerror "Please go to" |
| 160 |
- eerror " ${HOMEPAGE%/*}/index-097480.html" |
| 161 |
- eerror " and download" |
| 162 |
- local ABI |
| 163 |
- for ABI in $(multilib_get_enabled_abis) |
| 164 |
- do |
| 165 |
- set_my_abivars || continue |
| 166 |
- eerror "Instant Client for ${MY_PLAT}" |
| 167 |
- eerror " Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}" |
| 168 |
- multilib_is_native_abi && |
| 169 |
- eerror " SDK: ($(oic_distfile_status ${MY_ASDK})) ${MY_ASDK}" |
| 170 |
- done |
| 171 |
- eerror "After downloading these files (for *all* shown architectures), put them in:" |
| 172 |
- eerror " ${DISTDIR}/" |
| 173 |
-} |
| 174 |
- |
| 175 |
-src_unpack() { |
| 176 |
- local ABI |
| 177 |
- for ABI in $(multilib_get_enabled_abis) |
| 178 |
- do |
| 179 |
- set_my_abivars || continue |
| 180 |
- mkdir "${WORKDIR}"/${ABI} || die |
| 181 |
- cd "${WORKDIR}"/${ABI} || die |
| 182 |
- unpack ${MY_A} |
| 183 |
- multilib_is_native_abi && |
| 184 |
- unpack ${MY_ASDK} |
| 185 |
- done |
| 186 |
-} |
| 187 |
- |
| 188 |
-src_prepare() { |
| 189 |
- local ABI |
| 190 |
- for ABI in $(multilib_get_enabled_abis) |
| 191 |
- do : # need to patch for the final ABI only |
| 192 |
- done |
| 193 |
- set_my_abivars || die "${ABI} ABI not supported!" |
| 194 |
- cd "${S}" || die |
| 195 |
- epatch "${FILESDIR}"/11.2.0.3-makefile.patch |
| 196 |
-} |
| 197 |
- |
| 198 |
-# suppress configure&compile messages from multilib-minimal |
| 199 |
-src_configure() { :; } |
| 200 |
-src_compile() { :; } |
| 201 |
- |
| 202 |
-src_install() { |
| 203 |
- # all binaries go here |
| 204 |
- local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client |
| 205 |
- into "${oracle_home}" |
| 206 |
- |
| 207 |
- local ldpath= ABI |
| 208 |
- for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI |
| 209 |
- do |
| 210 |
- if ! set_my_abivars; then |
| 211 |
- elog "Skipping unsupported ABI ${ABI}." |
| 212 |
- continue |
| 213 |
- fi |
| 214 |
- einfo "Installing runtime for ${MY_PLAT} ..." |
| 215 |
- |
| 216 |
- cd "${S}" || die |
| 217 |
- |
| 218 |
- # shared libraries |
| 219 |
- dolib.so lib*$(get_libname)* |
| 220 |
- |
| 221 |
- # ensure to be linkable |
| 222 |
- [[ -e libocci$(get_libname) ]] || |
| 223 |
- dosym libocci$(get_libname 11.1) \ |
| 224 |
- "${oracle_home}"/$(get_libdir)/libocci$(get_libname) |
| 225 |
- [[ -e libclntsh$(get_libname) ]] || |
| 226 |
- dosym libclntsh$(get_libname 11.1) \ |
| 227 |
- "${oracle_home}"/$(get_libdir)/libclntsh$(get_libname) |
| 228 |
- |
| 229 |
- # java archives |
| 230 |
- insinto "${oracle_home}"/$(get_libdir) |
| 231 |
- doins *.jar |
| 232 |
- |
| 233 |
- # runtime library path |
| 234 |
- ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir) |
| 235 |
- |
| 236 |
- eend $? |
| 237 |
- done |
| 238 |
- |
| 239 |
- # ensure ORACLE_HOME/lib exists |
| 240 |
- [[ -e ${ED}${oracle_home}/lib ]] || |
| 241 |
- dosym $(get_libdir) "${oracle_home}"/lib |
| 242 |
- |
| 243 |
- einfo "Installing SDK ..." |
| 244 |
- cd "${S}"/sdk || die |
| 245 |
- |
| 246 |
- # SDK makefile, for #165834 |
| 247 |
- # As we change the relative filesystem layout compared |
| 248 |
- # to vanilla instantclient.zip content, it feels easier |
| 249 |
- # to fake the layout found in Oracle eXpress Edition. |
| 250 |
- # Both layouts are known to DBD::Oracle (cpan). |
| 251 |
- insinto "${oracle_home}"/rdbms/demo |
| 252 |
- newins demo/demo.mk demo_xe.mk |
| 253 |
- |
| 254 |
- # Remove ldap.h, #299562 |
| 255 |
- rm include/ldap.h || die |
| 256 |
- # DBD::Oracle needs rdbms/public as real directory |
| 257 |
- insinto "${oracle_home}"/rdbms/public |
| 258 |
- doins include/*.h |
| 259 |
- dosym rdbms/public "${oracle_home}"/include |
| 260 |
- # ruby-oci8 expects the headers here |
| 261 |
- dosym "${oracle_home}"/rdbms/public /usr/include/oracle/${PV}/client |
| 262 |
- |
| 263 |
- dodoc demo/* |
| 264 |
- |
| 265 |
- eend $? |
| 266 |
- |
| 267 |
- # create path for tnsnames.ora |
| 268 |
- insinto /etc/oracle |
| 269 |
- doins "${FILESDIR}"/tnsnames.ora.sample |
| 270 |
- |
| 271 |
- # Add OCI libs to library path |
| 272 |
- { |
| 273 |
- echo "ORACLE_HOME=${EPREFIX}${oracle_home}" |
| 274 |
- echo "LDPATH=${ldpath}" |
| 275 |
-# who does need this? |
| 276 |
-# echo "C_INCLUDE_PATH=${oracle_home}/include" |
| 277 |
- echo "TNS_ADMIN=/etc/oracle/" |
| 278 |
- } > "${T}"/50oracle-instantclient-basic |
| 279 |
- doenvd "${T}"/50oracle-instantclient-basic |
| 280 |
-} |
| 281 |
- |
| 282 |
-pkg_postinst() { |
| 283 |
- elog "${P} does not provide an sqlnet.ora" |
| 284 |
- elog "configuration file, redirecting oracle diagnostics for database-" |
| 285 |
- elog "and network-issues into ~USER/oradiag_USER/ instead." |
| 286 |
- elog "It should be safe to ignore this message in sqlnet.log there:" |
| 287 |
- elog " Directory does not exist for read/write [ORACLE_HOME/client/log] []" |
| 288 |
- elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference." |
| 289 |
- elog "If you want to directly analyse low-level debug info or don't want" |
| 290 |
- elog "to see it at all, so you really need an sqlnet.ora file, please" |
| 291 |
- elog "consult http://search.oracle.com/search/search?q=sqlnet.ora" |
| 292 |
- elog "" |
| 293 |
- elog "TNS_ADMIN has been set to ${EROOT}etc/oracle by default," |
| 294 |
- elog "put your tnsnames.ora there or configure TNS_ADMIN" |
| 295 |
- elog "to point to your user specific configuration." |
| 296 |
- ewarn "Please re-source your shell settings for ORACLE_HOME" |
| 297 |
- ewarn " changes, such as: source /etc/profile" |
| 298 |
-} |
Archives