diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2011-12-14 23:05:21 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2011-12-14 23:05:21 +0000 |
| commit | 89a26271978a2b61f60cc2fbc8615e00ece4937a (patch) | |
| tree | d220e34e1e2833c18babd0ffc3e3049dd592e9b8 /profiles | |
| parent | Drop maintainer due move to staffer, bug #99016 (diff) | |
| download | gentoo-2-89a26271978a2b61f60cc2fbc8615e00ece4937a.tar.gz gentoo-2-89a26271978a2b61f60cc2fbc8615e00ece4937a.tar.bz2 gentoo-2-89a26271978a2b61f60cc2fbc8615e00ece4937a.zip | |
Merge category dev-php5 into dev-php (bug #324665)
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/categories | 1 | ||||
| -rw-r--r-- | profiles/package.mask | 16 |
3 files changed, 13 insertions, 10 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 62ed67c0f4f0..c3399eb54732 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6018 2011/12/14 17:35:21 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6019 2011/12/14 23:05:21 mabi Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided # here. If in doubt put a record here! + 14 Dec 2011; Matti Bickel <mabi@gentoo.org> updates/4Q-2011, categories, + package.mask: + Merge category dev-php5 into dev-php (bug #324665) + 14 Dec 2011; Ulrich Mueller <ulm@gentoo.org> license_groups: Add Texinfo-manual to FREE-DOCUMENTS license group. diff --git a/profiles/categories b/profiles/categories index 2d4d95a31564..b8e49e727df3 100644 --- a/profiles/categories +++ b/profiles/categories @@ -38,7 +38,6 @@ dev-lua dev-ml dev-perl dev-php -dev-php5 dev-python dev-ruby dev-scheme diff --git a/profiles/package.mask b/profiles/package.mask index 82b75285558c..fc0e9d838427 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13332 2011/12/14 06:36:01 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13333 2011/12/14 23:05:21 mabi Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -653,16 +653,16 @@ net-zope/zwiki # Will be removed in a few months, depending on how much noise this will create =dev-lang/php-5.2.17 =virtual/httpd-php-5.2 -=dev-php5/pecl-bbcode-1.0.2-r1 -=dev-php5/pecl-dbx-1.1.0-r1 -=dev-php5/pecl-fileinfo-1.0.4-r2 -=dev-php5/pecl-htscanner-0.9.0-r1 -=dev-php5/php-gtk-2.0.1-r4 -=dev-php5/phpdbg-2.15.5-r1 +=dev-php/pecl-bbcode-1.0.2-r1 +=dev-php/pecl-dbx-1.1.0-r1 +=dev-php/pecl-fileinfo-1.0.4-r2 +=dev-php/pecl-htscanner-0.9.0-r1 +=dev-php/php-gtk-2.0.1-r4 +=dev-php/phpdbg-2.15.5-r1 # Ole Markus With <olemarkus@gentoo.org> (21 Aug 2011) # Masking beta version -=dev-php5/pecl-memcached-2.0.0_beta2 +=dev-php/pecl-memcached-2.0.0_beta2 # Alexis Ballier <aballier@gentoo.org> (20 Aug 2011) # dev-tex/pdftex-1.40.11 is 100% identical to the one in TeX Live 2010; |