Version bumped, bug #180890.

Package-Manager: portage-2.1.2.11

13 files changed, 69 insertions, 129 deletions

diff --git a/dev-libs/oniguruma/ChangeLog b/dev-libs/oniguruma/ChangeLog
index ab3890cbda15..ac09341f65b6 100644
--- a/dev-libs/oniguruma/ChangeLog
+++ b/dev-libs/oniguruma/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/oniguruma
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/ChangeLog,v 1.21 2007/07/21 20:43:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/ChangeLog,v 1.22 2007/08/11 16:48:18 matsuu Exp $
+
+*oniguruma-5.9.0 (11 Aug 2007)
+*oniguruma-4.7.0 (11 Aug 2007)
+*oniguruma-2.5.9 (11 Aug 2007)
+
+  11 Aug 2007; MATSUU Takuto <matsuu@gentoo.org> -oniguruma-2.3.3.ebuild,
+  -oniguruma-2.5.6.ebuild, +oniguruma-2.5.9.ebuild, -oniguruma-4.0.1.ebuild,
+  -oniguruma-4.1.1.ebuild, +oniguruma-4.7.0.ebuild, +oniguruma-5.9.0.ebuild:
+  Version bumped, bug #180890.
+  Removed old versions.
 
   21 Jul 2007; Fabian Groffen <grobian@gentoo.org> oniguruma-2.3.2.ebuild,
   oniguruma-2.3.3.ebuild, oniguruma-2.5.6.ebuild, oniguruma-4.0.1.ebuild,
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 3a102ad00134..a32e785cb2a9 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,32 +1,27 @@
-DIST onig-4.0.1.tar.gz 564349 RMD160 6695bf148dc80114ecfcb481c9dc4f8e5081056f SHA1 41b94e5800122b84208da543b11a45ffe6c42f60 SHA256 12b222bd1015b682cafff39c8ceb61253090f66d5e81403266d0b8971ddea3b7
-DIST onig-4.1.1.tar.gz 565501 RMD160 3d96bb3ad5587e1028091696501f9b433e291494 SHA1 f6fed0f2dd199d5902b849931f5524a330f90a4a SHA256 5db372084222feb8f0eebd4cffc859304a98fc8a8827c58e742b7bafc04feb7b
+DIST onig-4.7.0.tar.gz 571441 RMD160 58e7253dc36b9097e283aebb3f5c3ece5e136ffc SHA1 cf30b386d694e979a8b9d201648aa511d6082ac3 SHA256 dd1bfb3994e8417bd6ab03116e11d0816ac40ec18c2ad9b62cdb1b1db3eae86b
+DIST onig-5.9.0.tar.gz 585024 RMD160 79c5dbb5e952a61e37e54c3753237c0bf869f755 SHA1 af1953ab3ca0bc1fcaeeebc50d4d424411f77305 SHA256 2f6fd437f24581122c7a6620233a411cc77bc62f3804335f8caa861a15084606
 DIST onigd2_3_2.tar.gz 198680 RMD160 d1ae44fbade2f7d9d43fbebf870bf2a57902194e SHA1 5ccbf0b18d736398f6954eb9dfe385dda28fc2b4 SHA256 a0c6457e4bbf22e7329dbee8ecb78e703191b01a3e76ecf3117a088c93e6d09e
-DIST onigd2_3_3.tar.gz 199191 RMD160 ad52d33ac4fcdbd1c10971db85ae71c3bf97a450 SHA1 29c574f8a649ab62b4aad6bd43695ecebfcb608e SHA256 c6a6a9549dd1beb787aee74d125cff3d3243598219dc3609651e2248c870ee03
-DIST onigd2_5_6.tar.gz 212610 RMD160 e6e317af93d73777137a7a545095fcdebf511b4a SHA1 aa152369627754d97184eedc206d5ae138a8ec07 SHA256 e37bf3ee1a0e2e84f86f07b065513a13df2cc57e202f67845e38aa29a7bca15d
+DIST onigd2_5_9.tar.gz 221355 RMD160 ceeee9a0221d431d6576a566621ba9badab6423d SHA1 41ca5b916ae1d3b1675fcc45181a0ed04e8726b7 SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0
 EBUILD oniguruma-2.3.2.ebuild 666 RMD160 fa2cb74b97634c2b67a3223894fff3de244af741 SHA1 3c9461e3fe7749460d11e4b2e778fd67455f5bf5 SHA256 b2d59585334bfb9525f723da91418e593f144e4d5cb20ebf2ab53e0388f88a03
 MD5 d79d8c9aba0e30b62654a695eac1260b oniguruma-2.3.2.ebuild 666
 RMD160 fa2cb74b97634c2b67a3223894fff3de244af741 oniguruma-2.3.2.ebuild 666
 SHA256 b2d59585334bfb9525f723da91418e593f144e4d5cb20ebf2ab53e0388f88a03 oniguruma-2.3.2.ebuild 666
