Cleanup

Package-Manager: portage-2.1.2_rc4-r1

13 files changed, 4 insertions, 519 deletions

diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index db769d948cf2..a39c4137df32 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,52 +1,19 @@
-DIST instantclient-basic-linux-x86-64-10.2.0.1-20051025.zip 35574833
 DIST instantclient-basic-linux-x86-64-10.2.0.2-20060228.zip 35625985 RMD160 a52a82c9bc831e1e5a0d9af899748ab44171bc84 SHA256 e3894c1e15de6e9e1fd3893c453cdfb23e89b1e9ad3ca90af3c4703a5e01cadc
-DIST instantclient-basic-linux32-10.1.0.4-20050525.zip 29879923
 DIST instantclient-basic-linux32-10.1.0.5-20060511.zip 31413713 RMD160 432bf95f4b3d63456624bde1fe93269693a841c7 SHA1 e9ac1688b85117449eb55bb0012824286f01e4a4 SHA256 3adc1bbb9a563cbc64b5225f9573e924c6a73263d46bc325df2931f7be7fd34a
-DIST instantclient-basic-linux32-10.2.0.1-20050713.zip 33808746
 DIST instantclient-basic-linux32-10.2.0.2-20060331.zip 33901074 RMD160 26f3c7a64bfb3b747b0cb454ea322d97954cb5fb SHA256 ab1d0d0cf3222788ff8add4a1154d2750487c61e64879af68f7ee538ba641ab2
 DIST instantclient-basic-linux32-10.2.0.3-20061115.zip 34556803 RMD160 12ac6ca9f94a255ca27de44a2feea6e49c3a4547 SHA1 08092f796c1c362254d18e73c955fd0bff9db78b SHA256 11fce485c405afa4a30f34eba36ad0d566a599617f80dfc565bd08d8c421e1ae
 DIST instantclient-basic-linuxppc-10.2.0.2-20060327.zip 35943169 RMD160 174c7e5fbb129488321b73fedb2dec60d3040ef4 SHA256 2701453735b75ed7c805c64848dc1ad2c3882f6fa44a1795e6582bf036c37b33
 DIST instantclient-basic-linuxppc32-10.2.0.2-20060327.zip 34223045 RMD160 727d136483ea26e54663336820bdc2b4fd9d3e50 SHA256 dbe8997d411e7fb6957dd2c0fb2dd34a5295bc62ae9e7918491fde6302c73b7a
-DIST instantclient-sdk-linux-x86-64-10.2.0.1-20051025.zip 602351
 DIST instantclient-sdk-linux-x86-64-10.2.0.2-20060228.zip 602431 RMD160 7dc30ab322e743fa672d37fbd25fd46dee465456 SHA256 97de88f06154a197e4013c9a2765a71d50a83d67eca67d933670ef603d27e1df
-DIST instantclient-sdk-linux32-10.1.0.4-20050525.zip 294567
 DIST instantclient-sdk-linux32-10.1.0.5-20060511.zip 294618 RMD160 f507160d73e61e2a613243d8cc823a902647b1e1 SHA1 6e7186007ce6897c0d05dfad5451d491cac35edd SHA256 3d8b401bbf461f91791b205949a5ea4e8ffbb54f3778372f6d376de7517f8ee4
-DIST instantclient-sdk-linux32-10.2.0.1-20050713.zip 602102
 DIST instantclient-sdk-linux32-10.2.0.2-20060331.zip 602224 RMD160 99e622d2e09ed04ccefa343f2bc695dc1da89de6 SHA256 8e734c69deaa10be51e3839d7a64e57fd5952703b66cdf5681715bbe147f1ff7
 DIST instantclient-sdk-linux32-10.2.0.3-20061115.zip 602897 RMD160 06ce90ef1fb7c61e920e3a3e37578f54b3d2db0f SHA1 cb70884b44150f5048c4876e41c58fec8d252705 SHA256 6893a784e1802e18300230dcac1ed2ecd6dc68a7060c02717f73bf268d43f6a5
 DIST instantclient-sdk-linuxppc-10.2.0.2-20060327.zip 602338 RMD160 8d81cc58e3bd2176ce6bbc7cd0db615907f74148 SHA256 2c81524815e3db184149f38fcbdd87f1b548aa722ffef4d5127b3b30941d216f
 DIST instantclient-sdk-linuxppc32-10.2.0.2-20060327.zip 602338 RMD160 b3d535b419d3b5d74a5c49dc867811a690c7eb7d SHA256 a4589149daa269b2ca07c6dfa1e0ee204e471c6ead85438848d17ce11b1c0468
