Fix version-branding for security fix.

(Portage version: 2.0.52-r1)

3 files changed, 15 insertions, 25 deletions

diff --git a/dev-php/php/Manifest b/dev-php/php/Manifest
index cf75781eba9f..b4ba1179e2a8 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 553f5d081a17a88c4dae4253e561c942 php-4.3.11-r1.ebuild 1948
-MD5 1832b7dad433181a1ea82028e176f098 php-4.4.0.ebuild 1080
-MD5 eaa1a899f214a9ad1a095e9f6a4f5fc5 php-4.3.11.ebuild 1214
-MD5 3cb5fdc48285349de8fc1fda4cce29be php-4.4.0-r1.ebuild 1814
 MD5 2e49a31b55385c0bec9501697bf53869 ChangeLog 26376
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 d1536bfe7ebf7dab5076fcd56b03250a files/digest-php-4.3.11-r1 290
+MD5 eaa1a899f214a9ad1a095e9f6a4f5fc5 php-4.3.11.ebuild 1214
+MD5 1832b7dad433181a1ea82028e176f098 php-4.4.0.ebuild 1080
+MD5 553f5d081a17a88c4dae4253e561c942 php-4.3.11-r1.ebuild 1948
+MD5 3cb5fdc48285349de8fc1fda4cce29be php-4.4.0-r1.ebuild 1814
+MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/php-4.3.4-amd64hack.diff 1028
-MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
-MD5 58cd61c7ae093d9e2b847d68e76b88a2 files/digest-php-4.4.0-r1 288
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
-MD5 b048b183d4cc334d774ba478d695c055 files/php4.4.0-pcre-security.patch 6176
-MD5 522f94bfc40f65c2263785f960035875 files/libmbfl-headers.patch 309
-MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
-MD5 b3403a09e5d5fa394900b99ca6f63335 files/digest-php-4.4.0 211
-MD5 37b9c16c4d9688ed40561a2e29955896 files/php4.3.11-pcre-security.patch 6030
+MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
+MD5 cdcafb1f1235579bb1f54e53ffac5f9b files/php4.3.11-pcre-security.patch 6031
+MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
+MD5 c345d14fba0025e1b0d6365693f8923e files/php4.4.0-pcre-security.patch 6177
+MD5 d1536bfe7ebf7dab5076fcd56b03250a files/digest-php-4.3.11-r1 290
 MD5 c3936dcc33eacdde589f42f0f28e4bd6 files/digest-php-4.3.11 213
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMbnWViELBEf1JB0RAti8AJ9vKYV6sEP4/xOy+uY/SGjO+uZ/hQCfQej/
-Pe++cna6e1Mu+DT4nFs1H9E=
-=o9nt
------END PGP SIGNATURE-----
+MD5 58cd61c7ae093d9e2b847d68e76b88a2 files/digest-php-4.4.0-r1 288
+MD5 b3403a09e5d5fa394900b99ca6f63335 files/digest-php-4.4.0 211
diff --git a/dev-php/php/files/php4.3.11-pcre-security.patch b/dev-php/php/files/php4.3.11-pcre-security.patch
index 477a6ea5a7cf..0cdb77878e61 100644
--- a/dev-php/php/files/php4.3.11-pcre-security.patch
+++ b/dev-php/php/files/php4.3.11-pcre-security.patch
@@ -70,7 +70,7 @@
  MINOR_VERSION=3
  RELEASE_VERSION=11
 -EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-p11-gentoo"
  VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
  
  dnl Define where extension directories are located in the configure context
diff --git a/dev-php/php/files/php4.4.0-pcre-security.patch b/dev-php/php/files/php4.4.0-pcre-security.patch
index 574c2f3558aa..4971ff814ee4 100644
--- a/dev-php/php/files/php4.4.0-pcre-security.patch
+++ b/dev-php/php/files/php4.4.0-pcre-security.patch
@@ -70,7 +70,7 @@
  MINOR_VERSION=4
  RELEASE_VERSION=0
 -EXTRA_VERSION=""
-+EXTRA_VERSION="-gentoo-r1"
++EXTRA_VERSION="-p11-gentoo"
  VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
  
  dnl Define where extension directories are located in the configure context