-EBUILD oniguruma-2.3.3.ebuild 669 RMD160 99e4ea11c2de2b37da5fd2341167654b4bf30970 SHA1 adfecae40531cee2153a959414e74bce6585ad4b SHA256 9b32d9c1f6e607c5130cd1bcd1f7b61b2ce4ff61570397c0f481e315baed43bd
-MD5 c92e5a4584adc92ecda0eec80d79de9f oniguruma-2.3.3.ebuild 669
-RMD160 99e4ea11c2de2b37da5fd2341167654b4bf30970 oniguruma-2.3.3.ebuild 669
-SHA256 9b32d9c1f6e607c5130cd1bcd1f7b61b2ce4ff61570397c0f481e315baed43bd oniguruma-2.3.3.ebuild 669
-EBUILD oniguruma-2.5.6.ebuild 669 RMD160 5b26206767c5245319e5fc2d2ec5cb5a46dcafc1 SHA1 fbc3348ec0686490fff3b903bac62409f4bac008 SHA256 fbd0dbee0a154b13180d65b9ab41891852be324721d56f76489f08d906d93edf
-MD5 1096c73c47932971f78035ab5bb31c7b oniguruma-2.5.6.ebuild 669
-RMD160 5b26206767c5245319e5fc2d2ec5cb5a46dcafc1 oniguruma-2.5.6.ebuild 669
-SHA256 fbd0dbee0a154b13180d65b9ab41891852be324721d56f76489f08d906d93edf oniguruma-2.5.6.ebuild 669
-EBUILD oniguruma-4.0.1.ebuild 649 RMD160 b651e0276ca737fc9dca6aee7723882ba9ab49a2 SHA1 cc4f9a43b91b83118ff713c6c5bfacc60f05b1ee SHA256 bb50099db8a8bdc0bdaed8e0aeb220b61063ab8808ec670e4d056a86fa74542e
-MD5 bd6c9270bf2353c2544a4fb83cc93fdb oniguruma-4.0.1.ebuild 649
-RMD160 b651e0276ca737fc9dca6aee7723882ba9ab49a2 oniguruma-4.0.1.ebuild 649
-SHA256 bb50099db8a8bdc0bdaed8e0aeb220b61063ab8808ec670e4d056a86fa74542e oniguruma-4.0.1.ebuild 649
-EBUILD oniguruma-4.1.1.ebuild 656 RMD160 a5ea5c0f30f242296e4392f7ccef24ed6a8df948 SHA1 299c7554d01f7de937e59061b0465084a03c84c4 SHA256 b66bd84be996b174fd8111ce8f9b6c3c9fae86c1c356c134d2ae8bc23435900c
-MD5 10c9acff8f71bab69ff73ebf61c4faec oniguruma-4.1.1.ebuild 656
-RMD160 a5ea5c0f30f242296e4392f7ccef24ed6a8df948 oniguruma-4.1.1.ebuild 656
-SHA256 b66bd84be996b174fd8111ce8f9b6c3c9fae86c1c356c134d2ae8bc23435900c oniguruma-4.1.1.ebuild 656
-MISC ChangeLog 3143 RMD160 055cf54dd7b817847ef2a5e3ae827c603b748e1d SHA1 67105c1dec2a0f7c02fd4bedd95588d898812536 SHA256 da4c24fdade8f3d8198c2f39e1e23b02c921e09293b8ea23ff1464b2354bbf5f
-MD5 610ec96690f4a7985df039670a1b7db4 ChangeLog 3143
-RMD160 055cf54dd7b817847ef2a5e3ae827c603b748e1d ChangeLog 3143
-SHA256 da4c24fdade8f3d8198c2f39e1e23b02c921e09293b8ea23ff1464b2354bbf5f ChangeLog 3143
+EBUILD oniguruma-2.5.9.ebuild 608 RMD160 fe1e4cfa973e38092c18b1015a91259dd47643c5 SHA1 5b22d0e8bb77e5a02eed6fb82165476f51804f49 SHA256 722d1af9ab5e9daf4819e222ac646253cb7ac1310431c44180a8a5625130ed5e
+MD5 a4fd31dfb07bb7847eab220ad45c4192 oniguruma-2.5.9.ebuild 608
+RMD160 fe1e4cfa973e38092c18b1015a91259dd47643c5 oniguruma-2.5.9.ebuild 608
+SHA256 722d1af9ab5e9daf4819e222ac646253cb7ac1310431c44180a8a5625130ed5e oniguruma-2.5.9.ebuild 608
+EBUILD oniguruma-4.7.0.ebuild 600 RMD160 bfa17626679c5c8a7801cac761e426dc3e8a914c SHA1 7048c1973fcc61871d575e3b3b559f6482f9cd5a SHA256 8bfa7f7d7ece8342188b0bb48e551368ff117de343f3d1a08642136cedc5b7fa
+MD5 415d67c08d23c6522d301fc77a9286af oniguruma-4.7.0.ebuild 600
+RMD160 bfa17626679c5c8a7801cac761e426dc3e8a914c oniguruma-4.7.0.ebuild 600
+SHA256 8bfa7f7d7ece8342188b0bb48e551368ff117de343f3d1a08642136cedc5b7fa oniguruma-4.7.0.ebuild 600
+EBUILD oniguruma-5.9.0.ebuild 600 RMD160 54e98c5e4a3a8df5975069ef80e321babbd333b2 SHA1 22a155787ffbea9e2f45e0960a8733265999f195 SHA256 695958deb83cb230fa17ab46a62f067751cf62bcf0d9b74b36ff3ee8235559b6
+MD5 78b718c708262440707e69ce7d7d4867 oniguruma-5.9.0.ebuild 600
+RMD160 54e98c5e4a3a8df5975069ef80e321babbd333b2 oniguruma-5.9.0.ebuild 600
+SHA256 695958deb83cb230fa17ab46a62f067751cf62bcf0d9b74b36ff3ee8235559b6 oniguruma-5.9.0.ebuild 600
+MISC ChangeLog 3520 RMD160 8e8dca17d1b3f767116f6175321817d5ad72b430 SHA1 224df5f8f9cc1245c21a3f7722b3f2e344c29086 SHA256 c53ba36ea4f06525c7fb5641f04895bbd438c803c883aba99063ec2df6c8e5d2
+MD5 d2f2640eac11787c7f991c5191da605c ChangeLog 3520
+RMD160 8e8dca17d1b3f767116f6175321817d5ad72b430 ChangeLog 3520
+SHA256 c53ba36ea4f06525c7fb5641f04895bbd438c803c883aba99063ec2df6c8e5d2 ChangeLog 3520
 MISC metadata.xml 430 RMD160 9654357a5d6939a92ea7c972c02b2d87bd9b1b79 SHA1 62a57d5735bdfb895a8af8774cdcad5c0e6ccc8e SHA256 3e75dbb9889ef3f831d30a8b07a5598905dad66729ff175ac60c62878b040e13
 MD5 1e4be113b2f21e76b8b1e7ae0ed2251d metadata.xml 430
 RMD160 9654357a5d6939a92ea7c972c02b2d87bd9b1b79 metadata.xml 430
