[gentoo-commits] repo/gentoo:master commit in: dev-db/oracle-instantclient-basic/

[Aaron Bauman]

commit:     8fcd5d8cb3195170d4776dec543481e2eb7eb4b4
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 20:06:50 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 22:37:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcd5d8c

dev-db/oracle-instantclient-basic: drop EAPI=0 ebuild

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-db/oracle-instantclient-basic/Manifest         |   8 --
 .../oracle-instantclient-basic-10.2.0.3-r1.ebuild  | 118 ---------------------
 .../oracle-instantclient-basic-11.2.0.2.ebuild     | 116 --------------------
 3 files changed, 242 deletions(-)

diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 22d28b61689..48135bfba5b 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,16 +1,8 @@
 DIST instantclient-basic-linux-11.2.0.3.0.zip 58502865 BLAKE2B da0f428447a4300dc64b9845d6f55c3dbeff38af06b1cb38b083f661a575a5c1749737ab389b7222f7be2a05ccdf367830642b1656505b078c0c3ca523159ae8 SHA512 c790f593e67bcc7c114a6287e1f064c03f292472e0a1a5e617a9f19017f06442f31502f66af8e6cfdf2235a18546104dc9aac164a3aa641db5728b66685c9302
 DIST instantclient-basic-linux-11.2.0.4.0.zip 58793148 BLAKE2B e0f92f119a5e8890a4507160179cd49af15ed14bd7c48480d3f685a3e4918a96e6444e75c6ea11d34681a6c66ff0e8011f44840de5f080e2dc3c03079361e4a1 SHA512 b333c9334e960617ac7cc68ad1c7b45f990d5c24c7a5bc8e51b3bc8ff6476acfb6a032521f75ba39327c71ee9676d1163b252066d52e97c1dfe9c092a92a62a0
-DIST instantclient-basic-linux-x86-64-10.2.0.3-20070103.zip 36454483 BLAKE2B ca6ea55aa4f8ec6add250c6b27944a15662fa78b6f2f821bf6486ba774f9fa9f8dad8c458aab93d160bd3421aa21f80bce81cd87d67154e6dcdf334df06f54a3 SHA512 6fee52e3e9c4c234a6fd437643d7c5da7bcb5bcf8f4c4dc937c1b5894226a1288f3ec2a857ac5c6affed87157dadf9fb88d7f2228503227a10375f6ec902a5d2
-DIST instantclient-basic-linux-x86-64-11.2.0.2.0.zip 59090676 BLAKE2B a6626faaab99d63d96fb67f8d6d0dea7d6ff2fb83d16ccb030e8f23de420d21939efbcb74d487a191cec9eee15927da9d920111ebec1aca6500ed0483062112a SHA512 27cc6e6b70b0f924f03d5ecb84a9cb9c8ac0adf9bd7b5a5b800e84a941732413621b8673216d135ff4fc69107223e31914afd5a04cdeb9c594a0a0314d2a28d9
 DIST instantclient-basic-linux.x64-11.2.0.3.0.zip 60331694 BLAKE2B 8d3e4946c04edd515f0d2495e8ce25b152ded0d903d58244d0d2a2b8bbaf263b0de67829a932f637193c08e96f4a532c131f50b6594009ca4ee1dc228d6a06d1 SHA512 708940b5ca5bc4e0617da2c4da61d0a85834e3e0731ac328a201954558a624162f71d342d674b08ec2cf076e8f639c230f88a73f6d9bfe8908b0e76805e617b7
 DIST instantclient-basic-linux.x64-11.2.0.4.0.zip 60704657 BLAKE2B 77735e81a0acf88221fefff38447536a81a32a6f5cb09dcd4526d43315be1fabb6882bb9e7a5703a4188ac9e112fba611f3e2c064a128eb66512935a1af62b33 SHA512 01ed32f1771bfa2f8ef1b81314843fb2b7b81582f33c07d86670c959bbb08355dc7cc8da586852bb353a3a914658d1e7828d6b5df884215de8d76881c956a989
