* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-03-07 14:07 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-03-07 14:07 UTC (permalink / raw
To: gentoo-commits
haubi 12/03/07 14:07:46
Modified: ChangeLog
Added: oracle-instantclient-basic-11.2.0.3.ebuild
Log:
Revbump. Use EAPI 4. Update homepage. Drop useless postinst info.
Add multilib support.
Fix installed makefile template for bug#165834 again.
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Revision Changes Path
1.45 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.44&r2=1.45
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog 9 Feb 2012 14:22:51 -0000 1.44
+++ ChangeLog 7 Mar 2012 14:07:46 -0000 1.45
@@ -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.
1.1 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.1&content-type=text/plain
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
# 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."
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-03-07 15:22 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-03-07 15:22 UTC (permalink / raw
To: gentoo-commits
haubi 12/03/07 15:22:15
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
fix typo with non-multilib archs
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Revision Changes Path
1.46 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.45&r2=1.46
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ChangeLog 7 Mar 2012 14:07:46 -0000 1.45
+++ ChangeLog 7 Mar 2012 15:22:15 -0000 1.46
@@ -1,6 +1,10 @@
# 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.45 2012/03/07 14:07:46 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.46 2012/03/07 15:22:15 haubi Exp $
+
+ 07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild:
+ fix typo with non-multilib archs
*oracle-instantclient-basic-11.2.0.3 (07 Mar 2012)
1.2 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.1&r2=1.2
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oracle-instantclient-basic-11.2.0.3.ebuild 7 Mar 2012 14:07:46 -0000 1.1
+++ oracle-instantclient-basic-11.2.0.3.ebuild 7 Mar 2012 15:22:15 -0000 1.2
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.2 2012/03/07 15:22:15 haubi Exp $
EAPI="4"
@@ -46,7 +46,7 @@
abi_list() {
if use multilib; then
echo ${MULTILIB_ABIS}
- elif [[ ${DEFAULT_MULTILIB} == default ]]; then
+ elif [[ ${DEFAULT_ABI} == 'default' ]]; then
# no multilib-able platform
echo ${ARCH}
else
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-03-07 16:18 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-03-07 16:18 UTC (permalink / raw
To: gentoo-commits
haubi 12/03/07 16:18:23
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
must not set ABI for non-multilib-able archs at all
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Revision Changes Path
1.47 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.46&r2=1.47
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ChangeLog 7 Mar 2012 15:22:15 -0000 1.46
+++ ChangeLog 7 Mar 2012 16:18:23 -0000 1.47
@@ -1,6 +1,10 @@
# 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.46 2012/03/07 15:22:15 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.47 2012/03/07 16:18:23 haubi Exp $
+
+ 07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild:
+ must not set ABI for non-multilib-able archs at all
07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
oracle-instantclient-basic-11.2.0.3.ebuild:
1.4 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.3&r2=1.4
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oracle-instantclient-basic-11.2.0.3.ebuild 7 Mar 2012 15:29:59 -0000 1.3
+++ oracle-instantclient-basic-11.2.0.3.ebuild 7 Mar 2012 16:18:23 -0000 1.4
@@ -1,6 +1,6 @@
# 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.3 2012/03/07 15:29:59 haubi Exp $
+# $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 $
EAPI="4"
@@ -68,8 +68,10 @@
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=${abi} get_libdir)
+ MY_LIBDIR=$(ABI=${MY_ABI} get_libdir)
}
pkg_nofetch() {
@@ -124,7 +126,7 @@
cd "${MY_S}" || die
# shared libraries
- ABI=${abi} dolib.so lib*$(get_libname)*
+ ABI=${MY_ABI} dolib.so lib*$(get_libname)*
# ensure to be linkable
[[ -e libocci$(get_libname) ]] ||
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-03-09 17:04 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-03-09 17:04 UTC (permalink / raw
To: gentoo-commits
haubi 12/03/09 17:04:41
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
Depend on recent libaio for multilib.
Simplify using helpers from multilib.eclass.
Use Prefix variables.
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Revision Changes Path
1.48 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.47&r2=1.48
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog 7 Mar 2012 16:18:23 -0000 1.47
+++ ChangeLog 9 Mar 2012 17:04:41 -0000 1.48
@@ -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:
1.5 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.4&r2=1.5
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oracle-instantclient-basic-11.2.0.3.ebuild 7 Mar 2012 16:18:23 -0000 1.4
+++ oracle-instantclient-basic-11.2.0.3.ebuild 9 Mar 2012 17:04:41 -0000 1.5
@@ -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 @@
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}
-}
+set_my_abivars() {
+ S="${WORKDIR}/${ABI}/instantclient_11_2"
-# install SDK for the default ABI only
-need_sdk_for_abi() {
- [[ $1 == $(default_abi) ]]
-}
-
-abi_list() {
- if use multilib; then
- echo ${MULTILIB_ABIS}
- else
- 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 might not need to be set at all
- [[ -n ${ABI} ]] && MY_ABI=${abi} || MY_ABI=
- # abi libdir
- MY_LIBDIR=$(ABI=${MY_ABI} get_libdir)
+ 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} ]]
}
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 @@
}
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 @@
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 @@
# 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 @@
}
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."
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-09-24 18:49 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-09-24 18:49 UTC (permalink / raw
To: gentoo-commits
haubi 12/09/24 18:49:44
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
Add instructions to download all shown files, inspired by Richard Grenville in bug#408591.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.50 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.49&r2=1.50
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog 4 Jun 2012 06:37:16 -0000 1.49
+++ ChangeLog 24 Sep 2012 18:49:44 -0000 1.50
@@ -1,6 +1,11 @@
# 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.49 2012/06/04 06:37:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.50 2012/09/24 18:49:44 haubi Exp $
+
+ 24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild:
+ Add instructions to download all shown files, inspired by Richard Grenville
+ in bug#408591.
04 Jun 2012; Zac Medico <zmedico@gentoo.org>
oracle-instantclient-basic-10.2.0.3-r1.ebuild,
1.6 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.5&r2=1.6
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- oracle-instantclient-basic-11.2.0.3.ebuild 9 Mar 2012 17:04:41 -0000 1.5
+++ oracle-instantclient-basic-11.2.0.3.ebuild 24 Sep 2012 18:49:44 -0000 1.6
@@ -1,6 +1,6 @@
# 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.5 2012/03/09 17:04:41 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.6 2012/09/24 18:49:44 haubi Exp $
EAPI="4"
@@ -52,6 +52,14 @@
[[ -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"
@@ -60,12 +68,12 @@
do
set_my_abivars || continue
eerror "Instant Client for ${MY_PLAT}"
- eerror " Basic: ${MY_A}"
+ eerror " Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}"
if is_final_abi; then
- eerror " SDK: ${MY_ASDK}"
+ eerror " SDK: ($(oic_distfile_status ${MY_ASDK})) ${MY_ASDK}"
fi
done
- eerror "After downloading, put them in:"
+ eerror "After downloading these files (for *all* shown architectures), put them in:"
eerror " ${DISTDIR}/"
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-09-24 21:13 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-09-24 21:13 UTC (permalink / raw
To: gentoo-commits
haubi 12/09/24 21:13:22
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
Install tnsnames.ora.sample, provided by Sergey S. Starikoff in bug#354059.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.51 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.50&r2=1.51
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog 24 Sep 2012 18:49:44 -0000 1.50
+++ ChangeLog 24 Sep 2012 21:13:22 -0000 1.51
@@ -1,6 +1,10 @@
# 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.50 2012/09/24 18:49:44 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.51 2012/09/24 21:13:22 haubi Exp $
+
+ 24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild, +files/tnsnames.ora.sample:
+ Install tnsnames.ora.sample, provided by Sergey S. Starikoff in bug#354059.
24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org>
oracle-instantclient-basic-11.2.0.3.ebuild:
1.7 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.6&r2=1.7
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- oracle-instantclient-basic-11.2.0.3.ebuild 24 Sep 2012 18:49:44 -0000 1.6
+++ oracle-instantclient-basic-11.2.0.3.ebuild 24 Sep 2012 21:13:22 -0000 1.7
@@ -1,6 +1,6 @@
# 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.6 2012/09/24 18:49:44 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.7 2012/09/24 21:13:22 haubi Exp $
EAPI="4"
@@ -163,7 +163,8 @@
eend $?
# create path for tnsnames.ora
- dodir /etc/oracle
+ insinto /etc/oracle
+ doins "${FILESDIR}"/tnsnames.ora.sample
# Add OCI libs to library path
{
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-11-14 17:18 Agostino Sarubbo (ago)
0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-11-14 17:18 UTC (permalink / raw
To: gentoo-commits
ago 12/11/14 17:18:41
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
Stable for amd64, wrt bug #397571
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.52 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.51&r2=1.52
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog 24 Sep 2012 21:13:22 -0000 1.51
+++ ChangeLog 14 Nov 2012 17:18:41 -0000 1.52
@@ -1,6 +1,10 @@
# 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.51 2012/09/24 21:13:22 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.52 2012/11/14 17:18:41 ago Exp $
+
+ 14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild:
+ Stable for amd64, wrt bug #397571
24 Sep 2012; Michael Haubenwallner <haubi@gentoo.org>
oracle-instantclient-basic-11.2.0.3.ebuild, +files/tnsnames.ora.sample:
1.8 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.7&r2=1.8
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- oracle-instantclient-basic-11.2.0.3.ebuild 24 Sep 2012 21:13:22 -0000 1.7
+++ oracle-instantclient-basic-11.2.0.3.ebuild 14 Nov 2012 17:18:41 -0000 1.8
@@ -1,6 +1,6 @@
# 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.7 2012/09/24 21:13:22 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.8 2012/11/14 17:18:41 ago Exp $
EAPI="4"
@@ -25,7 +25,7 @@
LICENSE="OTN"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~x86"
RESTRICT="fetch"
IUSE="multilib"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-11-14 17:20 Agostino Sarubbo (ago)
0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-11-14 17:20 UTC (permalink / raw
To: gentoo-commits
ago 12/11/14 17:20:02
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
Stable for x86, wrt bug #397571
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.53 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.52&r2=1.53
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ChangeLog 14 Nov 2012 17:18:41 -0000 1.52
+++ ChangeLog 14 Nov 2012 17:20:01 -0000 1.53
@@ -1,6 +1,10 @@
# 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.52 2012/11/14 17:18:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.53 2012/11/14 17:20:01 ago Exp $
+
+ 14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild:
+ Stable for x86, wrt bug #397571
14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
oracle-instantclient-basic-11.2.0.3.ebuild:
1.9 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.8&r2=1.9
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- oracle-instantclient-basic-11.2.0.3.ebuild 14 Nov 2012 17:18:41 -0000 1.8
+++ oracle-instantclient-basic-11.2.0.3.ebuild 14 Nov 2012 17:20:01 -0000 1.9
@@ -1,6 +1,6 @@
# 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.8 2012/11/14 17:18:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.9 2012/11/14 17:20:01 ago Exp $
EAPI="4"
@@ -25,7 +25,7 @@
LICENSE="OTN"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RESTRICT="fetch"
IUSE="multilib"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-11-15 19:36 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-11-15 19:36 UTC (permalink / raw
To: gentoo-commits
haubi 12/11/15 19:36:02
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
Define QA_PREBUILT, bug#443120.
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.54 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.53&r2=1.54
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog 14 Nov 2012 17:20:01 -0000 1.53
+++ ChangeLog 15 Nov 2012 19:36:02 -0000 1.54
@@ -1,6 +1,10 @@
# 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.53 2012/11/14 17:20:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.54 2012/11/15 19:36:02 haubi Exp $
+
+ 15 Nov 2012; Michael Haubenwallner <haubi@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild:
+ Define QA_PREBUILT, bug#443120.
14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
oracle-instantclient-basic-11.2.0.3.ebuild:
1.10 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.9&r2=1.10
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- oracle-instantclient-basic-11.2.0.3.ebuild 14 Nov 2012 17:20:01 -0000 1.9
+++ oracle-instantclient-basic-11.2.0.3.ebuild 15 Nov 2012 19:36:02 -0000 1.10
@@ -1,6 +1,6 @@
# 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.9 2012/11/14 17:20:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.10 2012/11/15 19:36:02 haubi Exp $
EAPI="4"
@@ -39,6 +39,8 @@
S="${WORKDIR}"
+QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
+
set_my_abivars() {
S="${WORKDIR}/${ABI}/instantclient_11_2"
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2012-11-28 15:54 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-11-28 15:54 UTC (permalink / raw
To: gentoo-commits
haubi 12/11/28 15:54:25
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
Tell user to re-source the shell for ORACLE_HOME changes, bug#443900.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key A630CCB8)
Revision Changes Path
1.55 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.54&r2=1.55
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 15 Nov 2012 19:36:02 -0000 1.54
+++ ChangeLog 28 Nov 2012 15:54:24 -0000 1.55
@@ -1,6 +1,10 @@
# 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.54 2012/11/15 19:36:02 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.55 2012/11/28 15:54:24 haubi Exp $
+
+ 28 Nov 2012; Michael Haubenwallner <haubi@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild:
+ Tell user to re-source the shell for ORACLE_HOME changes, bug#443900.
15 Nov 2012; Michael Haubenwallner <haubi@gentoo.org>
oracle-instantclient-basic-11.2.0.3.ebuild:
1.11 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.10&r2=1.11
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- oracle-instantclient-basic-11.2.0.3.ebuild 15 Nov 2012 19:36:02 -0000 1.10
+++ oracle-instantclient-basic-11.2.0.3.ebuild 28 Nov 2012 15:54:24 -0000 1.11
@@ -1,6 +1,6 @@
# 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.10 2012/11/15 19:36:02 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.11 2012/11/28 15:54:24 haubi Exp $
EAPI="4"
@@ -183,4 +183,6 @@
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"
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild
@ 2013-11-11 9:35 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 11+ messages in thread
From: Michael Haubenwallner (haubi) @ 2013-11-11 9:35 UTC (permalink / raw
To: gentoo-commits
haubi 13/11/11 09:35:34
Modified: ChangeLog
oracle-instantclient-basic-11.2.0.3.ebuild
Log:
oracle-instantclient-basic-11.2.0.3: Add elog message for not installing sqlnet.ora, bug#465252.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A630CCB8)
Revision Changes Path
1.56 dev-db/oracle-instantclient-basic/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog?r1=1.55&r2=1.56
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog 28 Nov 2012 15:54:24 -0000 1.55
+++ ChangeLog 11 Nov 2013 09:35:34 -0000 1.56
@@ -1,6 +1,10 @@
# 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.55 2012/11/28 15:54:24 haubi Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.56 2013/11/11 09:35:34 haubi Exp $
+
+ 11 Nov 2013; Michael Haubenwallner <haubi@gentoo.org>
+ oracle-instantclient-basic-11.2.0.3.ebuild:
+ Add elog message for not installing sqlnet.ora, bug#465252.
28 Nov 2012; Michael Haubenwallner <haubi@gentoo.org>
oracle-instantclient-basic-11.2.0.3.ebuild:
1.12 dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild?r1=1.11&r2=1.12
Index: oracle-instantclient-basic-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- oracle-instantclient-basic-11.2.0.3.ebuild 28 Nov 2012 15:54:24 -0000 1.11
+++ oracle-instantclient-basic-11.2.0.3.ebuild 11 Nov 2013 09:35:34 -0000 1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.11 2012/11/28 15:54:24 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.3.ebuild,v 1.12 2013/11/11 09:35:34 haubi Exp $
EAPI="4"
@@ -180,6 +180,16 @@
}
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."
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2013-11-11 9:35 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-14 17:20 [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-basic: ChangeLog oracle-instantclient-basic-11.2.0.3.ebuild Agostino Sarubbo (ago)
-- strict thread matches above, loose matches on Subject: below --
2013-11-11 9:35 Michael Haubenwallner (haubi)
2012-11-28 15:54 Michael Haubenwallner (haubi)
2012-11-15 19:36 Michael Haubenwallner (haubi)
2012-11-14 17:18 Agostino Sarubbo (ago)
2012-09-24 21:13 Michael Haubenwallner (haubi)
2012-09-24 18:49 Michael Haubenwallner (haubi)
2012-03-09 17:04 Michael Haubenwallner (haubi)
2012-03-07 16:18 Michael Haubenwallner (haubi)
2012-03-07 15:22 Michael Haubenwallner (haubi)
2012-03-07 14:07 Michael Haubenwallner (haubi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox