Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/ocp/
Date: Sat, 09 Feb 2019 09:52:31
Message-Id: 1549705920.c81f2f6103a468f1cc5f42f6b6f111f504050c7d.asturm@gentoo
1 commit: c81f2f6103a468f1cc5f42f6b6f111f504050c7d
2 Author: Max Satula <maksym.satula <AT> gmail <DOT> com>
3 AuthorDate: Sat Jan 12 20:42:16 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 9 09:52:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81f2f61
7
8 dev-db/ocp: bump to 0.3
9
10 Bump to EAPI=7
11
12 Replace a dependency on a transitional package `dev-db/oracle-instantclient-basic`
13 with a newer `dev-db/oracle-instantclient` package
14 https://bugs.gentoo.org/show_bug.cgi?id=524922#c12
15
16 Signed-off-by: Max Satula <maksym.satula <AT> gmail.com>
17 Closes: https://github.com/gentoo/gentoo/pull/10814
18 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
19
20 dev-db/ocp/Manifest | 1 +
21 dev-db/ocp/{ocp-9999.ebuild => ocp-0.3.ebuild} | 8 +++++---
22 dev-db/ocp/ocp-9999.ebuild | 8 +++++---
23 3 files changed, 11 insertions(+), 6 deletions(-)
24
25 diff --git a/dev-db/ocp/Manifest b/dev-db/ocp/Manifest
26 index 61b6d9a9a2f..ea45fabd60b 100644
27 --- a/dev-db/ocp/Manifest
28 +++ b/dev-db/ocp/Manifest
29 @@ -1 +1,2 @@
30 DIST ocp-0.2.tar.gz 144968 BLAKE2B 495b2af182768a0c18b08350fb77b09964be52afd72f3ff610ed6a0a54905b116744c93c6261986ca48a0a0c56fd23fd2d15d1919f4c8a4ff8b55ebe532efa07 SHA512 0ff132a368a615c2a8e8ecb391da138ce9fd52d638de82e5a4d1c9ec3340b117c9c4d8f971ee86724664f93b4073b189407c3c19a0c22c961922145d30221c85
31 +DIST ocp-0.3.tar.gz 156447 BLAKE2B 0c7f8743fe4ae46c3b9d95847e39c51fd1b829af9e9a7e87f3b7a59ab146a89ccf0913bebc3b1c0ef985b0faf24152756dc73f243217e4d2dcf8013de342ed27 SHA512 1af862f21cc3572344d26b6765a93e4e9c8744e01d550a36647afbe690886717e3fb1d8264832563161d65d04c41fe183dd8b518320df959fd3aa4ebbe602d38
32
33 diff --git a/dev-db/ocp/ocp-9999.ebuild b/dev-db/ocp/ocp-0.3.ebuild
34 similarity index 86%
35 copy from dev-db/ocp/ocp-9999.ebuild
36 copy to dev-db/ocp/ocp-0.3.ebuild
37 index baab9a6071e..5c6591bf5df 100644
38 --- a/dev-db/ocp/ocp-9999.ebuild
39 +++ b/dev-db/ocp/ocp-0.3.ebuild
40 @@ -1,7 +1,7 @@
41 # Copyright 1999-2017 Gentoo Foundation
42 # Distributed under the terms of the GNU General Public License v2
43
44 -EAPI=6
45 +EAPI=7
46
47 DESCRIPTION="Oracle copy tool"
48 HOMEPAGE="https://github.com/maxsatula/ocp"
49 @@ -20,10 +20,12 @@ SLOT="0"
50 IUSE=""
51
52 RDEPEND="
53 - dev-db/oracle-instantclient-basic
54 + dev-db/oracle-instantclient
55 dev-libs/popt
56 sys-libs/zlib"
57 -DEPEND="${RDEPEND}"
58 +DEPEND="
59 + dev-db/oracle-instantclient[sdk]
60 + ${RDEPEND}"
61
62 src_prepare() {
63 default
64
65 diff --git a/dev-db/ocp/ocp-9999.ebuild b/dev-db/ocp/ocp-9999.ebuild
66 index baab9a6071e..5c6591bf5df 100644
67 --- a/dev-db/ocp/ocp-9999.ebuild
68 +++ b/dev-db/ocp/ocp-9999.ebuild
69 @@ -1,7 +1,7 @@
70 # Copyright 1999-2017 Gentoo Foundation
71 # Distributed under the terms of the GNU General Public License v2
72
73 -EAPI=6
74 +EAPI=7
75
76 DESCRIPTION="Oracle copy tool"
77 HOMEPAGE="https://github.com/maxsatula/ocp"
78 @@ -20,10 +20,12 @@ SLOT="0"
79 IUSE=""
80
81 RDEPEND="
82 - dev-db/oracle-instantclient-basic
83 + dev-db/oracle-instantclient
84 dev-libs/popt
85 sys-libs/zlib"
86 -DEPEND="${RDEPEND}"
87 +DEPEND="
88 + dev-db/oracle-instantclient[sdk]
89 + ${RDEPEND}"
90
91 src_prepare() {
92 default