commit:     ee1fe635f4c4d656bf5e7596853f7c3bc0dfe66c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 00:16:19 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 00:16:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee1fe635

dev-db/oracle-instantclient-basic: cleanup old EAPI 4

Bug: https://bugs.gentoo.org/744721
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/oracle-instantclient-basic/Manifest         |   4 -
 .../files/11.2.0.3-makefile.patch                  |  57 ------
 .../oracle-instantclient-basic-11.2.0.4.ebuild     | 199 ---------------------
 3 files changed, 260 deletions(-)

diff --git a/dev-db/oracle-instantclient-basic/Manifest 
b/dev-db/oracle-instantclient-basic/Manifest
deleted file mode 100644
index 761a199639f..00000000000
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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

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 efcc2c6fac7..00000000000
--- 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/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 0dfbc639543..00000000000
--- 
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"
-}

Reply via email to