5 files changed, 22 insertions, 42 deletions
diff --git a/dev-php/PEAR-OLE/ChangeLog b/dev-php/PEAR-OLE/ChangeLog
index c6ca3cc86b88..93de0e4afa29 100644
--- a/dev-php/PEAR-OLE/ChangeLog
+++ b/dev-php/PEAR-OLE/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/PEAR-OLE
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-OLE/ChangeLog,v 1.37 2014/01/26 18:38:12 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-OLE/ChangeLog,v 1.38 2014/11/06 19:37:05 grknight Exp $
+
+*PEAR-OLE-1.0.0_rc2 (06 Nov 2014)
+
+  06 Nov 2014; Brian Evans <grknight@gentoo.org> +PEAR-OLE-1.0.0_rc2.ebuild,
+  -PEAR-OLE-0.5-r1.ebuild, -PEAR-OLE-0.6.0.ebuild, -PEAR-OLE-1.0.0_rc1.ebuild:
+  Version bump; Drop old
 
   26 Jan 2014; Ole Markus With <olemarkus@gentoo.org> PEAR-OLE-0.5-r1.ebuild,
   PEAR-OLE-0.6.1.ebuild:
diff --git a/dev-php/PEAR-OLE/Manifest b/dev-php/PEAR-OLE/Manifest
index 1de62e5ddfec..737afa18efc0 100644
--- a/dev-php/PEAR-OLE/Manifest
+++ b/dev-php/PEAR-OLE/Manifest
@@ -1,26 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST OLE-0.5.tgz 9058 SHA256 4ee18abf8cae198598022733e2a26f325a52e8088e7402194e104ae0620ff782 SHA512 3f34fe84df026a1b9349d0662648253fb3855403a9cafd8563fc97974fc42e9e5698034aba6f904fdfe4a00b6078ea4bd34f524b4039545194d7445d404bb66a WHIRLPOOL 2dff1f98cbad37337304d8045f9604dc84ded0985c73b7450cce2148a7b3780595eb345ffd6c90bafdf4640abf10620aa7251c3d015bc32616ed82e13704d14c
-DIST OLE-0.6.0.tgz 10461 SHA256 b5140c88793a8682a9e75ae4c8a5821abb4fce394d32737a17946794d7270ff9 SHA512 2b312ab391ef99ae0b7cba4011102045bd577d014e2f04a8495c0945381a7a5dbfb9cda52a1feeb63163d399f2c5dac4cbeb2e47f8ac6887a66d719ec8bf0487 WHIRLPOOL 40d3cb6622a14b37489e85ba01b6680410f73824c9d7fd0a3de3f5e2dd5245cea6de62a170c72d711c6d1708e7608dacbccd8362ce168123f37bfe52257aa01c
 DIST OLE-0.6.1.tgz 12111 SHA256 9fd4ed5eaa07f831324df5c910584418803a7f73f0c818e85ea92fa78714587f SHA512 3c03eb0faa24525404aa611c0c38316d449e4ae21ec0478482f4d8813f061b82c1ad9699e1d1d481202051f3562c71ca2d0428f7b3fc208120364a55b5952115 WHIRLPOOL ce88ebb9c770df3c7ba0e7bef4f5eecc8a251a4fd5d658de65517e5f799effe450bfedd452bf85c021156527e8e482faef23de9f66eff556e667ecd5b83688af