-DIST oracle-instantclient-basic-10.1.0.2-1.i386.rpm 40065717
-DIST oracle-instantclient-basic-10.1.0.3-1.i386.rpm 30791288
-DIST oracle-instantclient-devel-10.1.0.3-1.i386.rpm 281013
-EBUILD oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1538 RMD160 0b8a06c65f02b94344cdb6ecb5c7b8b9cc1224e3 SHA1 4a27b45286b2479a6fa526a56740db3376d5880b SHA256 a098e1183f71ace34ebfbe5289f31c42945482ba4eace8240b8a549abe5ef31f
-MD5 deb3f188b656b1f030dbbcced23c7704 oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1538
-RMD160 0b8a06c65f02b94344cdb6ecb5c7b8b9cc1224e3 oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1538
-SHA256 a098e1183f71ace34ebfbe5289f31c42945482ba4eace8240b8a549abe5ef31f oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1538
-EBUILD oracle-instantclient-basic-10.1.0.2_p1.ebuild 1386 RMD160 24554859042ff87dd61ad12a3df14da50ec570f0 SHA1 a08dea7bc899cd11279106e4c546255acc77c9a6 SHA256 2a4153c188231e33969c5db1ef991f0c41ea22f872a0820125ee2e2cb9347e86
-MD5 7c37d67e5cfe735f2feedd22d5b3d408 oracle-instantclient-basic-10.1.0.2_p1.ebuild 1386
-RMD160 24554859042ff87dd61ad12a3df14da50ec570f0 oracle-instantclient-basic-10.1.0.2_p1.ebuild 1386
-SHA256 2a4153c188231e33969c5db1ef991f0c41ea22f872a0820125ee2e2cb9347e86 oracle-instantclient-basic-10.1.0.2_p1.ebuild 1386
-EBUILD oracle-instantclient-basic-10.1.0.3.ebuild 2846 RMD160 3feccc4eda38dea46e513b74cb5ca1fef4e13b4f SHA1 1478da1e58b8f27147e18cf1d2b234e51f06cb61 SHA256 fb885100c26b8504ccb348fe8b97db8db1c6fb3e9c26d1bb322bdac2ffd88c5e
-MD5 6d594cb7cee5a6336054eae7d48dbb0e oracle-instantclient-basic-10.1.0.3.ebuild 2846
-RMD160 3feccc4eda38dea46e513b74cb5ca1fef4e13b4f oracle-instantclient-basic-10.1.0.3.ebuild 2846
-SHA256 fb885100c26b8504ccb348fe8b97db8db1c6fb3e9c26d1bb322bdac2ffd88c5e oracle-instantclient-basic-10.1.0.3.ebuild 2846
-EBUILD oracle-instantclient-basic-10.1.0.4.ebuild 2674 RMD160 9e51f895ed7db5d037ec114ca351b20558fe6458 SHA1 4ee354656ebb4211ba75e307aa1c0c577a1e35ab SHA256 e9f8c1b0f57228d38699fd6f700de2223c7a3b9abeb95efec5c7a7142eedaba4
-MD5 717af28fbe94dbe8dfc5dc5a85b1c258 oracle-instantclient-basic-10.1.0.4.ebuild 2674
-RMD160 9e51f895ed7db5d037ec114ca351b20558fe6458 oracle-instantclient-basic-10.1.0.4.ebuild 2674
-SHA256 e9f8c1b0f57228d38699fd6f700de2223c7a3b9abeb95efec5c7a7142eedaba4 oracle-instantclient-basic-10.1.0.4.ebuild 2674
 EBUILD oracle-instantclient-basic-10.1.0.5.ebuild 2676 RMD160 5313de9d9e76d12117393ebe1f86d16253f26a24 SHA1 720edcae78f55f34cbf210ac667f65b49548bd3e SHA256 84ce8453829b6de86f34c49a8fc73476575f56da19a2da18a37d1a30b88720a5
 MD5 8b63f5550b7e93069ae770fe052be35c oracle-instantclient-basic-10.1.0.5.ebuild 2676
 RMD160 5313de9d9e76d12117393ebe1f86d16253f26a24 oracle-instantclient-basic-10.1.0.5.ebuild 2676
 SHA256 84ce8453829b6de86f34c49a8fc73476575f56da19a2da18a37d1a30b88720a5 oracle-instantclient-basic-10.1.0.5.ebuild 2676