-DIST instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 BLAKE2B 5b6628e234de93506d28d408f14bc800db2407e2ea58ce2e6be175f1be4dc31ed0e962fc1a5324f26ded7a7d6f4a9ba532705f54631adf361cf559c5c0487518 SHA512 7ebea6e7c4b2316affa6f5fd7ab821596d5ed236b10dbe6f42b8e8afed018e45dc9726b13a4f7a3c1fb9b699a03891355f538ee2848b3dfaada997d6cab71e1a
-DIST instantclient-basic-linux32-11.2.0.2.0.zip 57278802 BLAKE2B c180fbb3aac567e3cc72510f221a5d559ee19d3b330ece66bda037ae2ec1b584aa749326fdc27dda6af768dd7d46e9a07f0c674b6a1f298ddb86f39110fd63c9 SHA512 f854797b9baf2130a347a0e6a05707b1e959aa31db3817176641c5c2044f7c46c9e2e9968b4dc4856c8d16f75a4286f53103b8f8b81b3bf1ef7ce81233d94f57
 DIST instantclient-sdk-linux-11.2.0.3.0.zip 639306 BLAKE2B 80d0cac2061156fd4cfe0792a7bebcaca77ce855335c651472d0ee74cf87350ae4925d92ecd12407b285605fb0d533dcf2a6dfc46d8a0eaa6172461e9c96dc2f SHA512 fa0f98d4b2002982fab4438f734904e0ebfab777d601321423b454f9188c3b863e853fc5486c9958771f7ff8c9a544ce73e80750d745c3142872927ed1777ee1
 DIST instantclient-sdk-linux-11.2.0.4.0.zip 643080 BLAKE2B 9ea15b227d260f7e24b572be1238074dc3a3033a2ab6313d95b750ae48468bda018c52ac604664caa128396024c0ff4bcbc0d401b7900ae27f5f3877a4b44123 SHA512 09e14a0ed88182b685a00b6370da4379710c4179fcf2d5ebdb43684b7099484122f7f5181a80352464f03ae9d0150f5c2ee5f20ede98faa9073294324b9faec8
-DIST instantclient-sdk-linux-x86-64-10.2.0.3-20070103.zip 603137 BLAKE2B a97a188280d8a9537707b5d9791ae43d67b4e98cea0af8e8348f2cc1b9699181ac649cbcc6f006fee3ac9b76a1bf8d730f438e60d28341b1db25504aa164b9b5 SHA512 25b00c407d4ed04287cc8473cf156c7c987e2c36787cf1bac229b902adc2781554f10f1a50b17bae96e2704b217ff60c4eb9f8c79ecdb3d44b13c9a84784a766
-DIST instantclient-sdk-linux-x86-64-11.2.0.2.0.zip 638214 BLAKE2B 67d7f3efa0ba1999b08db435f6a806f54d74e579592171d3a8d5abb9bcdaed6f02f1d7591dd012b5ed73c33971e3009f2ae2e1869aed6c04ed8bf232ff5c0349 SHA512 5656da9e09fb35c16bed959d8746d5e4dfd4c6da2582a10a182442d83759739c3e71093cde63da1236bea04e92a8e15bda1b2e1468fed32d87f4f223ec65c495
 DIST instantclient-sdk-linux.x64-11.2.0.3.0.zip 641586 BLAKE2B b3a3fa4c362031aa9d9e926f852e2bccc41dd12c8dac0a18b707f22130a8bfc1b04e12c13b7f94a845439d922884d9f83c149ac0d59af498a73f4c74730be715 SHA512 08b3fdc68e09f262549e2505867943aff5c3927d158569ea7e0bca4f958af725a46143d325dcf80a6d48d09f9240f147470439ac55ea848a27df3eeedd28f732
 DIST instantclient-sdk-linux.x64-11.2.0.4.0.zip 643089 BLAKE2B 710f0a2a81dde6cabdfb2e1472f40cb715d1e060377bec1d05d8b1c794ec05b023f4feca30603202487b52527723ed9d60f73371443ce76ad2781da9c1ed5412 SHA512 7198ddc7d8804353900e45b36de79659d75dee0197c4dd58bd4d69408e7131c95025223bbd1f39ef208269bff379daa6e05f4371af83a82b83997cafadc1d642
-DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 BLAKE2B e7c447c012503324a7dc0a8790a32939a0739add7b18edfe025a2204c13de8c57348754cd20da71ec45543748f670935f6cf1096ef8bd1f0e4cfb06526f8d6a9 SHA512 89fb0a1f58a46149ddcccc5205cb6b61988142d01df7de7c5dd76c4ef7a2c880a19d611efb8ae03e26d361d1f9a767bf58e2d113a20cd1b9e51a29f500be4cba
-DIST instantclient-sdk-linux32-11.2.0.2.0.zip 638200 BLAKE2B 5847c7dbbd9e4328cbe5a0dc33bf0793362c7a375ffbdaff7a22ad03577d732ff1d685021d33f9f0c7bc40df2640bdaa278298f7e1e55910007391fed7b9c9ef SHA512 41d0f6e327a548c6ba152853a706d1630052f3710ad94015a1fad44cf149a260c389eb973ba49f9239e453a51ceace2c0d3b86ace764f2651dd45ad546084abe

diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild
deleted file mode 100644
index 78e7bdd82af..00000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.3-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20061115"
-MY_PSDK_x86="${MY_P_x86/basic/sdk}"
-
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20070103"
-MY_PSDK_amd64="${MY_P_amd64/basic/sdk}"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://www.oracle.com/technology/tech/oci/instantclient/index.html"
-SRC_URI="amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )
-		 x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="~virtual/libstdc++-3.3"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-	MY_PSDK=MY_PSDK_${ARCH}
-	export MY_PSDK=${!MY_PSDK}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.zip"
-	eerror "  ${MY_PSDK}.zip"
-	eerror "Then after downloading put them in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-	unzip "${DISTDIR}"/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip"
-}
-
-src_install() {
-	# Patch the SDK makefile
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	# SDK makefile
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	cd "${S}"/instantclient_10_2/sdk/demo
-	mv demo.mk demo_xe.mk
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	doins demo_xe.mk
-
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_10_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.10.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/include /usr/$(get_libdir)/oracle/${PV}/client/rdbms/public
-
-	# includes
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/include
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/include
-	cd "${S}"/instantclient_10_2/sdk/include
-	doins *.h
-	# link to original location
-	dodir /usr/include/oracle/${PV}/
-	ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client
-
-	# share info
-	cd "${S}"/instantclient_10_2/sdk/demo
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "TNS_ADMIN=/etc/oracle/" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-
-	# create path for tnsnames.ora
-	dodir /etc/oracle
-}
-
-pkg_postinst() {
-	elog "The Basic client page for Oracle 10g has been installed."
-	elog "You may also wish to install the oracle-instantclient-jdbc (for"
-	elog "supplemental JDBC functionality with Oracle) and the"
-	elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	elog "packages as well."
-	elog
-	elog "Examples are located in /usr/share/doc/${PF}/"
-	elog
-	elog "oracle-instantclient-* packages aren't installed in different"
-	elog "SLOTs any longer. You may want to uninstall older versions."
-	elog
-	elog "TNS_ADMIN has been set to "${ROOT}"etc/oracle by default, put your"
-	elog "tnsnames.ora there or configure TNS_ADMIN to point to"
-	elog "your user specific configuration."
-}

diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
deleted file mode 100644
index dce75a0bcb6..00000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}.0"
-MY_PSDK_x86="${MY_P_x86/basic/sdk}"
-
-MY_PBASE_amd64="${PN/oracle-instantclient-basic/instantclient-basic-linux}-x86-64-${PV}.0"
-MY_P_amd64="${PN/oracle-instantclient-basic/instantclient-basic-linux}-x86-64-${PV}.0"
-MY_PSDK_amd64="${MY_PBASE_amd64/basic/sdk}"
-
-DESCRIPTION="Oracle 11g client installation for Linux with SDK"
-HOMEPAGE="http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )
-		 amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libaio"
-
-S="${WORKDIR}"
-
-my_arch() {
-	MY_P=MY_P_${ARCH}
-	export MY_P=${!MY_P}
-	MY_PSDK=MY_PSDK_${ARCH}
-	export MY_PSDK=${!MY_PSDK}
-}
-
-pkg_setup() {
-	my_arch
-}
-
-pkg_nofetch() {
-	my_arch
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "select your platform and download the"
-	eerror "Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.zip"
-	eerror "  ${MY_PSDK}.zip"
-	eerror "Then after downloading put them in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	unzip "${DISTDIR}"/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
-	unzip "${DISTDIR}"/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip"
-}
-
-src_install() {
-	# SDK makefile
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	cd "${S}"/instantclient_11_2/sdk/demo
-	mv demo.mk demo_xe.mk
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/rdbms/demo
-	doins demo_xe.mk
-
-	# library
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/lib
-	cd "${S}"/instantclient_11_2
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.11.1
-
-	# fixes symlinks
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so.11.1 /usr/$(get_libdir)/oracle/${PV}/client/lib/libclntsh.so
-	dosym /usr/$(get_libdir)/oracle/${PV}/client/include /usr/$(get_libdir)/oracle/${PV}/client/rdbms/public
-
-	# includes
-	dodir /usr/$(get_libdir)/oracle/${PV}/client/include
-	insinto /usr/$(get_libdir)/oracle/${PV}/client/include
-	cd "${S}"/instantclient_11_2/sdk/include
-	# Remove ldap.h, #299562
-	rm ldap.h || die "rm failed"
-	doins *.h
-	# link to original location
-	dodir /usr/include/oracle/${PV}/
-	ln -s "${D}"/usr/$(get_libdir)/oracle/${PV}/client/include "${D}"/usr/include/oracle/${PV}/client
-
-	# share info
-	cd "${S}"/instantclient_11_2/sdk/demo
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/$(get_libdir)/oracle/${PV}/client" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/$(get_libdir)/oracle/${PV}/client/lib" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/$(get_libdir)/oracle/${PV}/client/include" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-	echo "TNS_ADMIN=/etc/oracle/" >> "${D}"/etc/env.d/50oracle-instantclient-basic
-
-	# create path for tnsnames.ora
-	dodir /etc/oracle
-}
-
-pkg_postinst() {
-	elog "The Basic client package for Oracle 11g has been installed."
-	elog "You may also wish to install the oracle-instantclient-jdbc (for"
-	elog "supplemental JDBC functionality with Oracle) and the"
-	elog "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	elog "packages as well."
-	elog
-	elog "Examples are located in /usr/share/doc/${PF}/"
-	elog
-	elog "TNS_ADMIN has been set to "${ROOT}"etc/oracle by default, put your"
-	elog "tnsnames.ora there or configure TNS_ADMIN to point to"
-	elog "your user specific configuration."
-}