Big EAPI update and misc build fixes

5 files changed, 8 insertions, 51 deletions

diff --git a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.09-r1.ebuild b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.09-r1.ebuild
deleted file mode 100644
index a51c27e..0000000
--- a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.09-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/JavaScript-Minifier/JavaScript-Minifier-1.50.0.ebuild,v 1.1 2011/08/30 11:36:08 tove Exp $
-
-EAPI=5
-
-MODULE_AUTHOR=GTERMARS
-MODULE_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="XS based JavaScript minifier"
-DEPEND="virtual/perl-Module-Build"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11-r1.ebuild b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11-r1.ebuild
index 6df879d..e83fdd8 100644
--- a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11-r1.ebuild
+++ b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11-r1.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # This ebuild generated by g-cpan 0.16.6
 
-EAPI=5
+EAPI="7"
 
-MODULE_AUTHOR="GTERMARS"
-MODULE_VERSION="0.11"
+DIST_AUTHOR="GTERMARS"
+DIST_VERSION="${PV}"
 
 
 inherit perl-module
@@ -22,7 +22,5 @@ DEPEND="
 	dev-perl/Module-Build
 "
 
-src_prepare() {
-	epatch "${FILESDIR}/copyright-only-functions.patch"
-}
+PATCHES="${FILESDIR}/copyright-only-functions.patch"
 
diff --git a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11.ebuild b/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11.ebuild
deleted file mode 100644
index 02f3545..0000000
--- a/dev-perl/JavaScript-Minifier-XS/JavaScript-Minifier-XS-0.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# This ebuild generated by g-cpan 0.16.6
-
-EAPI=5
-
-MODULE_AUTHOR="GTERMARS"
-MODULE_VERSION="0.11"
-
-
-inherit perl-module
-
-DESCRIPTION="XS based JavaScript minifier"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
diff --git a/dev-perl/JavaScript-Minifier-XS/Manifest b/dev-perl/JavaScript-Minifier-XS/Manifest
index 8edbeca..b8a9e06 100644
--- a/dev-perl/JavaScript-Minifier-XS/Manifest
+++ b/dev-perl/JavaScript-Minifier-XS/Manifest
@@ -1,6 +1,3 @@
-AUX copyright-only-functions.patch 946 BLAKE2B f87e6ac1a76d4e27eca25372cc1ef64cf092cdc1945da8ba27473e7c71a53a34a74d572f62dea3df4dad03042b4fa72b5f18d9e90e691126a29e0b6c96ae1788 SHA512 e0e79668b69d2aee48945a82292c67712928c6174750e1a76df38ccaed9201db4ee6cf02ca8bd60afd45b813e9a520beef4b90927eb0dcb36d8c538b28b74004
-DIST JavaScript-Minifier-XS-0.09.tar.gz 14509 BLAKE2B db8fab071b3654958c54be92add362cdfb2636d2715a1287ff0080a09a92dfb2611fb4e6a22b6488b6466138d20f275dcb73161df33ff03e1cb3bdc754e2ba79 SHA512 b46e5e0fc70d6a28829f9e6878c0a8285b6b4ba680de85ffa6d567ca00d8aaced66d4e8bf800c96b923fb261095fe0722648ce930925bb55c47e549c8ef574c8
+AUX copyright-only-functions.patch 945 BLAKE2B cc43b7a416226277021dcea7e97ca07eb6a8988cc985a18fa4a0e0d45c167c8666569e694379fecf3e48cad44e691465e4edeb0cee5da77665e79a93cbd11d4a SHA512 95fd67663668ecfe533887fbb25247debfa07bb3fd89211557ab1ceccabe3782dfdf140195c4987b8df31aace99061e4cc340fc8e0c16b9241cd28b4fbf5f7a1
 DIST JavaScript-Minifier-XS-0.11.tar.gz 17517 BLAKE2B 9d6ad360311f50a256c8edff87ed01b405b3e5eb50b6ad81b998928f21563bf7f7a1b1e17f1aeece1132d8037b2fab1d7c21565e6de3b67050924ebc84f4a9dc SHA512 736294c898d7806eae509b0d0c14cfcbb783ac335fe6c08bed9c00a52643b3e6d0ade124735d7de8d2203bf404448889e0e84b3097e316d0ef444f1603cbbdef
-EBUILD JavaScript-Minifier-XS-0.09-r1.ebuild 447 BLAKE2B f418546a370dfd4ee2fe65654d2cb511174e58ce45804549d9830aab8553e99bff9e193b22d180d0b6beca7fff43f8c68915626b3a433c7f94313f180d84adb4 SHA512 4be0f9a44e20f7d7181536b698745488bf00f141d269786413a642b2bd4d658cd89ebf39c8e2dede32fdea6c1c322fb20fd2c4cace04b5c9dc213b324b9d2c59
-EBUILD JavaScript-Minifier-XS-0.11-r1.ebuild 476 BLAKE2B d9f384a6635fa415d55c708fba701f07b15615ca5b0753adb32d1b966772b0a21846c6901019e610b544f7a65ef93c0d4416dd4967c20ed24af8c6644fe2ca26 SHA512 9675884ae0ab8003a9405462e19594d0fe85429d7f67da8bf6fbc9f11c5a22f2c305882f540e9987522811e5932d8cf0a59d0ee83567d1ff7ea3d620f6751ab8
-EBUILD JavaScript-Minifier-XS-0.11.ebuild 377 BLAKE2B c9d9b2afa4805ae4cb9ff2e9c10a9b4dc9ec5a00a2cb5193783f9e49107891badd3e2d3046c4e6cd55fa07cc8ce8bf5dcdb39b3230477aeeb7d10dc4e7b32185 SHA512 22720df2cdf1725eef2a668240880c7270b5ba59b33fd3416f611ed724a8e5b51bc10ae5488f16fdd9a466f022075d8cb6d8f2b01d754597595d9ff1e0dfd02c
+EBUILD JavaScript-Minifier-XS-0.11-r1.ebuild 457 BLAKE2B 56c4b948868d0e43b3f933843a7274d86bc9b8f17c87acc6e6ca7714759510931eda851bd9dbd0c78698e2d042a90a4a3fd5b66552e677a159f748a780d6a467 SHA512 615f5af397630c22a36e4622a0e2f75aa7f0617e09147b4f11acc8bbf6ee7b74c2c71c223af2bc4c94b2cecc6e1283e47b7506f891f795e3b56d7b45fccb5255
diff --git a/dev-perl/JavaScript-Minifier-XS/files/copyright-only-functions.patch b/dev-perl/JavaScript-Minifier-XS/files/copyright-only-functions.patch
index 762c39b..3c40db0 100644
--- a/dev-perl/JavaScript-Minifier-XS/files/copyright-only-functions.patch
+++ b/dev-perl/JavaScript-Minifier-XS/files/copyright-only-functions.patch
@@ -1,5 +1,5 @@
---- XS.xs.orig	2015-11-10 21:30:27.751894189 +0000
-+++ XS.xs	2015-11-10 21:30:34.653899658 +0000
+--- a/XS.xs	2015-11-10 21:30:27.751894189 +0000
++++ b/XS.xs	2015-11-10 21:30:34.653899658 +0000
 @@ -554,6 +554,7 @@
  };
  int JsCanPrune(Node* node) {