-EBUILD oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050 RMD160 2ea0fbf2f52b680e49c6d91d35da1dfb60b93bd3 SHA1 e0222facf05ccb6b09ed6184d733605250eb40f8 SHA256 524619e558133362f9d6ef9d5f9ad1fdfde76809c4e44c414826eca1d2e26357
-MD5 212123ffb0377954fdc3891b0a9a784d oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050
-RMD160 2ea0fbf2f52b680e49c6d91d35da1dfb60b93bd3 oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050
-SHA256 524619e558133362f9d6ef9d5f9ad1fdfde76809c4e44c414826eca1d2e26357 oracle-instantclient-basic-10.2.0.1-r1.ebuild 3050
-EBUILD oracle-instantclient-basic-10.2.0.1.ebuild 2678 RMD160 a2323b64b7908b954dafa28118426e7c67479d9b SHA1 b88f40d512a5c03d75d539f191b23837dbc432fd SHA256 a3fb625cee8569ac4403f010dfd5630fce72a42f54caa228c87da3e733466a13
-MD5 c199aa62820ed740c2a5392fb8844cd4 oracle-instantclient-basic-10.2.0.1.ebuild 2678
-RMD160 a2323b64b7908b954dafa28118426e7c67479d9b oracle-instantclient-basic-10.2.0.1.ebuild 2678
-SHA256 a3fb625cee8569ac4403f010dfd5630fce72a42f54caa228c87da3e733466a13 oracle-instantclient-basic-10.2.0.1.ebuild 2678
 EBUILD oracle-instantclient-basic-10.2.0.2.ebuild 3245 RMD160 c34fec5d06c2befcbd438d876171de2406b9b1ef SHA1 bf78560bb28d24272f60290810c1d8b64302a458 SHA256 21f95dc7f225f7e9539d6008283d9429e09303f29cb0e26ae33796dd471f030d
 MD5 d84ac24a3a553bd5c48a7993acae57b0 oracle-instantclient-basic-10.2.0.2.ebuild 3245
 RMD160 c34fec5d06c2befcbd438d876171de2406b9b1ef oracle-instantclient-basic-10.2.0.2.ebuild 3245
@@ -55,35 +22,17 @@ EBUILD oracle-instantclient-basic-10.2.0.3.ebuild 2940 RMD160 bdf95182739be848c4
 MD5 3001ead6cad6c62a4078071d1a766dec oracle-instantclient-basic-10.2.0.3.ebuild 2940
 RMD160 bdf95182739be848c4a188090ffff69748a56bc0 oracle-instantclient-basic-10.2.0.3.ebuild 2940
 SHA256 a416ea15bd88526c6a85fddea95d97db2592f8280dfd45311d7b98299a8ef558 oracle-instantclient-basic-10.2.0.3.ebuild 2940