-DIST OLE-1.0.0RC1.tgz 12153 SHA256 c3e16ac7ec7a3d0919cb3dffc8e16ed057b9db2e11cc7b6bff515d3a799e3021 SHA512 14741ac60ee24c5b1a479133480c4139f96d244ec7bb0c27515c76e7660db57be39595ac15cc0eea59b6b3e5db0d8d4db0e176d155386d7e5fafa0b5bb073fc9 WHIRLPOOL 3dbb512175d2b2434f61a7230dd370e736986a0d97ccc50bf124efef1b7a0fbc74c9816175f07798543e6e70a10cd6ac0d898ab67d1c9fab7f2a2f92ee8044f1
-EBUILD PEAR-OLE-0.5-r1.ebuild 411 SHA256 0d16993834f899edf11f510d75a6811cff0ffaed3fe021a20302faff53bf96c4 SHA512 8002a2821200deca077057b3685e087bb6853cbf9b6057ad44ae8a4fa37204308d7e371dc9f981bf354ede189150c7e354f1c8903548c01abc9dd92d3d2ead0a WHIRLPOOL 67b8704e57114433770676bd886a8849a2da19fe4f3afef976039a16cc114875c3fc54bc233452ea5815c351f92d4b5ca43dd90dbb7d897077fae28508284866
-EBUILD PEAR-OLE-0.6.0.ebuild 415 SHA256 c2597d53add0f73832bbf85e5433e5d902fea8937a2b124db321d2c43716e603 SHA512 67e2d18d769969dbe9946db161dc9f7045255515ac43af884ca323e3aff844063bbeb6fdf64f866ee45f996e36377f1a043adfbf044ef91f9722d03aad631ce2 WHIRLPOOL 19ca8b62c4afbcc7547f0a667255394b20d38fa46b3bf8a8d59b033e7ddad8e5d378b7a2c130b72630166aa9fce98c8232bc6870a36c3b9d5231b728b5bfbc11
+DIST OLE-1.0.0RC2.tgz 13981 SHA256 a0f3ad85845801ad8f7c6cf1695e048c960a72b183946613ddbca4567fed9164 SHA512 9d0b236da4a0f82f272cf2e5642246ca35f83b9d21f1cc41ebe32d536949e9c7fce8d3bee0dce051f692a0283e1203d5ba2bacbe339f72cad4c83eb7a7b7e884 WHIRLPOOL 232cfbbe3c39cdd52455fd9f060c8983002e80f178dda25627d6a88c51af22dc5ae7f71577a4679ef9aed15ad4cae5ae4e6791cf215e286e1460bfdde8fefa58
 EBUILD PEAR-OLE-0.6.1.ebuild 416 SHA256 31286d8bc3270f4a353cbb06fdd4cda3aa561af8fb55381779de127078ead5b6 SHA512 043a8653088d11e3d98546037500ffcad31941f83440053fad00b357458a08061c173f05d7b50307ea52b5f9eee23912dea61f05f472f46ed4e15c4351ecdc7c WHIRLPOOL 2776285b16905281b890233914ff012008aedb53932bfbf18864dd0f112a35666af36fb55f74c07fc6a264538152e4da110273273e2fbd2047b9a5108a1ed41a
