diff options
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/oracle-instantclient-basic/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-db/oracle-instantclient-basic/Manifest | 10 | ||||
| -rw-r--r-- | dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild | 111 |
3 files changed, 56 insertions, 73 deletions
diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog index 61cbed8c7acc..be9d49813044 100644 --- a/dev-db/oracle-instantclient-basic/ChangeLog +++ b/dev-db/oracle-instantclient-basic/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-db/oracle-instantclient-basic # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.47 2012/03/07 16:18:23 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.48 2012/03/09 17:04:41 haubi Exp $ + + 09 Mar 2012; Michael Haubenwallner <haubi@gentoo.org> + oracle-instantclient-basic-11.2.0.3.ebuild: + Depend on recent libaio for multilib. + Simplify using helpers from multilib.eclass. + Use Prefix variables. 07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org> oracle-instantclient-basic-11.2.0.3.ebuild: diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest index 3b05ede051d6..e3041c125ff0 100644 --- a/dev-db/oracle-instantclient-basic/Manifest +++ b/dev-db/oracle-instantclient-basic/Manifest @@ -17,13 +17,13 @@ DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 RMD160 06ce90ef1fb7c DIST instantclient-sdk-linux32-11.2.0.2.0.zip 638200 RMD160 998e6314d93791cf544f468482089f9f913c7ce4 SHA1 238a6c52731881a77ab0facec276451da4605eb0 SHA256 172c0116de16f55abd775aaf4dd1666d0e64eb1226b43388974ccf83235c8b18 EBUILD oracle-instantclient-basic-10.2.0.3-r1.ebuild 3921 RMD160 d7e9b57eab0dfedde4e7bdea333c8d043b684589 SHA1 5f84a37c80424e1160ec15b9cfcd5bd8bd79eb4d SHA256 d73b72122030197ac5b4b590fe4d64804c15b23b8fcc19e6d59446fcd81331a1 EBUILD oracle-instantclient-basic-11.2.0.2.ebuild 3885 RMD160 7e2d1e495fad6734b9729dd4b1c17a2fe0feb550 SHA1 54d2b27f0c6dc10622d010fbf9a9c00dc0d34473 SHA256 2d5a558336531a4944e1330736980006baad38cbf88459ca068838a4fe0a4b6c -EBUILD oracle-instantclient-basic-11.2.0.3.ebuild 4654 RMD160 d3457ec932687d26085c92be8054a266f4d32942 SHA1 01e708aeed7416f8790720bff7a22cbb9b677010 SHA256 a9efa88b17b2f20dccbc13c9044b9faa7cff24890efe1207595b1d5ac9fd82b3 -MISC ChangeLog 9651 RMD160 0a09e4e98ad1171b11c892789082af7b6ff2ee88 SHA1 d14ca213e57e8ec08540ef68b110a747addc443d SHA256 8db1afa4efdeaca3839e9091a594ae632493bb107333d5d620b45814097c9e94 +EBUILD oracle-instantclient-basic-11.2.0.3.ebuild 4472 RMD160 1f376f52a72051d0cbc9314cf8838c8ab0e3027d SHA1 2fe608d4a329c2d9db526b7340d6c1cabb93e785 SHA256 14b971d75018a3934a85de9584ba59de80785d6b89ed04e116550e8e4b68ef34 +MISC ChangeLog 9865 RMD160 663d295c858991111e6d81d525a880a414e80958 SHA1 399709da7c2b764900a3b58e5b0c0f7758525b8f SHA256 8b43ac8b4321a89d4469b053233d3e81d829987ba0720b81f4d6764acf960554 MISC metadata.xml 330 RMD160 f6fc1cba6cc8c62cc86940331118ec3908edda4b SHA1 bb85a93cee99895dbe00a0e3c468171263fe82f0 SHA256 229663e1b0f455156e4ba1ebe34b4b56bfc13785676a3bec391edcd6a6a9fd67 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk9XilgACgkQLc0TWKYwzLitMACfW8UerS70RBawKRjnxE00C2t5 -0+AAn0XndV/aWnvy/V7MdHv+Yq8nzytw -=ZHu1 +iEYEARECAAYFAk9aODIACgkQLc0TWKYwzLhCUgCgnjfAP38THlg6fRmIqaHJEt0s +2GwAn0yMekhpEI9Ba31p7/jFpAGG2jlO +=vgG4 -----END PGP SIGNATURE----- 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 index 7340b7f65417..1ea6d2efd03d 100644 --- 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 @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.4 2012/03/07 16:18:23 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.5 2012/03/09 17:04:41 haubi Exp $ EAPI="4" -inherit eutils +inherit eutils multilib MY_PLAT_x86="Linux x86" MY_BITS_x86=32 @@ -29,62 +29,39 @@ KEYWORDS="~x86 ~amd64" RESTRICT="fetch" IUSE="multilib" +EMULTILIB_PKG="true" + DEPEND="app-arch/unzip" -RDEPEND="dev-libs/libaio" +RDEPEND=" + dev-libs/libaio + multilib? ( >=dev-libs/libaio-0.3.109-r3 ) +" S="${WORKDIR}" -default_abi() { - [[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${DEFAULT_ABI} -} - -# install SDK for the default ABI only -need_sdk_for_abi() { - [[ $1 == $(default_abi) ]] -} +set_my_abivars() { + S="${WORKDIR}/${ABI}/instantclient_11_2" -abi_list() { - if use multilib; then - echo ${MULTILIB_ABIS} - else - default_abi - fi - return 0 -} + 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 -set_abivars() { - local abi=$1 - # platform name - MY_PLAT=MY_PLAT_${abi} - MY_PLAT=${!MY_PLAT} - # platform bitwidth - MY_BITS=MY_BITS_${abi} - MY_BITS=${!MY_BITS} - # runtime distfile - MY_A=MY_A_${abi} - MY_A=${!MY_A} - # sdk distfile - MY_ASDK=MY_ASDK_${abi} - MY_ASDK=${!MY_ASDK} - # 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) + [[ -n ${MY_PLAT} ]] } pkg_nofetch() { eerror "Please go to" eerror " ${HOMEPAGE%/*}/index-097480.html" eerror " and download" - local abi - for abi in $(abi_list) + for ABI in $(get_install_abis) do - set_abivars ${abi} + set_my_abivars || continue eerror "Instant Client for ${MY_PLAT}" eerror " Basic: ${MY_A}" - if need_sdk_for_abi ${abi}; then + if is_final_abi; then eerror " SDK: ${MY_ASDK}" fi done @@ -93,22 +70,22 @@ pkg_nofetch() { } src_unpack() { - local abi - for abi in $(abi_list) + for ABI in $(get_install_abis) do - set_abivars ${abi} - mkdir -p "${MY_S%/*}" || die - cd "${MY_S%/*}" || die + set_my_abivars || continue + mkdir "${WORKDIR}"/${ABI} || die + cd "${WORKDIR}"/${ABI} || die unpack ${MY_A} - if need_sdk_for_abi ${abi}; then + if is_final_abi; then unpack ${MY_ASDK} fi done } src_prepare() { - set_abivars $(default_abi) - cd "${MY_S}" || die + # 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 } @@ -117,44 +94,44 @@ src_install() { local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client into "${oracle_home}" - local abi ldpath= - for abi in $(abi_list) + local ldpath= + for ABI in $(get_install_abis) # last iteration is final ABI do - set_abivars ${abi} + if ! set_my_abivars; then + elog "Skipping unsupported ABI ${ABI}." + continue + fi einfo "Installing runtime for ${MY_PLAT} ..." - cd "${MY_S}" || die + cd "${S}" || die # shared libraries - ABI=${MY_ABI} dolib.so lib*$(get_libname)* + dolib.so lib*$(get_libname)* # ensure to be linkable [[ -e libocci$(get_libname) ]] || dosym libocci$(get_libname 11.1) \ - "${oracle_home}"/${MY_LIBDIR}/libocci$(get_libname) + "${oracle_home}"/$(get_libdir)/libocci$(get_libname) [[ -e libclntsh$(get_libname) ]] || dosym libclntsh$(get_libname 11.1) \ - "${oracle_home}"/${MY_LIBDIR}/libclntsh$(get_libname) + "${oracle_home}"/$(get_libdir)/libclntsh$(get_libname) # java archives - insinto "${oracle_home}"/${MY_LIBDIR} + insinto "${oracle_home}"/$(get_libdir) doins *.jar # runtime library path - ldpath+=${ldpath:+:}${oracle_home}/${MY_LIBDIR} + ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir) eend $? done # ensure ORACLE_HOME/lib exists - [[ -e ${D}${oracle_home}/lib ]] || + [[ -e ${ED}${oracle_home}/lib ]] || dosym $(get_libdir) "${oracle_home}"/lib - # SDK is for the default abi only - set_abivars $(default_abi) - einfo "Installing SDK ..." - cd "${MY_S}"/sdk || die + cd "${S}"/sdk || die # SDK makefile, for #165834 # As we change the relative filesystem layout compared @@ -182,7 +159,7 @@ src_install() { # Add OCI libs to library path { - echo "ORACLE_HOME=${oracle_home}" + echo "ORACLE_HOME=${EPREFIX}${oracle_home}" echo "LDPATH=${ldpath}" # who does need this? # echo "C_INCLUDE_PATH=${oracle_home}/include" @@ -192,7 +169,7 @@ src_install() { } pkg_postinst() { - elog "TNS_ADMIN has been set to ${ROOT}etc/oracle by default," + 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." } |