-MISC ChangeLog 4209 RMD160 2dfbadf9d5338b53ebbe3e45726954a894f6b6b7 SHA1 bc734f78915f92c3bbeeca4f0fe05e88c706fcbf SHA256 ee70b10a358355a1b6ea8f3741024dd5493eb9774b6043779b0ce82391b55c40
-MD5 48dab4fedd7170958e3a4ad9a676b490 ChangeLog 4209
-RMD160 2dfbadf9d5338b53ebbe3e45726954a894f6b6b7 ChangeLog 4209
-SHA256 ee70b10a358355a1b6ea8f3741024dd5493eb9774b6043779b0ce82391b55c40 ChangeLog 4209
+MISC ChangeLog 4570 RMD160 a7f80dac000f540faef152c524e52ae1492a1e11 SHA1 d0496c591c6d9f190749c2e8e4019a4ad9142dd1 SHA256 09bb3c9a55e7c5648e05b12e915f74d94a2b732388077ec93e91895936e0a8a5
+MD5 8aa969e85b12c440b901ff162f1142cf ChangeLog 4570
+RMD160 a7f80dac000f540faef152c524e52ae1492a1e11 ChangeLog 4570
+SHA256 09bb3c9a55e7c5648e05b12e915f74d94a2b732388077ec93e91895936e0a8a5 ChangeLog 4570
 MISC metadata.xml 388 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 SHA1 f1cf715b4a7a2d39696097b2510967d640948075 SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893
 MD5 9f5d6b0af6c2271c1e2bbf0518bcc925 metadata.xml 388
 RMD160 f12fead3733f8a2760b2f190bcadd9a810e4bbc1 metadata.xml 388
 SHA256 fa323e9829505e837ae433af3b0ce5e7b97e1aef0ec614baa6c6ba4602def893 metadata.xml 388
-MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2_p1 93
-RMD160 520e905e7255aeae9f89a2b402785e29ee8e9d25 files/digest-oracle-instantclient-basic-10.1.0.2_p1 93
-SHA256 f1cb25747422f1e852944eb060167ad2bf3501385c3ca37bc1d82bd48a9b5d23 files/digest-oracle-instantclient-basic-10.1.0.2_p1 93
-MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1 93
-RMD160 520e905e7255aeae9f89a2b402785e29ee8e9d25 files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1 93
-SHA256 f1cb25747422f1e852944eb060167ad2bf3501385c3ca37bc1d82bd48a9b5d23 files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1 93
-MD5 f34650dcfa5ddf5d3957f0c39dfd2978 files/digest-oracle-instantclient-basic-10.1.0.3 184
-RMD160 4cd6b00b3e8afc38a9d3737aa29f2f6f89029b05 files/digest-oracle-instantclient-basic-10.1.0.3 184
-SHA256 b3d9842f3f584e8bd58c92060ee2405df908207fd6e2ca0d0ebcc4faeb8313c5 files/digest-oracle-instantclient-basic-10.1.0.3 184
-MD5 2ae2e545ecb4e26117f7872200b0e95f files/digest-oracle-instantclient-basic-10.1.0.4 188
-RMD160 8482a72a4fae2738aae220517496dc20ea255dda files/digest-oracle-instantclient-basic-10.1.0.4 188
-SHA256 ec39a1fae1c05a7bc3649f2f1b938c406b76f8f1b56a967370051c3b7c6fe29e files/digest-oracle-instantclient-basic-10.1.0.4 188
 MD5 7d67fcac2a86c35bff7bec62169297cc files/digest-oracle-instantclient-basic-10.1.0.5 656
 RMD160 78c536ba004882949d35a4bbb608ce282aff7264 files/digest-oracle-instantclient-basic-10.1.0.5 656
 SHA256 78d349acd8c97f6b49438bb2a6b3765601fab60c5fcf38160864218babe4a755 files/digest-oracle-instantclient-basic-10.1.0.5 656