-EBUILD PEAR-OLE-1.0.0_rc1.ebuild 426 SHA256 657f4091c8d74690ae7e851ee047e97346d2e6d12cb6f4e94d569830e358a0a9 SHA512 8b0f744fdc0242b22dc3d83ca5c1f8a24515d48919ac48bf9b67732690bd473ce65e0e82a157173a2a55ce2d68e0f6e0c9e069b6685a5c242360ff647c5f5959 WHIRLPOOL afd732a2ed62465af4b027e88dfe2c8d3a38e38d1674c2a5b074ffb5ad8d5a7e86b8145372febd3113d60b3eec433d427245cdd7222ce3a54d2a0162c12f5b41
-MISC ChangeLog 4215 SHA256 06a654dc952db793b2bbb0c03c63e5f907127e1559f620c8d2a3c12c764a2ceb SHA512 a571ddefa0f62fd2990e43c0ead8344d74f2d4f5aa6016653c87ff30355533c5d7b9dfb65af6a1e804a311dd2219e9102bfc09dc41998d3977868600d81d7bd1 WHIRLPOOL 7a068afd26f835f3e9c13fd2c5c893d7b965042ad024a51ff1ffc193903a30a41ee8a14f0bf8a3200ea271d8146fec666d90d913661c2b3dbad0deee20657b2b
+EBUILD PEAR-OLE-1.0.0_rc2.ebuild 435 SHA256 fe7b3d74c5fb62723d1243bbff589e86e1bb437d009717989601bc607d6bab6e SHA512 42ac888e342dc5e656406471f7eedb9a146c00874641381bfcdfc25c0f46c9fdbbe3d635db966cf830ebdccd6d68c9f840ed991a928993b76a419edf68c923c9 WHIRLPOOL 39d1151e933823fed2e663f5f6f1b6b2aa317d5abd3defedb3d5979ac5c2276324a4718e51372a73b1b0a761d68e338b12242b60d8e71dd3c7ce6986c47ca1f5
+MISC ChangeLog 4431 SHA256 58913100930d2143a2fc15f014c5b27bf44d5e74e36b0835bd7b0903d941b404 SHA512 bfbe24af5e3c53f4cac93ca0ab2d75dacf363ad8f651c0d31c3d9204c96aea5674a4b35e761a8f3b2d6b56732316d19a27c35fa94f421853db62409d28153f50 WHIRLPOOL 2a635099fe901700a6435a9a3440fef2cf633c290d9eb3c412088b849cb2f3f9de3e6e75ad234caffdabe89b50f68e0827ca542ef41eb3203fddc2eb44b8f3f5
 MISC metadata.xml 156 SHA256 f6d70434415ff7294f2a64e7870f32318c5fab9153fe63a58841b12d897da6ba SHA512 c15813e9ecae01488222d09140617eaf0e6e9b9b9d40412e1cda7838e64c8fb8c73c030dc90d723aea571acadddb76941c9a620fc4e554ba052ace1cc6b0ef79 WHIRLPOOL 1b1513674a388e3e95e09cfd70996bc98fc058ca0e0e7c5dc63e0b3389bedeb4dc16b55245b92a8ded7390cca0dc481e418f236a236ded9afcc2ef3845b25130
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQF8BAEBCABmBQJS5VYVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1aOcH/A4L+Ki4XoFDFCskr38Z+CoV
-wsZWfr1Vye2KnC+6zrNHOGXXCCp9In1DFdHEVJADQzfrcin3lPHUL3SKjbaE+9n8
-hB9jUMxljaU44KONnkwr8feN/KyoLkXkBKlte/DtNxwjgit9LueeNKlKJroTXsBX
-VZcBKyzWFC9z7RLeOzfy5cg4NZ5cW/e7whrbgXQ+gqYljepXgtUic1HLG98qVFWy
-l06IZlOQaeVQruegLn2Q5XBjU4DgbKvlUyT8j6unaU7Zptdvd2UogSgA2kudC95v
-flyN4h2OAYsOIa1WTX+9GnSwp8CJIMwZDEJzna4BQWoU39iE7q5w/HZDNke/fYM=
-=UBX0
+iQEcBAEBCAAGBQJUW83tAAoJEE4V4vFnx44dfP4H/icpJ56377aDcopzCcvqSlYB
+NRktmjph7rSEPZNULo6tUwma/aliOFjn/8cYrMXwd6eu3wmhv6DmYKgCy7fvOVrz
+Wnc0H2NawrjI3U/QRieP1MKJZ8LY8Lq9EF3jT8y/BHJKYBWqTnNE90KiatBGTjPU
+5LFY+7iaStdvIlBpz9bE2IPoJFw+PCnrdKoFF1oKAvg0HqzFo4/kcxyf0G2bGg3H
+47BYm5LKM8qPxiaYSLayA9aYSplkGdmA6lSW6QNTM6X0ccCNc63b9nPnkVRUpls5
+vRy1fcMJbfcZtOcMyvWtfEbO94HqcHHXFyKbXUuMbsbz2zAeP+FTTSSrlHR7q54=
+=pubs
 -----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild
deleted file mode 100644
index eaf91c55e5b9..000000000000
--- a/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-OLE/PEAR-OLE-0.5-r1.ebuild,v 1.18 2014/01/26 18:38:12 olemarkus Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="Package for reading and writing OLE containers"
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-0.6.0.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-0.6.0.ebuild
deleted file mode 100644
index 0640b2f2d833..000000000000
--- a/dev-php/PEAR-OLE/PEAR-OLE-0.6.0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-OLE/PEAR-OLE-0.6.0.ebuild,v 1.2 2008/01/10 10:06:22 vapier Exp $
-
-inherit php-pear-r1
-
-DESCRIPTION="Package for reading and writing OLE containers"
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc1.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2.ebuild
index 147d74cf2b40..750dbce26681 100644
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc1.ebuild
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc1.ebuild,v 1.1 2010/02/16 04:59:41 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2.ebuild,v 1.1 2014/11/06 19:37:05 grknight Exp $
+
+EAPI=5
 
 inherit php-pear-r1