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.
---
 Bugzilla/Metrics/Memcached.pm              | 3 +--
 Bugzilla/Metrics/Mysql.pm                  | 2 +-
 Bugzilla/Metrics/Reporter.pm               | 1 -
 Bugzilla/Metrics/Reporter/ElasticSearch.pm | 3 +--
 Bugzilla/Metrics/Reporter/STDERR.pm        | 3 +--
 Bugzilla/Metrics/Template.pm               | 3 +--
 Bugzilla/Metrics/Template/Context.pm       | 3 +--
 7 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'Bugzilla/Metrics')

diff --git a/Bugzilla/Metrics/Memcached.pm b/Bugzilla/Metrics/Memcached.pm
index b640f9280..8dccdb323 100644
--- a/Bugzilla/Metrics/Memcached.pm
+++ b/Bugzilla/Metrics/Memcached.pm
@@ -7,11 +7,10 @@
 
 package Bugzilla::Metrics::Memcached;
 
-use 5.10.1;
 use strict;
 use warnings;
 
-use base 'Bugzilla::Memcached';
+use parent 'Bugzilla::Memcached';
 
 sub _get {
     my $self = shift;
diff --git a/Bugzilla/Metrics/Mysql.pm b/Bugzilla/Metrics/Mysql.pm
index 60dff78c8..7719d1cac 100644
--- a/Bugzilla/Metrics/Mysql.pm
+++ b/Bugzilla/Metrics/Mysql.pm
@@ -11,7 +11,7 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use base 'Bugzilla::DB::Mysql';
+use parent 'Bugzilla::DB::Mysql';
 
 sub do {
     my ($self, @args) = @_;
diff --git a/Bugzilla/Metrics/Reporter.pm b/Bugzilla/Metrics/Reporter.pm
index 8216ea923..88a08c9b8 100644
--- a/Bugzilla/Metrics/Reporter.pm
+++ b/Bugzilla/Metrics/Reporter.pm
@@ -7,7 +7,6 @@
 
 package Bugzilla::Metrics::Reporter;
 
-use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/Bugzilla/Metrics/Reporter/ElasticSearch.pm b/Bugzilla/Metrics/Reporter/ElasticSearch.pm
index c61a1d750..1bab2502c 100644
--- a/Bugzilla/Metrics/Reporter/ElasticSearch.pm
+++ b/Bugzilla/Metrics/Reporter/ElasticSearch.pm
@@ -7,11 +7,10 @@
 
 package Bugzilla::Metrics::Reporter::ElasticSearch;
 
-use 5.10.1;
 use strict;
 use warnings;
 
-use base 'Bugzilla::Metrics::Reporter';
+use parent 'Bugzilla::Metrics::Reporter';
 
 use constant DETACH => 1;
 
diff --git a/Bugzilla/Metrics/Reporter/STDERR.pm b/Bugzilla/Metrics/Reporter/STDERR.pm
index a61cdb25f..f5bd38acb 100644
--- a/Bugzilla/Metrics/Reporter/STDERR.pm
+++ b/Bugzilla/Metrics/Reporter/STDERR.pm
@@ -7,11 +7,10 @@
 
 package Bugzilla::Metrics::Reporter::STDERR;
 
-use 5.10.1;
 use strict;
 use warnings;
 
-use base 'Bugzilla::Metrics::Reporter';
+use parent 'Bugzilla::Metrics::Reporter';
 
 use Data::Dumper;
 
diff --git a/Bugzilla/Metrics/Template.pm b/Bugzilla/Metrics/Template.pm
index 5d9af240e..a3b13f85d 100644
--- a/Bugzilla/Metrics/Template.pm
+++ b/Bugzilla/Metrics/Template.pm
@@ -7,11 +7,10 @@
 
 package Bugzilla::Metrics::Template;
 
-use 5.10.1;
 use strict;
 use warnings;
 
-use base 'Bugzilla::Template';
+use parent 'Bugzilla::Template';
 
 sub process {
     my $self = shift;
diff --git a/Bugzilla/Metrics/Template/Context.pm b/Bugzilla/Metrics/Template/Context.pm
index 278cfce1e..ae8470b3f 100644
--- a/Bugzilla/Metrics/Template/Context.pm
+++ b/Bugzilla/Metrics/Template/Context.pm
@@ -7,11 +7,10 @@
 
 package Bugzilla::Metrics::Template::Context;
 
-use 5.10.1;
 use strict;
 use warnings;
 
-use base 'Bugzilla::Template::Context';
+use parent 'Bugzilla::Template::Context';
 
 sub process {
     my $self = shift;
-- 
cgit v1.2.3-24-g4f1b