-MD5 0e46a4a0a0226507feacb2dac0390e9b files/digest-oracle-instantclient-basic-10.2.0.1 188
-RMD160 0cd8485c58ac72f7ad82b5700dd9f091cb9b7d2a files/digest-oracle-instantclient-basic-10.2.0.1 188
-SHA256 3497fdb5b55873bec9a42fcf4f5867cde4871596ead2ff6218d3c153b251b0f3 files/digest-oracle-instantclient-basic-10.2.0.1 188
-MD5 cb932d397759caa001943bf54d0391f1 files/digest-oracle-instantclient-basic-10.2.0.1-r1 386
-RMD160 2b35184efd593b8b8d37dc21234185b9d0fd022d files/digest-oracle-instantclient-basic-10.2.0.1-r1 386
-SHA256 c6fe225ef7615cf01cd047729e30a53c578e76eee69db2d77d714fdeb9ec3f68 files/digest-oracle-instantclient-basic-10.2.0.1-r1 386
 MD5 a03a6a26b09694054a9364eed1eaca40 files/digest-oracle-instantclient-basic-10.2.0.2 2678
 RMD160 13a7cc9859a37691cc884b410f67cac2fb5e8f91 files/digest-oracle-instantclient-basic-10.2.0.2 2678
 SHA256 5e9f035244f876e0a0768fb14a9a743a76f2715fe8204f05e3ad5abcf24e7203 files/digest-oracle-instantclient-basic-10.2.0.2 2678
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.2_p1 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.2_p1
deleted file mode 100644
index 8adb29fef0e2..000000000000
--- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.2_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39fb478b851bd411acf3ff35daae20cf oracle-instantclient-basic-10.1.0.2-1.i386.rpm 40065717
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1
deleted file mode 100644
index 8adb29fef0e2..000000000000
--- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39fb478b851bd411acf3ff35daae20cf oracle-instantclient-basic-10.1.0.2-1.i386.rpm 40065717
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.3 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.3
deleted file mode 100644
index 0169355f2e51..000000000000
--- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5c7e6cf154959887a6ebb58358f8af33 oracle-instantclient-basic-10.1.0.3-1.i386.rpm 30791288
-MD5 2465ac505f3156267e5f19d525b23157 oracle-instantclient-devel-10.1.0.3-1.i386.rpm 281013
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.4 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.4
deleted file mode 100644
index c160a7aa9ccf..000000000000
--- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.1.0.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6b72008ceeac068967484b989b47efa7 instantclient-basic-linux32-10.1.0.4-20050525.zip 29879923
-MD5 d0f3769faff09596ce21326c34419bd6 instantclient-sdk-linux32-10.1.0.4-20050525.zip 294567
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1
deleted file mode 100644
index 1628d6bf038a..000000000000
--- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8900afe3666a6443a16bf7b04cd1c4e0 instantclient-basic-linux32-10.2.0.1-20050713.zip 33808746
-MD5 9f4196cb13dda122c45a8871e409ae75 instantclient-sdk-linux32-10.2.0.1-20050713.zip 602102
diff --git a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1-r1 b/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1-r1
deleted file mode 100644
index b9aa1330fe4e..000000000000
--- a/dev-db/oracle-instantclient-basic/files/digest-oracle-instantclient-basic-10.2.0.1-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 44c5b53361756eadc470ed307260bf7c instantclient-basic-linux-x86-64-10.2.0.1-20051025.zip 35574833
-MD5 8900afe3666a6443a16bf7b04cd1c4e0 instantclient-basic-linux32-10.2.0.1-20050713.zip 33808746
-MD5 7fde0a75133cc29cd671a9d29619bc55 instantclient-sdk-linux-x86-64-10.2.0.1-20051025.zip 602351
-MD5 9f4196cb13dda122c45a8871e409ae75 instantclient-sdk-linux32-10.2.0.1-20050713.zip 602102
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild
deleted file mode 100644
index 622ff598e470..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild,v 1.3 2006/01/19 21:47:28 nelchael Exp $
-
-inherit eutils
-
-MY_PV=${PV/_p/-}
-MY_P="${PN}-${MY_PV}.i386"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux"
-HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
-SRC_URI="${MY_P}.rpm"
-
-LICENSE="OTN"
-SLOT="${PV}"
-KEYWORDS="~x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz"
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the Basic client package.  Put it in:"
-	eerror "  ${DISTDIR}"
-	eerror "after downloading it."
-}
-
-src_unpack() {
-	rpm2targz ${DISTDIR}/${MY_P}.rpm
-	tar zxf ${WORKDIR}/${MY_P}.tar.gz
-}
-
-src_install() {
-	dodir /usr/lib/oracle/10.1.0.2/client/lib
-	cd ${S}/usr/lib/oracle/10.1.0.2/client/lib
-	insinto /usr/lib/oracle/10.1.0.2/client/lib
-	doins *.jar *.so *.so.10.1
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo 'LDPATH=/usr/lib/oracle/10.1.0.2/client/lib' > ${D}/etc/env.d/50oracle-instantclient-basic
-
-}
-
-pkg_postinst() {
-	echo
-	einfo "The Basic client page for Oracle 10g has been installed."
-	einfo "You may also wish to install the oracle-instantclient-jdbc (for"
-	einfo "supplemental JDBC functionality with Oracle) and the"
-	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	einfo "packages as well."
-	echo
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild
deleted file mode 100644
index 66572f4816d4..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild,v 1.5 2006/01/19 21:47:28 nelchael Exp $
-
-inherit eutils
-
-MY_PV=${PV/_p/-}
-MY_P="${PN}-${MY_PV}.i386"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux"
-HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
-SRC_URI="${MY_P}.rpm"
-
-LICENSE="OTN"
-SLOT="${PV}"
-KEYWORDS="~x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz"
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the Basic client package.  Put it in:"
-	eerror "  ${DISTDIR}"
-	eerror "after downloading it."
-}
-
-src_unpack() {
-	rpm2targz ${DISTDIR}/${MY_P}.rpm
-	tar zxf ${WORKDIR}/${MY_P}.tar.gz
-}
-
-src_install() {
-	dodir /usr/lib/oracle/10.1.0.2/client/lib
-	cd ${S}/usr/lib/oracle/10.1.0.2/client/lib
-	insinto /usr/lib/oracle/10.1.0.2/client/lib
-	doins *.jar *.so *.so.10.1
-}
-
-pkg_postinst() {
-	echo
-	einfo "The Basic client page for Oracle 10g has been installed."
-	einfo "You may also wish to install the oracle-instantclient-jdbc (for"
-	einfo "supplemental JDBC functionality with Oracle) and the"
-	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	einfo "packages as well."
-	echo
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild
deleted file mode 100644
index c5864a19f91e..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild,v 1.4 2006/01/19 21:47:28 nelchael Exp $
-
-inherit eutils
-
-MY_P="${P}-1.i386"
-MY_PSDK="${MY_P/basic/devel}"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
-SRC_URI="${MY_P}.rpm ${MY_PSDK}.rpm"
-
-LICENSE="OTN"
-SLOT="${PV}"
-KEYWORDS="~x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz"
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the Basic client package with SDK, which are:"
-	eerror "  ${MY_P}.rpm"
-	eerror "  ${MY_PSDK}.rpm"
-	eerror "Then after downloading put them in:"
-	eerror "  ${DISTDIR}"
-}
-
-src_unpack() {
-	rpm2targz ${DISTDIR}/${MY_P}.rpm
-	tar zxf ${WORKDIR}/${MY_P}.tar.gz
-	rpm2targz ${DISTDIR}/${MY_PSDK}.rpm
-	tar zxf ${WORKDIR}/${MY_PSDK}.tar.gz
-
-	# this is needed because of sdk package as we handle symlinks using dosym in src_install
-	rm -f ${S}/usr/lib/oracle/${PV}/client/lib/libclntsh.so
-	rm -f ${S}/usr/lib/oracle/${PV}/client/lib/libocci.so
-}
-
-src_install() {
-	# library
-	dodir /usr/lib/oracle/${PV}/client/lib
-	cd ${S}/usr/lib/oracle/${PV}/client/lib
-	insinto /usr/lib/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.10.1
-
-	# fixes symlinks
-	dosym /usr/lib/oracle/${PV}/client/lib/libocci.so.10.1 /usr/lib/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/lib/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/lib/oracle/${PV}/client/lib/libclntsh.so
-
-	# includes
-	dodir /usr/lib/oracle/${PV}/client/include
-	insinto /usr/lib/oracle/${PV}/client/include
-	cd ${S}/usr/include/oracle/${PV}/client
-	doins *.h
-	# link to oroginal location
-	dodir /usr/include/oracle/${PV}/
-	ln -s ${D}/usr/lib/oracle/${PV}/client/include ${D}/usr/include/oracle/${PV}/client
-
-	# share info
-	cd ${S}/usr/share/oracle/${PV}/client
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/lib/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/lib/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic
-
-}
-
-pkg_postinst() {
-	einfo "The Basic client page for Oracle 10g has been installed."
-	einfo "You may also wish to install the oracle-instantclient-jdbc (for"
-	einfo "supplemental JDBC functionality with Oracle) and the"
-	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	einfo "packages as well."
-	einfo
-	einfo "Examples are located in /usr/share/doc/${PF}/"
-	einfo
-	ewarn "ORACLE_HOME (and others) are set in /etc/env.d/50oracle-instantclient-basic"
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild
deleted file mode 100644
index a7664ce3a15a..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild,v 1.4 2006/01/19 21:47:28 nelchael Exp $
-
-inherit eutils
-
-MY_P="${PN/oracle-/}-linux32-${PV}-20050525"
-MY_PSDK="${MY_P/basic/sdk}"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
-SRC_URI="${MY_P}.zip ${MY_PSDK}.zip"
-
-LICENSE="OTN"
-SLOT="${PV}"
-KEYWORDS="x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-# RDEPEND does not needs unzip
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the 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() {
-	# library
-	dodir /usr/lib/oracle/${PV}/client/lib
-	cd ${S}/instantclient10_1
-	insinto /usr/lib/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.10.1
-
-	# fixes symlinks
-	dosym /usr/lib/oracle/${PV}/client/lib/libocci.so.10.1 /usr/lib/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/lib/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/lib/oracle/${PV}/client/lib/libclntsh.so
-
-	# includes
-	dodir /usr/lib/oracle/${PV}/client/include
-	insinto /usr/lib/oracle/${PV}/client/include
-	cd ${S}/instantclient10_1/sdk/include
-	doins *.h
-	# link to original location
-	dodir /usr/include/oracle/${PV}/
-	ln -s ${D}/usr/lib/oracle/${PV}/client/include ${D}/usr/include/oracle/${PV}/client
-
-	# share info
-	cd ${S}/instantclient10_1/sdk/demo
-	dodoc *
-
-	# Add OCI libs to library path
-	dodir /etc/env.d
-	echo "ORACLE_HOME=/usr/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/lib/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/lib/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic
-
-}
-
-pkg_postinst() {
-	einfo "The Basic client page for Oracle 10g has been installed."
-	einfo "You may also wish to install the oracle-instantclient-jdbc (for"
-	einfo "supplemental JDBC functionality with Oracle) and the"
-	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	einfo "packages as well."
-	einfo
-	einfo "Examples are located in /usr/share/doc/${PF}/"
-	einfo
-	ewarn "ORACLE_HOME (and others) are set in /etc/env.d/50oracle-instantclient-basic"
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild
deleted file mode 100644
index b865dc16ae6f..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1-r1.ebuild,v 1.4 2006/04/06 19:12:16 dertobi123 Exp $
-
-inherit eutils
-
-MY_P_x86="${PN/oracle-/}-linux32-${PV}-20050713"
-MY_PSDK_x86="${MY_P_x86/basic/sdk}"
-
-MY_P_amd64="${PN/oracle-/}-linux-x86-64-${PV}-20051025"
-MY_PSDK_amd64="${MY_P_amd64/basic/sdk}"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
-SRC_URI="x86? ( ${MY_P_x86}.zip ${MY_PSDK_x86}.zip )
-		 amd64? ( ${MY_P_amd64}.zip ${MY_PSDK_amd64}.zip )"
-
-LICENSE="OTN"
-SLOT="${PV}"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="|| ( =sys-libs/libstdc++-v3-3.3* =sys-devel/gcc-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 "and download the 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() {
-	# library
-	dodir /usr/lib/oracle/${PV}/client/lib
-	cd ${S}/instantclient_10_2
-	insinto /usr/lib/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.10.1
-
-	# fixes symlinks
-	dosym /usr/lib/oracle/${PV}/client/lib/libocci.so.10.1 /usr/lib/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/lib/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/lib/oracle/${PV}/client/lib/libclntsh.so
-
-	# includes
-	dodir /usr/lib/oracle/${PV}/client/include
-	insinto /usr/lib/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/lib/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/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/lib/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/lib/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic
-
-}
-
-pkg_postinst() {
-	einfo "The Basic client page for Oracle 10g has been installed."
-	einfo "You may also wish to install the oracle-instantclient-jdbc (for"
-	einfo "supplemental JDBC functionality with Oracle) and the"
-	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	einfo "packages as well."
-	einfo
-	einfo "Examples are located in /usr/share/doc/${PF}/"
-	einfo
-	ewarn "ORACLE_HOME (and others) are set in /etc/env.d/50oracle-instantclient-basic"
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1.ebuild
deleted file mode 100644
index 3dc8f8e805cd..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.2.0.1.ebuild,v 1.2 2006/01/19 21:47:28 nelchael Exp $
-
-inherit eutils
-
-MY_P="${PN/oracle-/}-linux32-${PV}-20050713"
-MY_PSDK="${MY_P/basic/sdk}"
-
-S=${WORKDIR}
-DESCRIPTION="Oracle 10g client installation for Linux with SDK"
-HOMEPAGE="http://otn.oracle.com/software/tech/oci/instantclient/htdocs/linuxsoft.html"
-SRC_URI="${MY_P}.zip ${MY_PSDK}.zip"
-
-LICENSE="OTN"
-SLOT="${PV}"
-KEYWORDS="~x86"
-RESTRICT="fetch"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-# RDEPEND does not needs unzip
-
-pkg_nofetch() {
-	eerror "Please go to:"
-	eerror "  ${HOMEPAGE}"
-	eerror "and download the 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() {
-	# library
-	dodir /usr/lib/oracle/${PV}/client/lib
-	cd ${S}/instantclient_10_2
-	insinto /usr/lib/oracle/${PV}/client/lib
-	doins *.jar *.so *.so.10.1
-
-	# fixes symlinks
-	dosym /usr/lib/oracle/${PV}/client/lib/libocci.so.10.1 /usr/lib/oracle/${PV}/client/lib/libocci.so
-	dosym /usr/lib/oracle/${PV}/client/lib/libclntsh.so.10.1 /usr/lib/oracle/${PV}/client/lib/libclntsh.so
-
-	# includes
-	dodir /usr/lib/oracle/${PV}/client/include
-	insinto /usr/lib/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/lib/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/lib/oracle/${PV}/client" >> ${D}/etc/env.d/50oracle-instantclient-basic
-	echo "LDPATH=/usr/lib/oracle/${PV}/client/lib" >> ${D}/etc/env.d/50oracle-instantclient-basic
-	echo "C_INCLUDE_PATH=/usr/lib/oracle/${PV}/client/include" >> ${D}/etc/env.d/50oracle-instantclient-basic
-
-}
-
-pkg_postinst() {
-	einfo "The Basic client page for Oracle 10g has been installed."
-	einfo "You may also wish to install the oracle-instantclient-jdbc (for"
-	einfo "supplemental JDBC functionality with Oracle) and the"
-	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
-	einfo "packages as well."
-	einfo
-	einfo "Examples are located in /usr/share/doc/${PF}/"
-	einfo
-	ewarn "ORACLE_HOME (and others) are set in /etc/env.d/50oracle-instantclient-basic"
-}