@@ -34,15 +29,12 @@ SHA256 3e75dbb9889ef3f831d30a8b07a5598905dad66729ff175ac60c62878b040e13 metadata
 MD5 d1059bceb030624a3866761d131e6d0a files/digest-oniguruma-2.3.2 232
 RMD160 e05a30320ed673643729c57a443e1c3e2af37da8 files/digest-oniguruma-2.3.2 232
 SHA256 257b28ef50e7906ff81007f72608122315822e1461cc59493a64b4b5951e9eee files/digest-oniguruma-2.3.2 232
-MD5 edfce7c679896b8e6efbda675b298588 files/digest-oniguruma-2.3.3 232
-RMD160 a58c1ffc7de039d2cade7f182cb5fdf6bcbe0ec5 files/digest-oniguruma-2.3.3 232
-SHA256 b32c838dacdb719cabbdf0874bd3b62856776f3ffa0b1bc9d7a177718cb91b88 files/digest-oniguruma-2.3.3 232
-MD5 965617a9c30916ef808df01cb8a90c71 files/digest-oniguruma-2.5.6 232
-RMD160 de4a4854f1d50b01a0c13dfc57aec72c83ed116a files/digest-oniguruma-2.5.6 232
-SHA256 f2a81aafdeebcc0ecc5f6a4ee31c5dfbd69917558efa9f37df68ae3de6cc7ebe files/digest-oniguruma-2.5.6 232
-MD5 8360a3ce54cbd90c6b0bc63d46d88c84 files/digest-oniguruma-4.0.1 232
-RMD160 3492fb2c4217da79ab7207061b20f676722e6073 files/digest-oniguruma-4.0.1 232
-SHA256 31e6f5e18ec29b9af7185a01efffdadab7ceaf481aaa9d1d83a464f897b9c0b0 files/digest-oniguruma-4.0.1 232
-MD5 8fdc9b940ecd225ca9505f1d4ee0664e files/digest-oniguruma-4.1.1 232
-RMD160 8cdc97173179e35a3bd3ee1a13e81261d79daf81 files/digest-oniguruma-4.1.1 232
-SHA256 76e38b9211ef3d50515d5a2149d53a6a127cbb551792b2be19ca50fec5c422a9 files/digest-oniguruma-4.1.1 232
+MD5 5dcd963c136a0353183d84b1d54fff2a files/digest-oniguruma-2.5.9 232
+RMD160 3784d236a77f8aaf35ff45fcbac88ddead958bad files/digest-oniguruma-2.5.9 232
+SHA256 9e773bdb895b19793e9a15663fc9f62b492aabb42cf0facd90189b9eb41e5475 files/digest-oniguruma-2.5.9 232
+MD5 ae036d6247bf83cd4f04c3201944a972 files/digest-oniguruma-4.7.0 232
+RMD160 737b0c4197cd29a7cd1a037b478651bf0c8bcbd8 files/digest-oniguruma-4.7.0 232
+SHA256 88813cc569f970ac329c1070b37ee0d7b54a47c4a89976c454b577d8efa97dd2 files/digest-oniguruma-4.7.0 232
+MD5 f632660923786c1bb408144edb3b9250 files/digest-oniguruma-5.9.0 232
+RMD160 f9916e5052566693a101b4377feaccc64ee39332 files/digest-oniguruma-5.9.0 232
+SHA256 52dae8946b4ab8ec55942f104a0d2b7280baedb03cb5c27e305198f45cf7bff4 files/digest-oniguruma-5.9.0 232
diff --git a/dev-libs/oniguruma/files/digest-oniguruma-2.3.3 b/dev-libs/oniguruma/files/digest-oniguruma-2.3.3
deleted file mode 100644
index 602e6321dccb..000000000000
--- a/dev-libs/oniguruma/files/digest-oniguruma-2.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a340ae6a721362338a8d8f5a79e470d5 onigd2_3_3.tar.gz 199191
-RMD160 ad52d33ac4fcdbd1c10971db85ae71c3bf97a450 onigd2_3_3.tar.gz 199191
-SHA256 c6a6a9549dd1beb787aee74d125cff3d3243598219dc3609651e2248c870ee03 onigd2_3_3.tar.gz 199191
diff --git a/dev-libs/oniguruma/files/digest-oniguruma-2.5.6 b/dev-libs/oniguruma/files/digest-oniguruma-2.5.6
deleted file mode 100644
index 5ea90ad603ea..000000000000
--- a/dev-libs/oniguruma/files/digest-oniguruma-2.5.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b3de8f1445ea90b220cb9c76dc709fb6 onigd2_5_6.tar.gz 212610
-RMD160 e6e317af93d73777137a7a545095fcdebf511b4a onigd2_5_6.tar.gz 212610
-SHA256 e37bf3ee1a0e2e84f86f07b065513a13df2cc57e202f67845e38aa29a7bca15d onigd2_5_6.tar.gz 212610
diff --git a/dev-libs/oniguruma/files/digest-oniguruma-2.5.9 b/dev-libs/oniguruma/files/digest-oniguruma-2.5.9
new file mode 100644
index 000000000000..77ad09f27e1d
--- /dev/null
+++ b/dev-libs/oniguruma/files/digest-oniguruma-2.5.9
@@ -0,0 +1,3 @@
+MD5 7e4c2b197387232afd9a11378feeb246 onigd2_5_9.tar.gz 221355
+RMD160 ceeee9a0221d431d6576a566621ba9badab6423d onigd2_5_9.tar.gz 221355
+SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0 onigd2_5_9.tar.gz 221355
diff --git a/dev-libs/oniguruma/files/digest-oniguruma-4.0.1 b/dev-libs/oniguruma/files/digest-oniguruma-4.0.1
deleted file mode 100644
index bfd7c9a93343..000000000000
--- a/dev-libs/oniguruma/files/digest-oniguruma-4.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4e5387e4817f3277a80ab075866f9cf onig-4.0.1.tar.gz 564349
-RMD160 6695bf148dc80114ecfcb481c9dc4f8e5081056f onig-4.0.1.tar.gz 564349
-SHA256 12b222bd1015b682cafff39c8ceb61253090f66d5e81403266d0b8971ddea3b7 onig-4.0.1.tar.gz 564349
diff --git a/dev-libs/oniguruma/files/digest-oniguruma-4.1.1 b/dev-libs/oniguruma/files/digest-oniguruma-4.1.1
deleted file mode 100644
index 0812cc6d4a7c..000000000000
--- a/dev-libs/oniguruma/files/digest-oniguruma-4.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e2ec892129d616fbf6595171aa896e1c onig-4.1.1.tar.gz 565501
-RMD160 3d96bb3ad5587e1028091696501f9b433e291494 onig-4.1.1.tar.gz 565501
-SHA256 5db372084222feb8f0eebd4cffc859304a98fc8a8827c58e742b7bafc04feb7b onig-4.1.1.tar.gz 565501
diff --git a/dev-libs/oniguruma/files/digest-oniguruma-4.7.0 b/dev-libs/oniguruma/files/digest-oniguruma-4.7.0
new file mode 100644
index 000000000000..ae1d8351eb66
--- /dev/null
+++ b/dev-libs/oniguruma/files/digest-oniguruma-4.7.0
@@ -0,0 +1,3 @@
+MD5 923b4b63843a8d380c278a0593b7d528 onig-4.7.0.tar.gz 571441
+RMD160 58e7253dc36b9097e283aebb3f5c3ece5e136ffc onig-4.7.0.tar.gz 571441
+SHA256 dd1bfb3994e8417bd6ab03116e11d0816ac40ec18c2ad9b62cdb1b1db3eae86b onig-4.7.0.tar.gz 571441
diff --git a/dev-libs/oniguruma/files/digest-oniguruma-5.9.0 b/dev-libs/oniguruma/files/digest-oniguruma-5.9.0
new file mode 100644
index 000000000000..b1c01de4a939
--- /dev/null
+++ b/dev-libs/oniguruma/files/digest-oniguruma-5.9.0
@@ -0,0 +1,3 @@
+MD5 8d0ef96e475e4f7edffe04b352f5c21b onig-5.9.0.tar.gz 585024
+RMD160 79c5dbb5e952a61e37e54c3753237c0bf869f755 onig-5.9.0.tar.gz 585024
+SHA256 2f6fd437f24581122c7a6620233a411cc77bc62f3804335f8caa861a15084606 onig-5.9.0.tar.gz 585024
diff --git a/dev-libs/oniguruma/oniguruma-2.3.3.ebuild b/dev-libs/oniguruma/oniguruma-2.3.3.ebuild
deleted file mode 100644
index 68740af01098..000000000000
--- a/dev-libs/oniguruma/oniguruma-2.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-2.3.3.ebuild,v 1.2 2007/07/21 20:43:33 grobian Exp $
-
-MY_P="onigd${PV//./_}"
-
-DESCRIPTION="Regular expression library"
-HOMEPAGE="http://www.geocities.jp/kosako1/oniguruma/"
-SRC_URI="http://www.geocities.jp/kosako1/oniguruma/archive/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-
-	econf || die
-	emake || die
-}
-
-src_install() {
-
-	dodir /usr
-	make prefix=${D}/usr install || die
-
-	dodoc HISTORY README doc/*
-}
diff --git a/dev-libs/oniguruma/oniguruma-4.1.1.ebuild b/dev-libs/oniguruma/oniguruma-2.5.9.ebuild
index cd8db7e68745..a1eeba845c44 100644
--- a/dev-libs/oniguruma/oniguruma-4.1.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-2.5.9.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-4.1.1.ebuild,v 1.3 2007/07/21 20:43:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-2.5.9.ebuild,v 1.1 2007/08/11 16:48:18 matsuu Exp $
 
-MY_P="onig-${PV}"
+MY_P="onigd${PV//./_}"
 
 DESCRIPTION="Regular expression library"
 HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma/"
 SRC_URI="http://www.geocities.jp/kosako3/oniguruma/archive/${MY_P}.tar.gz"
 
-LICENSE="BSD"
-
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-
-	econf || die
-	emake || die
-}
+S="${WORKDIR}/${PN}"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	dodir /usr
+	emake prefix="${D}usr" install || die
+
 	dodoc HISTORY README doc/*
 }
diff --git a/dev-libs/oniguruma/oniguruma-4.0.1.ebuild b/dev-libs/oniguruma/oniguruma-4.7.0.ebuild
index 34feb9545eab..b4ebc204592a 100644
--- a/dev-libs/oniguruma/oniguruma-4.0.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-4.0.1.ebuild,v 1.2 2007/07/21 20:43:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-4.7.0.ebuild,v 1.1 2007/08/11 16:48:18 matsuu Exp $
 
 MY_P="onig-${PV}"
 
@@ -8,23 +8,15 @@ DESCRIPTION="Regular expression library"
 HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma/"
 SRC_URI="http://www.geocities.jp/kosako3/oniguruma/archive/${MY_P}.tar.gz"
 
-LICENSE="BSD"
-
+LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-
-	econf || die
-	emake || die
-}
+S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc HISTORY README doc/*
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS HISTORY README* doc/*
 }
diff --git a/dev-libs/oniguruma/oniguruma-2.5.6.ebuild b/dev-libs/oniguruma/oniguruma-5.9.0.ebuild
index 972ddd6711fc..1f79c313b655 100644
--- a/dev-libs/oniguruma/oniguruma-2.5.6.ebuild
+++ b/dev-libs/oniguruma/oniguruma-5.9.0.ebuild
@@ -1,33 +1,22 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-2.5.6.ebuild,v 1.2 2007/07/21 20:43:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/oniguruma/oniguruma-5.9.0.ebuild,v 1.1 2007/08/11 16:48:18 matsuu Exp $
 
-MY_P="onigd${PV//./_}"
+MY_P="onig-${PV}"
 
 DESCRIPTION="Regular expression library"
 HOMEPAGE="http://www.geocities.jp/kosako3/oniguruma/"
 SRC_URI="http://www.geocities.jp/kosako3/oniguruma/archive/${MY_P}.tar.gz"
 
-LICENSE="BSD"
-
+LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-
-	econf || die
-	emake || die
-}
+S="${WORKDIR}/${MY_P}"
 
 src_install() {
+	emake DESTDIR="${D}" install || die
 
-	dodir /usr
-	make prefix=${D}/usr install || die
-
-	dodoc HISTORY README doc/*
+	dodoc AUTHORS HISTORY README* doc/*
 }