From 14bcdce1dc6029c3676c3640d8148c83c14692e5 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Mon, 12 Sep 2016 16:22:17 -0400
Subject: Revert "Bug 1283930 - Add Makefile.PL & local/lib/perl5 support to
 bmo/master + local symlink to data/ directory"

This reverts commit e6bf4cacb10f86077fe898349485f5c7ab9fb4b6.
---
 extensions/Bitly/Config.pm | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'extensions/Bitly/Config.pm')

diff --git a/extensions/Bitly/Config.pm b/extensions/Bitly/Config.pm
index a07df0f1b..aff9d4b4b 100644
--- a/extensions/Bitly/Config.pm
+++ b/extensions/Bitly/Config.pm
@@ -6,21 +6,32 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Bitly;
-
-use 5.10.1;
 use strict;
-use warnings;
+
+use Bugzilla::Install::Util qw(vers_cmp);
 
 use constant NAME => 'Bitly';
 
 sub REQUIRED_MODULES {
-    return [
-        {
-            package => 'LWP',
-            module  => 'LWP',
-            version => '5.835',
-        },
-    ];
+    my @required;
+    push @required, {
+        package => 'LWP',
+        module  => 'LWP',
+        version => 5,
+    };
+    # LWP 6 split https support into a separate package
+    if (Bugzilla::Install::Requirements::have_vers({
+        package => 'LWP',
+        module  => 'LWP',
+        version => 6,
+    })) {
+        push @required, {
+            package => 'LWP-Protocol-https',
+            module  => 'LWP::Protocol::https',
+            version => 0
+        };
+    }
+    return \@required;
 }
 
 use constant OPTIONAL_MODULES => [
@@ -31,6 +42,4 @@ use constant OPTIONAL_MODULES => [
     },
 ];
 
-use constant API_VERSION_MAP  => { '1_0' => '1_0' };
-
 __PACKAGE__->NAME;
-- 
cgit v1.2.3-24-g4f1b