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/Review/Config.pm                             | 3 ---
 extensions/Review/Extension.pm                          | 2 --
 extensions/Review/bin/migrate_mentor_from_whiteboard.pl | 2 +-
 extensions/Review/bin/review_requests_rebuild.pl        | 4 ++--
 extensions/Review/lib/FlagStateActivity.pm              | 2 --
 extensions/Review/lib/Util.pm                           | 2 --
 extensions/Review/lib/WebService.pm                     | 1 -
 7 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'extensions/Review')

diff --git a/extensions/Review/Config.pm b/extensions/Review/Config.pm
index ea7e8a725..f7da458af 100644
--- a/extensions/Review/Config.pm
+++ b/extensions/Review/Config.pm
@@ -6,10 +6,7 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review;
-
-use 5.10.1;
 use strict;
-use warnings;
 
 use constant NAME => 'Review';
 use constant REQUIRED_MODULES => [];
diff --git a/extensions/Review/Extension.pm b/extensions/Review/Extension.pm
index db2b475a1..4fd965b4c 100644
--- a/extensions/Review/Extension.pm
+++ b/extensions/Review/Extension.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
index ff109a5af..8d34963ec 100755
--- a/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
+++ b/extensions/Review/bin/migrate_mentor_from_whiteboard.pl
@@ -13,7 +13,7 @@ use warnings;
 $| = 1;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use lib "$RealBin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/Review/bin/review_requests_rebuild.pl b/extensions/Review/bin/review_requests_rebuild.pl
index 6574f3dbe..04f8b1042 100755
--- a/extensions/Review/bin/review_requests_rebuild.pl
+++ b/extensions/Review/bin/review_requests_rebuild.pl
@@ -11,8 +11,8 @@ use strict;
 use warnings;
 $| = 1;
 
-use FindBin qw($RealBin);
-use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
+use FindBin qw($Bin);
+use lib "$Bin/../../..";
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/Review/lib/FlagStateActivity.pm b/extensions/Review/lib/FlagStateActivity.pm
index 35da42351..46e9300a5 100644
--- a/extensions/Review/lib/FlagStateActivity.pm
+++ b/extensions/Review/lib/FlagStateActivity.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review::FlagStateActivity;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/lib/Util.pm b/extensions/Review/lib/Util.pm
index a8744079d..c00e31b6b 100644
--- a/extensions/Review/lib/Util.pm
+++ b/extensions/Review/lib/Util.pm
@@ -6,8 +6,6 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Review::Util;
-
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Review/lib/WebService.pm b/extensions/Review/lib/WebService.pm
index ea8910d50..c4421aca1 100644
--- a/extensions/Review/lib/WebService.pm
+++ b/extensions/Review/lib/WebService.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Extension::Review::WebService;
 
-use 5.10.1;
 use strict;
 use warnings;
 
-- 
cgit v1.2.3-24-g4f1b