Merging categories dev-php5 and dev-php (bug #324665)

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/www-apps/mantisbt/ChangeLog b/www-apps/mantisbt/ChangeLog
index f439fed65f81560c5bb42d495872887dab4d1893..bbb7aae3732d1b3f58972b16f4a889161df04e88 100644 (file)
--- a/www-apps/mantisbt/ChangeLog
+++ b/www-apps/mantisbt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/mantisbt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.114 2011/10/08 15:51:49 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/ChangeLog,v 1.115 2011/12/14 22:53:05 mabi Exp $
+
+  14 Dec 2011; Matti Bickel <mabi@gentoo.org> mantisbt-1.2.8.ebuild:
+  Merging categories dev-php5 and dev-php (bug #324665)
 
   08 Oct 2011; Peter Volkov <pva@gentoo.org> -mantisbt-1.2.7-r1.ebuild,
   -files/mantisbt-1.2.7-file-inclusion.patch:

diff --git a/www-apps/mantisbt/Manifest b/www-apps/mantisbt/Manifest
index 12f2007c601d7351443f3fe0432a831e8305e83a..264cfc62d64a263fcd2b3359b1abced78fada6b1 100644 (file)
--- a/www-apps/mantisbt/Manifest
+++ b/www-apps/mantisbt/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX postinstall-en-1.0.0.txt 640 RMD160 1e0a077db936ab8c2a6bf06c9091d4b5194b0b9c SHA1 1fb4a3c4e32b7ddca4b37017e8c8101d8d0c83c7 SHA256 af60f6f6be915164f420f5e9ae04fa18d8bf85e73a9a59668ba4a6b7ba41900d
 DIST mantisbt-1.2.8.tar.gz 3368632 RMD160 4c4b7abcad3465f8dca63cf50063a4ad1c80b39d SHA1 6cff6fd7d709e25c620c9717d6bf079ce52b73c5 SHA256 6b06dbb0e47135f6ffe05ae2e4bc66e51e3961558cf361629bd0caba0f759b11
-EBUILD mantisbt-1.2.8.ebuild 1381 RMD160 8ff1da73a42f7b8903928a60c36fc64b5a713979 SHA1 9dbc67c3c24cfde10c5e22c9ecb73344de13ed9d SHA256 51f8f7b849f84b78f1778f5d31106fc08616c2f4562dc63a7dee239f1ce775ac
-MISC ChangeLog 17765 RMD160 b133eb312d336d56bb7fe32c81077db0e8de62e5 SHA1 4db39ffdff99f8d2a9acdb6e253ee47c5ebaf45d SHA256 f32482d2f37098364bac3a05bc7ea066c14c33be9a42622e7b703bbd4e2d90ca
+EBUILD mantisbt-1.2.8.ebuild 1377 RMD160 ad69ce0d5f84c6191a062184695f2c199917bc23 SHA1 97e90912d30d7b7e7809f16fa570f191f0b03d4a SHA256 433791b334f77287a585ff1935f374b637ae0a08f5aa6b2d2718b8d14d2a5691
+MISC ChangeLog 17892 RMD160 6e4648f8f57c8f4acc03be9f53ddc2f1dc4df6cb SHA1 83fc9dfe76013cf9f040eb58e54d7860a92c45c0 SHA256 2ed1abbda29dbd3a6e3937dd4fd20e28ab0d2e99e7a928c7d736c5561aa2f7e0
 MISC metadata.xml 351 RMD160 05c79dbc5fce5043732f798e2b4b7749465ab1da SHA1 99337d7682d937de71f97a441e8dbd36a36229a7 SHA256 b840e4c4263c7f2502b4f7316adbec8c4fc10f58c96a5f140e304806525b0ab0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk6QcSsACgkQGrk+8vGYmwfjnQD/ax6LwoMzR3F9LQYgnLzg1XWg
-iCYo9Xyf/XkhSMq4018A/jek0uArsUx0LxjOJ8dgB6te5J28u5k1TldN+Y3Ig6Jv
-=d5nG
------END PGP SIGNATURE-----

diff --git a/www-apps/mantisbt/mantisbt-1.2.8.ebuild b/www-apps/mantisbt/mantisbt-1.2.8.ebuild
index f6fadfa4db3b93d96a3855275029470eb9655c05..d0563349580a3bef2200c6803dc5f269f2d83e11 100644 (file)
--- a/www-apps/mantisbt/mantisbt-1.2.8.ebuild
+++ b/www-apps/mantisbt/mantisbt-1.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.2.8.ebuild,v 1.2 2011/09/12 21:05:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mantisbt/mantisbt-1.2.8.ebuild,v 1.3 2011/12/14 22:53:05 mabi Exp $
 
 EAPI="2"
 
@@ -18,8 +18,8 @@ RDEPEND="
        virtual/httpd-php
        virtual/httpd-cgi
        || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-       >=dev-php5/ezc-Base-1.8
-       >=dev-php5/ezc-Graph-1.5
+       >=dev-php/ezc-Base-1.8
+       >=dev-php/ezc-Graph-1.5
        >=dev-php/adodb-5.10"
 
 src_prepare() {