From 45e998c1d592674ee90f3e41e7df616b018e299a Mon Sep 17 00:00:00 2001
From: Richard Fussenegger <fleshgrinder@users.noreply.github.com>
Date: Wed, 6 Jul 2016 18:59:03 +0200
Subject: [PATCH] Reverted to initial version

---
 .../Repository/PlatformRepository.php         | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/Composer/Repository/PlatformRepository.php b/src/Composer/Repository/PlatformRepository.php
index 02d668469a16..6e52a38e740e 100644
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/src/Composer/Repository/PlatformRepository.php
@@ -12,9 +12,8 @@
 
 namespace Composer\Repository;
 
-use Composer\Config;
-use Composer\Package\PackageInterface;
 use Composer\Package\CompletePackage;
+use Composer\Package\PackageInterface;
 use Composer\Package\Version\VersionParser;
 use Composer\Plugin\PluginInterface;
 use Composer\Util\Silencer;
@@ -78,21 +77,29 @@ protected function initialize()
             $version = $versionParser->normalize($prettyVersion);
         }
 
+        // The AF_INET6 constant is only defined if ext-sockets is available but IPv6 support might still be available.
+        $ipv6Support = defined('AF_INET6') || @inet_pton('::') !== false;
+
         $php = new CompletePackage('php', $version, $prettyVersion);
         $php->setDescription('The PHP interpreter');
         $this->addPackage($php);
 
+        if ($ipv6Support) {
+            $phpIpv6 = new CompletePackage('php-ipv6', $version, $prettyVersion);
+            $phpIpv6->setDescription('The PHP interpreter with IPv6 support');
+            $this->addPackage($phpIpv6);
+        }
+
         if (PHP_INT_SIZE === 8) {
             $php64 = new CompletePackage('php-64bit', $version, $prettyVersion);
             $php64->setDescription('The PHP interpreter, 64bit');
             $this->addPackage($php64);
-        }
 
-        // The AF_INET6 constant is only defined if ext-sockets is available but IPv6 support might still be available.
-        if (defined('AF_INET6') || (function_exists('inet_pton') && Silencer::call('inet_pton', '::') !== false)) {
-            $phpIpv6 = new CompletePackage('ext-network-ipv6', $version, $prettyVersion);
-            $phpIpv6->setDescription('PHP IPv6 support');
-            $this->addPackage($phpIpv6);
+            if ($ipv6Support) {
+                $php64Ipv6 = new CompletePackage('php-64bit-ipv6', $version, $prettyVersion);
+                $php64Ipv6->setDescription('The PHP interpreter with IPV6 support, 64bit');
+                $this->addPackage($php64Ipv6);
+            }
         }
 
         $loadedExtensions = get_loaded_extensions();