summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Satula <maksym.satula@gmail.com>2019-01-12 15:42:16 -0500
committerAndreas Sturmlechner <asturm@gentoo.org>2019-02-09 10:52:00 +0100
commitc81f2f6103a468f1cc5f42f6b6f111f504050c7d (patch)
tree6ea8d94136ffda7526e69bea703de31439c894a2
parentkde-misc/tellico: remove unused patches (diff)
downloadgentoo-c81f2f6103a468f1cc5f42f6b6f111f504050c7d.tar.gz
gentoo-c81f2f6103a468f1cc5f42f6b6f111f504050c7d.tar.bz2
gentoo-c81f2f6103a468f1cc5f42f6b6f111f504050c7d.zip
dev-db/ocp: bump to 0.3
Bump to EAPI=7 Replace a dependency on a transitional package `dev-db/oracle-instantclient-basic` with a newer `dev-db/oracle-instantclient` package https://bugs.gentoo.org/show_bug.cgi?id=524922#c12 Signed-off-by: Max Satula <maksym.satula@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10814 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-db/ocp/Manifest1
-rw-r--r--dev-db/ocp/ocp-0.3.ebuild36
-rw-r--r--dev-db/ocp/ocp-9999.ebuild8
3 files changed, 42 insertions, 3 deletions
diff --git a/dev-db/ocp/Manifest b/dev-db/ocp/Manifest
index 61b6d9a9a2f..ea45fabd60b 100644
--- a/dev-db/ocp/Manifest
+++ b/dev-db/ocp/Manifest
@@ -1 +1,2 @@
DIST ocp-0.2.tar.gz 144968 BLAKE2B 495b2af182768a0c18b08350fb77b09964be52afd72f3ff610ed6a0a54905b116744c93c6261986ca48a0a0c56fd23fd2d15d1919f4c8a4ff8b55ebe532efa07 SHA512 0ff132a368a615c2a8e8ecb391da138ce9fd52d638de82e5a4d1c9ec3340b117c9c4d8f971ee86724664f93b4073b189407c3c19a0c22c961922145d30221c85
+DIST ocp-0.3.tar.gz 156447 BLAKE2B 0c7f8743fe4ae46c3b9d95847e39c51fd1b829af9e9a7e87f3b7a59ab146a89ccf0913bebc3b1c0ef985b0faf24152756dc73f243217e4d2dcf8013de342ed27 SHA512 1af862f21cc3572344d26b6765a93e4e9c8744e01d550a36647afbe690886717e3fb1d8264832563161d65d04c41fe183dd8b518320df959fd3aa4ebbe602d38
diff --git a/dev-db/ocp/ocp-0.3.ebuild b/dev-db/ocp/ocp-0.3.ebuild
new file mode 100644
index 00000000000..5c6591bf5df
--- /dev/null
+++ b/dev-db/ocp/ocp-0.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Oracle copy tool"
+HOMEPAGE="https://github.com/maxsatula/ocp"
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/maxsatula/ocp.git"
+ EGIT_BRANCH="develop"
+ inherit git-r3 autotools
+else
+ SRC_URI="https://github.com/maxsatula/ocp/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-db/oracle-instantclient
+ dev-libs/popt
+ sys-libs/zlib"
+DEPEND="
+ dev-db/oracle-instantclient[sdk]
+ ${RDEPEND}"
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == *9999 ]] ; then
+ eautoreconf
+ fi
+}
diff --git a/dev-db/ocp/ocp-9999.ebuild b/dev-db/ocp/ocp-9999.ebuild
index baab9a6071e..5c6591bf5df 100644
--- a/dev-db/ocp/ocp-9999.ebuild
+++ b/dev-db/ocp/ocp-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Oracle copy tool"
HOMEPAGE="https://github.com/maxsatula/ocp"
@@ -20,10 +20,12 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-db/oracle-instantclient-basic
+ dev-db/oracle-instantclient
dev-libs/popt
sys-libs/zlib"
-DEPEND="${RDEPEND}"
+DEPEND="
+ dev-db/oracle-instantclient[sdk]
+ ${RDEPEND}"
src_prepare() {
default