diff options
4 files changed, 272 insertions, 12 deletions
diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog index 7975ed1832f6..c85e412500cc 100644 --- a/dev-db/oracle-instantclient-basic/ChangeLog +++ b/dev-db/oracle-instantclient-basic/ChangeLog @@ -1,6 +1,14 @@ # 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.44 2012/02/09 14:22:51 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.45 2012/03/07 14:07:46 haubi Exp $ + +*oracle-instantclient-basic-11.2.0.3 (07 Mar 2012) + + 07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org> + +files/11.2.0.3-makefile.patch, +oracle-instantclient-basic-11.2.0.3.ebuild: + Revbump. Use EAPI 4. Update homepage. Drop useless postinst info. + Add multilib support. + Fix installed makefile template for bug#165834 again. 09 Feb 2012; Michael Haubenwallner <haubi@gentoo.org> metadata.xml: Taking over maintainership. diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest index 4753f56ea551..b401edf91529 100644 --- a/dev-db/oracle-instantclient-basic/Manifest +++ b/dev-db/oracle-instantclient-basic/Manifest @@ -1,23 +1,19 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX 11.2.0.3-makefile.patch 2250 RMD160 d11e2a81939c74f9c7db7cbeed79407c95244505 SHA1 e4c39d90dbbd604b57a3411b8f92d45209bf1822 SHA256 963139f3d41e7065e9ebd60b1b2f6ddbfc83358080fdef85713fdbf4ad322fd2 AUX oracle-instantclient-basic-10.2.0.3-makefile.patch 356 RMD160 5bf8584f2f12f74c5481f9211bbfad65929a0091 SHA1 a02921ad2ff3bf7bfcb1f9b0d58cb3dce8b141e8 SHA256 c28e41b5ac8842cfa6248df8936f0681f00eaa8d99206c640dbdd0fcaedcadf0 +DIST instantclient-basic-linux-11.2.0.3.0.zip 58502865 RMD160 e442a5246ec1d93b4dfb4daca6f88daa9b12e478 SHA1 8c52a7888df6c2655e81983e5921d017d5a65922 SHA256 1d5f9a3db6cdf91c332e75aa42995729e499f794bea6c5806ecba357c1258239 DIST instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 RMD160 fa431168723c9c2fe2182c9e480606db4b88932d SHA1 fd28349cedf225c16a5399362cb4919b7fc3a5e1 SHA256 9195ab13e59365bfef6b2b43732a652d77d7ef8b93019f31104bc13832c6a491 DIST instantclient-basic-linux-x86-64-11.2.0.2.0.zip 59090676 RMD160 1b70b253cffc5d083e207c56d51a269e5d7ebbe0 SHA1 2cd66ffd31f926d29cf649d9ceac1892295fef8b SHA256 eeaa8101138b59c73c22bbb25e2a1cfd415dc830cafba6f9f19696789ab666e2 +DIST instantclient-basic-linux.x64-11.2.0.3.0.zip 60331694 RMD160 f095ee707a27d0cd88096ee174a3462bc4406ad8 SHA1 53583b2af1efede910b1ef2a76708dab9563671f SHA256 202d8abc5a3e626e00fdba805b60b3e4bd21aaa94a49cc3fc36bc4ed616ab436 DIST instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 RMD160 12ac6ca9f94a255ca27de44a2feea6e49c3a4547 SHA1 08092f796c1c362254d18e73c955fd0bff9db78b SHA256 11fce485c405afa4a30f34eba36ad0d566a599617f80dfc565bd08d8c421e1ae DIST instantclient-basic-linux32-11.2.0.2.0.zip 57278802 RMD160 e11fc4e6abff240957c7595d0db2fc953583113a SHA1 92c8204a14b30dec363806b5de5c301ef3971fb0 SHA256 53f97a73991b2380e987f7cf4e1ba650a866044892c378b9340dc2e695160c14 +DIST instantclient-sdk-linux-11.2.0.3.0.zip 639306 RMD160 4f0b4be7df050398cbdb3b5226984966782b100d SHA1 2a44538c3c26aa6af16c325463743846a7da814a SHA256 f51b3c91a63f176443a681881fb15281c4487dde637c9c6e5b0703462a330bee DIST instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip 603137 RMD160 323d6407c664e9fdbc8a7b829e93deffa7871925 SHA1 d3486539a5b9a4721b7a57fd61c7694be4e2c6f1 SHA256 d9da1494a9d19e96bff79c3ff77d079633d18c7d9b462a37eacc9a2a40641912 DIST instantclient-sdk-linux-x86-64-11.2.0.2.0.zip 638214 RMD160 c8a4e424e03cfa3943d694c7fdef68b5ac77d9ca SHA1 9dc95f377485c7cd3f21363f7c2a4ac942910c49 SHA256 9faf4edec8806e8ed38419d17587e19de673a9e0bbdeb24a9e232e118681500e +DIST instantclient-sdk-linux.x64-11.2.0.3.0.zip 641586 RMD160 214b23e80d5dff750c9c36dd72adae1c08e04283 SHA1 ed8041eac30ccbd5d964e60b44eb3f5a4f3d8773 SHA256 6c7be8e2ad4288eb2e7453ca73a5ead89b6016dc4fd4e10b38bc95bbd2748ece DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 RMD160 06ce90ef1fb7c61e920e3a3e37578f54b3d2db0f SHA1 cb70884b44150f5048c4876e41c58fec8d252705 SHA256 6893a784e1802e18300230dcac1ed2ecd6dc68a7060c02717f73bf268d43f6a5 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 -MISC ChangeLog 9020 RMD160 fc939404ccd5a1ef4905eef6a3fcb65737fe3265 SHA1 59d60c288ffbff93fec358fa80339f1ce28c2f61 SHA256 a7502e7df99c4f7ca3cc8093faac59ed77e59e90f39bbf1e697eef44240f3c64 +EBUILD oracle-instantclient-basic-11.2.0.3.ebuild 4666 RMD160 eecd364d3ce379057a723f2e66d58dfabb1c4b70 SHA1 9afa97822e754b71bb1638626c8b96dd289effd4 SHA256 e7968491bf9057dd7533f26504aa99b10da5488425803a50f088af35c18c3771 +MISC ChangeLog 9356 RMD160 1397d30736adda2bf7f336b6434cae5337bdc22d SHA1 264f434291c019a58a71b6ad0947b05e910b03d1 SHA256 aa29e4306086cfc8142ceaa5e767c13d22623af12121ce5277b36edda4056635 MISC metadata.xml 330 RMD160 f6fc1cba6cc8c62cc86940331118ec3908edda4b SHA1 bb85a93cee99895dbe00a0e3c468171263fe82f0 SHA256 229663e1b0f455156e4ba1ebe34b4b56bfc13785676a3bec391edcd6a6a9fd67 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk8z1vEACgkQLc0TWKYwzLjjwgCeLbl+EQLUNVfuK4Lh3qLKenhq -NK4AoI7ygNgTy/7IfCxI5DrHaqkyuAEU -=w7ss ------END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..efcc2c6fac7c --- /dev/null +++ b/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch @@ -0,0 +1,57 @@ +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.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild new file mode 100644 index 000000000000..fa59e9586f40 --- /dev/null +++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild @@ -0,0 +1,199 @@ +# 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.1 2012/03/07 14:07:46 haubi Exp $ + +EAPI="4" + +inherit eutils + +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=" + x86? ( ${MY_A_x86} ${MY_ASDK_x86} ) + amd64? ( ${MY_A_amd64} ${MY_ASDK_amd64} multilib? ( ${MY_A_x86} ) ) +" + +LICENSE="OTN" +SLOT="0" +KEYWORDS="~x86 ~amd64" +RESTRICT="fetch" +IUSE="multilib" + +DEPEND="app-arch/unzip" +RDEPEND="dev-libs/libaio" + +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) ]] +} + +abi_list() { + if use multilib; then + echo ${MULTILIB_ABIS} + elif [[ ${DEFAULT_MULTILIB} == default ]]; then + # no multilib-able platform + echo ${ARCH} + else + echo ${DEFAULT_ABI} + fi + return 0 +} + +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 libdir + MY_LIBDIR=$(ABI=${abi} get_libdir) +} + +pkg_nofetch() { + eerror "Please go to" + eerror " ${HOMEPAGE%/*}/index-097480.html" + eerror " and download" + local abi + for abi in $(abi_list) + do + set_abivars ${abi} + eerror "Instant Client for ${MY_PLAT}" + eerror " Basic: ${MY_A}" + if need_sdk_for_abi ${abi}; then + eerror " SDK: ${MY_ASDK}" + fi + done + eerror "After downloading, put them in:" + eerror " ${DISTDIR}/" +} + +src_unpack() { + local abi + for abi in $(abi_list) + do + set_abivars ${abi} + mkdir -p "${MY_S%/*}" || die + cd "${MY_S%/*}" || die + unpack ${MY_A} + if need_sdk_for_abi ${abi}; then + unpack ${MY_ASDK} + fi + done +} + +src_prepare() { + set_abivars $(default_abi) + cd "${MY_S}" || die + epatch "${FILESDIR}"/11.2.0.3-makefile.patch +} + +src_install() { + # all binaries go here + local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client + into "${oracle_home}" + + local abi ldpath= + for abi in $(abi_list) + do + set_abivars ${abi} + einfo "Installing runtime for ${MY_PLAT} ..." + + cd "${MY_S}" || die + + # shared libraries + ABI=${abi} 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) + [[ -e libclntsh$(get_libname) ]] || + dosym libclntsh$(get_libname 11.1) \ + "${oracle_home}"/${MY_LIBDIR}/libclntsh$(get_libname) + + # java archives + insinto "${oracle_home}"/${MY_LIBDIR} + doins *.jar + + # runtime library path + ldpath+=${ldpath:+:}${oracle_home}/${MY_LIBDIR} + + eend $? + done + + # ensure ORACLE_HOME/lib exists + [[ -e ${D}${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 + + # 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 + dodir /etc/oracle + + # Add OCI libs to library path + { + echo "ORACLE_HOME=${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 "TNS_ADMIN has been set to ${ROOT}etc/oracle by default," + elog "put your tnsnames.ora there or configure TNS_ADMIN" + elog "to point to your user specific configuration." +} |