public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-odbc: oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
@ 2012-03-07 15:33 Michael Haubenwallner (haubi)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-03-07 15:33 UTC (permalink / raw
  To: gentoo-commits

haubi       12/03/07 15:33:12

  Modified:             oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
  Log:
  fix typo with non-multilib archs
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?r1=1.1&r2=1.2

Index: oracle-instantclient-odbc-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- oracle-instantclient-odbc-11.2.0.3.ebuild	7 Mar 2012 14:23:05 -0000	1.1
+++ oracle-instantclient-odbc-11.2.0.3.ebuild	7 Mar 2012 15:33:12 -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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.1 2012/03/07 14:23:05 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.2 2012/03/07 15:33:12 haubi Exp $
 
 EAPI="4"
 
@@ -37,11 +37,8 @@
 abi_list() {
 	if use multilib; then
 		echo ${MULTILIB_ABIS}
-	elif [[ ${DEFAULT_MULTILIB} == default ]]; then
-		# no multilib-able platform
-		echo ${ARCH}
 	else
-		echo ${DEFAULT_ABI}
+		default_abi
 	fi
 	return 0
 }



1.8                  dev-db/oracle-instantclient-odbc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	7 Mar 2012 14:23:05 -0000	1.7
+++ ChangeLog	7 Mar 2012 15:33:12 -0000	1.8
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/oracle-instantclient-odbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.7 2012/03/07 14:23:05 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.8 2012/03/07 15:33:12 haubi Exp $
+
+  07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
+  oracle-instantclient-odbc-11.2.0.3.ebuild:
+  fix typo with non-multilib archs
 
 *oracle-instantclient-odbc-11.2.0.3 (07 Mar 2012)
 






^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-odbc: oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
@ 2012-11-15 19:52 Michael Haubenwallner (haubi)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-11-15 19:52 UTC (permalink / raw
  To: gentoo-commits

haubi       12/11/15 19:52:17

  Modified:             oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
  Log:
  Define QA_PREBUILT, bug#443120.
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?r1=1.6&r2=1.7

Index: oracle-instantclient-odbc-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- oracle-instantclient-odbc-11.2.0.3.ebuild	14 Nov 2012 17:20:31 -0000	1.6
+++ oracle-instantclient-odbc-11.2.0.3.ebuild	15 Nov 2012 19:52:17 -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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.6 2012/11/14 17:20:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.7 2012/11/15 19:52:17 haubi Exp $
 
 EAPI="4"
 
@@ -30,6 +30,8 @@
 
 S="${WORKDIR}"
 
+QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
+
 default_abi() {
 	[[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${DEFAULT_ABI}
 }



1.13                 dev-db/oracle-instantclient-odbc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?r1=1.12&r2=1.13

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog	14 Nov 2012 17:20:31 -0000	1.12
+++ ChangeLog	15 Nov 2012 19:52:17 -0000	1.13
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/oracle-instantclient-odbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.12 2012/11/14 17:20:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.13 2012/11/15 19:52:17 haubi Exp $
+
+  15 Nov 2012; Michael Haubenwallner <haubi@gentoo.org>
+  oracle-instantclient-odbc-11.2.0.3.ebuild:
+  Define QA_PREBUILT, bug#443120.
 
   14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
   oracle-instantclient-odbc-11.2.0.3.ebuild:





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-odbc: oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
@ 2012-11-14 17:20 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 6+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-11-14 17:20 UTC (permalink / raw
  To: gentoo-commits

ago         12/11/14 17:20:31

  Modified:             oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
  Log:
  Stable for x86, wrt bug #397571
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.6                  dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?r1=1.5&r2=1.6

Index: oracle-instantclient-odbc-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- oracle-instantclient-odbc-11.2.0.3.ebuild	14 Nov 2012 17:19:12 -0000	1.5
+++ oracle-instantclient-odbc-11.2.0.3.ebuild	14 Nov 2012 17:20:31 -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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.5 2012/11/14 17:19:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.6 2012/11/14 17:20:31 ago Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@
 
 LICENSE="OTN"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="fetch"
 IUSE="multilib"
 



1.12                 dev-db/oracle-instantclient-odbc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?r1=1.11&r2=1.12

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ChangeLog	14 Nov 2012 17:19:12 -0000	1.11
+++ ChangeLog	14 Nov 2012 17:20:31 -0000	1.12
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/oracle-instantclient-odbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.11 2012/11/14 17:19:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.12 2012/11/14 17:20:31 ago Exp $
+
+  14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
+  oracle-instantclient-odbc-11.2.0.3.ebuild:
+  Stable for x86, wrt bug #397571
 
   14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
   oracle-instantclient-odbc-11.2.0.3.ebuild:





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-odbc: oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
@ 2012-11-14 17:19 Agostino Sarubbo (ago)
  0 siblings, 0 replies; 6+ messages in thread
From: Agostino Sarubbo (ago) @ 2012-11-14 17:19 UTC (permalink / raw
  To: gentoo-commits

ago         12/11/14 17:19:12

  Modified:             oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
  Log:
  Stable for amd64, wrt bug #397571
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.5                  dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?r1=1.4&r2=1.5

Index: oracle-instantclient-odbc-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oracle-instantclient-odbc-11.2.0.3.ebuild	4 Jun 2012 06:41:21 -0000	1.4
+++ oracle-instantclient-odbc-11.2.0.3.ebuild	14 Nov 2012 17:19:12 -0000	1.5
@@ -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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.4 2012/06/04 06:41:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.5 2012/11/14 17:19:12 ago Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@
 
 LICENSE="OTN"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~x86"
 RESTRICT="fetch"
 IUSE="multilib"
 



1.11                 dev-db/oracle-instantclient-odbc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	4 Jun 2012 06:41:21 -0000	1.10
+++ ChangeLog	14 Nov 2012 17:19:12 -0000	1.11
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/oracle-instantclient-odbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.10 2012/06/04 06:41:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.11 2012/11/14 17:19:12 ago Exp $
+
+  14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
+  oracle-instantclient-odbc-11.2.0.3.ebuild:
+  Stable for amd64, wrt bug #397571
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org>
   oracle-instantclient-odbc-11.2.0.2-r1.ebuild,





^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-odbc: oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
@ 2012-03-07 16:25 Michael Haubenwallner (haubi)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-03-07 16:25 UTC (permalink / raw
  To: gentoo-commits

haubi       12/03/07 16:25:00

  Modified:             oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
  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.3                  dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?r1=1.2&r2=1.3

Index: oracle-instantclient-odbc-11.2.0.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oracle-instantclient-odbc-11.2.0.3.ebuild	7 Mar 2012 15:33:12 -0000	1.2
+++ oracle-instantclient-odbc-11.2.0.3.ebuild	7 Mar 2012 16:25:00 -0000	1.3
@@ -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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.2 2012/03/07 15:33:12 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.3 2012/03/07 16:25:00 haubi Exp $
 
 EAPI="4"
 
@@ -53,8 +53,10 @@
 	MY_A=${!MY_A}
 	# 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() {
@@ -96,7 +98,7 @@
 
 		cd "${MY_S}" || die
 
-		ABI=${abi} dolib.so libsqora*$(get_libname)*
+		ABI=${MY_ABI} dolib.so libsqora*$(get_libname)*
 
 		# ensure to be linkable
 		[[ -e libsqora$(get_libname) ]] ||



1.9                  dev-db/oracle-instantclient-odbc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?r1=1.8&r2=1.9

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog	7 Mar 2012 15:33:12 -0000	1.8
+++ ChangeLog	7 Mar 2012 16:25:00 -0000	1.9
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/oracle-instantclient-odbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.8 2012/03/07 15:33:12 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.9 2012/03/07 16:25:00 haubi Exp $
+
+  07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
+  oracle-instantclient-odbc-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-odbc-11.2.0.3.ebuild:






^ permalink raw reply	[flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-odbc: oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog
@ 2012-03-07 14:23 Michael Haubenwallner (haubi)
  0 siblings, 0 replies; 6+ messages in thread
From: Michael Haubenwallner (haubi) @ 2012-03-07 14:23 UTC (permalink / raw
  To: gentoo-commits

haubi       12/03/07 14:23:05

  Modified:             ChangeLog
  Added:                oracle-instantclient-odbc-11.2.0.3.ebuild
  Log:
  Revbump. Use EAPI 4. Update homepage.
  Add multilib support.
  RDEPEND on _same_ version of oracle-instantclient-basic.
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  dev-db/oracle-instantclient-odbc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog?r1=1.6&r2=1.7

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	9 Feb 2012 14:25:40 -0000	1.6
+++ ChangeLog	7 Mar 2012 14:23:05 -0000	1.7
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/oracle-instantclient-odbc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.6 2012/02/09 14:25:40 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-odbc/ChangeLog,v 1.7 2012/03/07 14:23:05 haubi Exp $
+
+*oracle-instantclient-odbc-11.2.0.3 (07 Mar 2012)
+
+  07 Mar 2012; Michael Haubenwallner <haubi@gentoo.org>
+  +oracle-instantclient-odbc-11.2.0.3.ebuild:
+  Revbump. Use EAPI 4. Update homepage.
+  Add multilib support.
+  RDEPEND on _same_ version of oracle-instantclient-basic.
 
   09 Feb 2012; Michael Haubenwallner <haubi@gentoo.org> metadata.xml:
   Taking over maintainership.



1.1                  dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild?rev=1.1&content-type=text/plain

Index: oracle-instantclient-odbc-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-odbc/oracle-instantclient-odbc-11.2.0.3.ebuild,v 1.1 2012/03/07 14:23:05 haubi Exp $

EAPI="4"

inherit eutils

MY_PLAT_x86="Linux x86"
MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"

MY_PLAT_amd64="Linux x86-64"
MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"

DESCRIPTION="Oracle 11g Instant Client: ODBC supplement"
HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
SRC_URI="
	x86?   ( ${MY_A_x86}                             )
	amd64? ( ${MY_A_amd64} multilib? ( ${MY_A_x86} ) )
"

LICENSE="OTN"
SLOT="0"
KEYWORDS="~x86 ~amd64"
RESTRICT="fetch"
IUSE="multilib"

DEPEND="app-arch/unzip"
RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"

S="${WORKDIR}"

default_abi() {
	[[ ${DEFAULT_ABI} == 'default' ]] && echo ${ARCH} || echo ${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}
	# runtime distfile
	MY_A=MY_A_${abi}
	MY_A=${!MY_A}
	# 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 "    ODBC: ${MY_A}"
	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}
	done
}

src_install() {
	# all binaries go here
	local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
	into "${oracle_home}"

	local abi
	for abi in $(abi_list)
	do
		set_abivars ${abi}
		einfo "Installing runtime for ${MY_PLAT} ..."

		cd "${MY_S}" || die

		ABI=${abi} dolib.so libsqora*$(get_libname)*

		# ensure to be linkable
		[[ -e libsqora$(get_libname) ]] ||
		dosym libsqora$(get_libname 11.1) \
			"${oracle_home}"/${MY_LIBDIR}/libsqora$(get_libname)

		eend $?
	done

	set_abivars $(default_abi)
	cd "${MY_S}" || die
	dobin odbc_update_ini.sh
	dodoc *htm*
}






^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-11-15 19:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-07 15:33 [gentoo-commits] gentoo-x86 commit in dev-db/oracle-instantclient-odbc: oracle-instantclient-odbc-11.2.0.3.ebuild ChangeLog Michael Haubenwallner (haubi)
  -- strict thread matches above, loose matches on Subject: below --
2012-11-15 19:52 Michael Haubenwallner (haubi)
2012-11-14 17:20 Agostino Sarubbo (ago)
2012-11-14 17:19 Agostino Sarubbo (ago)
2012-03-07 16:25 Michael Haubenwallner (haubi)
2012-03-07 14:23 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