1 |
commit: 59f48475a80300b59c8daaa089d3968573a04b5e |
2 |
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 5 09:55:37 2016 +0000 |
4 |
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 5 09:58:43 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59f48475 |
7 |
|
8 |
dev-libs/libsqlora8: revision bump |
9 |
|
10 |
Bump EAPI to 6. Supress unsupported parallel compilation, |
11 |
prune unneeded libtool files, build static libs optionally, |
12 |
correct package description. |
13 |
Detect Oracle libraries path, rather than requesting it from user. |
14 |
Replace misused einstall with default function call in src_install. |
15 |
|
16 |
Gentoo-Bug: 521432 |
17 |
|
18 |
Package-Manager: portage-2.2.28 |
19 |
|
20 |
dev-libs/libsqlora8/libsqlora8-2.3.3-r1.ebuild | 56 +++++++++++++++++++++++ |
21 |
dev-libs/libsqlora8/libsqlora8-2.3.3.ebuild | 61 -------------------------- |
22 |
2 files changed, 56 insertions(+), 61 deletions(-) |
23 |
|
24 |
diff --git a/dev-libs/libsqlora8/libsqlora8-2.3.3-r1.ebuild b/dev-libs/libsqlora8/libsqlora8-2.3.3-r1.ebuild |
25 |
new file mode 100644 |
26 |
index 00000000..8f15319 |
27 |
--- /dev/null |
28 |
+++ b/dev-libs/libsqlora8/libsqlora8-2.3.3-r1.ebuild |
29 |
@@ -0,0 +1,56 @@ |
30 |
+# Copyright 1999-2016 Gentoo Foundation |
31 |
+# Distributed under the terms of the GNU General Public License v2 |
32 |
+# $Id$ |
33 |
+ |
34 |
+EAPI=6 |
35 |
+ |
36 |
+inherit eutils flag-o-matic versionator |
37 |
+ |
38 |
+DESCRIPTION="Simple C-library to access Oracle databases via the OCI interface" |
39 |
+SRC_URI="http://www.poitschke.de/libsqlora8/${P}.tar.gz" |
40 |
+HOMEPAGE="http://www.poitschke.de/libsqlora8/index_noframe.html" |
41 |
+ |
42 |
+LICENSE="ISC" |
43 |
+SLOT="0" |
44 |
+KEYWORDS="~x86" |
45 |
+ |
46 |
+IUSE="orathreads static-libs +threads" |
47 |
+ |
48 |
+RDEPEND="dev-db/oracle-instantclient" |
49 |
+DEPEND=" |
50 |
+ ${RDEPEND} |
51 |
+ virtual/pkgconfig |
52 |
+" |
53 |
+ |
54 |
+REQUIRED_USE="?? ( orathreads threads )" |
55 |
+ |
56 |
+src_configure() { |
57 |
+ local myconf |
58 |
+ |
59 |
+ local ORACLE_VER="$(best_version dev-db/oracle-instantclient)" |
60 |
+ ORACLE_VER="${ORACLE_VER#*/*-*-}" #reduce it to ${PV}-${PR} |
61 |
+ ORACLE_VER="$(get_version_component_range 1-2 ${ORACLE_VER})" |
62 |
+ append-ldflags -L"/usr/lib/oracle/${ORACLE_VER}/client/lib" |
63 |
+ |
64 |
+ use threads && myconf="--with-threads=posix" |
65 |
+ use orathreads && myconf="--with-threads=oracle" |
66 |
+ |
67 |
+ econf \ |
68 |
+ $(use_enable static-libs static) \ |
69 |
+ ${myconf} |
70 |
+} |
71 |
+ |
72 |
+src_compile() { |
73 |
+ # Parallel compilation is not supported |
74 |
+ emake -j1 |
75 |
+} |
76 |
+ |
77 |
+src_install () { |
78 |
+ default |
79 |
+ prune_libtool_files |
80 |
+ dodoc ChangeLog NEWS NEWS-2.2 |
81 |
+ |
82 |
+ # TODO |
83 |
+ # Copy contents of doc and examples directory to proper place |
84 |
+ rm -r "${D}/usr/share/doc/packages" |
85 |
+} |
86 |
|
87 |
diff --git a/dev-libs/libsqlora8/libsqlora8-2.3.3.ebuild b/dev-libs/libsqlora8/libsqlora8-2.3.3.ebuild |
88 |
deleted file mode 100644 |
89 |
index c7a509b..00000000 |
90 |
--- a/dev-libs/libsqlora8/libsqlora8-2.3.3.ebuild |
91 |
+++ /dev/null |
92 |
@@ -1,61 +0,0 @@ |
93 |
-# Copyright 1999-2012 Gentoo Foundation |
94 |
-# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $Id$ |
96 |
- |
97 |
-DESCRIPTION="libsqlora8 is a simple C-library to access Oracle databases via the OCI interface" |
98 |
-SRC_URI="http://www.poitschke.de/libsqlora8/${P}.tar.gz" |
99 |
-HOMEPAGE="http://www.poitschke.de/libsqlora8/index_noframe.html" |
100 |
- |
101 |
-LICENSE="ISC" |
102 |
-SLOT="0" |
103 |
-KEYWORDS="~x86" |
104 |
-IUSE="threads orathreads" |
105 |
- |
106 |
-DEPEND="" |
107 |
- |
108 |
-pkg_setup() { |
109 |
- if use orathreads && use threads; then |
110 |
- eerror |
111 |
- eerror 'Enable the "threads" USE flag for POSIX threads,' |
112 |
- eerror '*or* the "orathreads" USE flag for Oracle threads' |
113 |
- eerror |
114 |
- die 'Both "threads" and "orathreads" USE flags set, see above' |
115 |
- fi |
116 |
- |
117 |
- # Make sure ORACLE_HOME is set |
118 |
- if [ -z "${ORACLE_HOME}" ]; then |
119 |
- eerror |
120 |
- eerror 'libsqlora8 requires that the ORACLE_HOME environment variable be set.' |
121 |
- eerror 'Try: "export ORACLE_HOME=/usr/local/oracle" if you do not know what to do.' |
122 |
- eerror |
123 |
- die 'ORACLE_HOME not set, see above' |
124 |
- fi |
125 |
-} |
126 |
- |
127 |
-src_compile() { |
128 |
- local myconf; |
129 |
- |
130 |
- # Add $ORACLE_HOME/lib to LD_LIBRARY_PATH |
131 |
- if [ -z "${LD_LIBRARY_PATH}" ]; then |
132 |
- LD_LIBRARY_PATH=${ORACLE_HOME}/lib |
133 |
- else |
134 |
- LD_LIBRARY_PATH=${ORACLE_HOME}/lib:${LD_LIBRARY_PATH} |
135 |
- fi |
136 |
- |
137 |
- export LD_LIBRARY_PATH |
138 |
- |
139 |
- use threads && myconf="--with-threads=posix" |
140 |
- use orathreads && myconf="--with-threads=oracle" |
141 |
- |
142 |
- # Build |
143 |
- econf ${myconf} || die "configure failed" |
144 |
- emake |
145 |
-} |
146 |
- |
147 |
-src_install () { |
148 |
- einstall |
149 |
- dodoc ChangeLog NEWS NEWS-2.2 |
150 |
- |
151 |
- # TODO |
152 |
- # Copy contents of doc and examples directory to doc |
153 |
-} |