revbump -> EAPI 5, add invocation of test, remove old

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 33 insertions, 71 deletions

diff --git a/dev-db/mytop/ChangeLog b/dev-db/mytop/ChangeLog
index 367e7cf0c676..55180a6d6d50 100644
--- a/dev-db/mytop/ChangeLog
+++ b/dev-db/mytop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mytop
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.27 2010/01/30 18:34:42 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.28 2013/08/29 16:04:28 idella4 Exp $
+
+*mytop-1.6-r4 (29 Aug 2013)
+
+  29 Aug 2013; Ian Delaney <idella4@gentoo.org> +mytop-1.6-r4.ebuild,
+  -mytop-1.4.ebuild, -mytop-1.6-r2.ebuild, -mytop-1.6.ebuild:
+  revbump -> EAPI 5, add invocation of test, remove old
 
   30 Jan 2010; Raúl Porcel <armin76@gentoo.org> mytop-1.6-r3.ebuild:
   sparc stable wrt #296990
@@ -100,4 +106,3 @@
   03 May 2004; Robin H. Johnson <robbat2@gentoo.org> mytop-1.4.ebuild:
   initial commit, original ebuild from bug #36608, Adam Gent
   <adam.gent@hat-technologies.ltd.uk>.
-
diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index 30e9d875ac16..596080cd8d30 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -1,11 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mytop-1.6-getopt-long-2.38-fixup.patch 578 SHA256 62ccc268d4e04d2476c817e591bcac91c849e08459cf964a4a1724cabbe4fc8a SHA512 a6f6bc9757112acc8cdeeb19e89487ad2ca79524c8d7a577b84c288addc283547837f390a7d7f43317d878e5be796be9d875fd57f548637a3d52aa1cabc5f3a8 WHIRLPOOL 52fd4e99d4e5514922597dc6be7b5c1d7e57b3484dc6f83695dd1ee5a610916314c1a1aa61ce8b0bfb962d8d21d733b3540cd46b4b02e504e594d42e1e5d52e9
 AUX mytop-1.6-global-status.patch 3694 SHA256 ebdbed74ed25213c2be00b86836ba38a45d84e721b60f3f97302fb3b646d1b06 SHA512 bf33682ed457acac751390f757b4b284cf68cae1facdc5d9f3980abae3a3a6580b0558cd114569e79cab2b4ede430fba1c8b426d8b6d500fe0edf833b74d17ab WHIRLPOOL 5d022fc17e2a3c5dbb4b5ff5249030438acad687af9a7df5e3279be9e3f90555567dbda1299274d0b17c926d94c2349ab080a2d479ca7ddee097b7fb481147ac
 AUX mytop-1.6-queries-vs-questions-mysql-5.0.76.patch 3365 SHA256 9ef308336a3cc51721456822d29fb91734e66f75efd3293038b42f0806820297 SHA512 a2735b157b81f702af09d6ee38003e4d15b6f901bc8f5e7013e8c73a1bd9ee798d0ed00ac0578b7e8ef36e5d4ddcc65489325937e9c2074004d2f69fb81fdcfb WHIRLPOOL 5ebe7405ee8bf738900cf8cce1fa61a729fd139965a67aa24101e9de9c67c56627cb64afd13be02e4a701befc09cffe543d0408f832c7f0d2655a2b828b8cdfe
-DIST mytop-1.4.tar.gz 18723 SHA256 0ac19a2cd16b4a25d0741c1cee9b056557aea18bb617edd9329a0b78927049dc SHA512 d27c68e5e87d6a06702c14f950a47aecc1ccfdb84d7ece5f2e5d79898d5db0084a52fdd7b6b21a19c21ece7c0b350e4e51c5bb2a58bcb35256ac4ca5bb8cf6ac WHIRLPOOL fc83d7c8d655b6a05b43941f2a12acb06339f3cc6a156105416a85d84bd1069c17dd0f1eff809c1d9f9e4aba3d29ee78130ad815e94e2583c3f3b4e021bb56de
 DIST mytop-1.6.tar.gz 19720 SHA256 b17c702598b10bb0ce2695f609122637c799eaaaec1afaa73246b048f07be9bd SHA512 672209d828c70fd740a791f2e4dfac1e4c594adff197b8bc43322249f03f6c7b18a750da0892c1519fe29e24b661e41d40cdad3a29b546dec4b3a747155566e2 WHIRLPOOL 4fd03d2e871db6b56db2fa7f39046f415a668c3732f47c0668f73ab7109048a8872cfdc01704ba4152d92500f2ab5c5c66b8d2e948748e43ab56e508980c3b08
-EBUILD mytop-1.4.ebuild 770 SHA256 1d30811b62f53b6f0233ea05506d12c5b590bdfc4326695a6084e4849c1f724f SHA512 8f5ca1fce426183bc24acda6141917d489ac6ab0876ab1ed8b87d80958dfeb041b49e575e610a0f4ce4e4f63f513f4f1d0a887b4506f35a43db93e9b8f0ef9c8 WHIRLPOOL 7f49c64050335067cb8fd86556216408fec1095a04c4f7b2e1ab7d81f3e10828d89021b3359611191cdb33de590ea1f5b60c97a86e1cd674817dab62c908da15
-EBUILD mytop-1.6-r2.ebuild 888 SHA256 c765967591f4cc02e8fbf94dd237226db6de6698766dc24d1fcf457b7d3f3af8 SHA512 7dbcae1d09adef84f083ec25af7dc9ccaabadd3a34e3b486336538e71a40965777049cce734a49b7fb7be46975f92d1fac7e89fccf39eca32f8c35da8239dd74 WHIRLPOOL 9eb02260ae43ddd4e62df91eba4fa8562354d806c46ed2b4705b5c878532434e87664e7366c38758a447a2bf9ae2d6fe3d3d9493f0b990174370ef8d6d17765b
 EBUILD mytop-1.6-r3.ebuild 980 SHA256 f43e5fb88089e5f0eadc7201f11529373ae3fb753b6a01b58fa407c893365df4 SHA512 848564c7bbe76974d4cd7710ef6d45dfaf9e9f2ef05898c816a248c8e4d032649bd20ae3c65233e914dd4eba377cc16b213a32fc08267f3105e768260954269c WHIRLPOOL 65025a48c98c24bde729017ae30571c50688fe00a08ff8094214c91cba09daf6dc8d2d650affd0b7a7d933c7737105c9cea2d8144ad55063ebdd547b1bc6f844
-EBUILD mytop-1.6.ebuild 769 SHA256 58cbb9875e1a1a7923583d10d2e62a17f41bf3ee34f60f3b6044d08ce0a86357 SHA512 1e13d12056cb51731a5ce31cbcc15852207383c20987b4a5d1f1574bc53198b11b447cb67987b64362b6be2b6f1b7dfc346d7eb110bf46bbd785fcf5217e5405 WHIRLPOOL 846ba43a2da8127aa44fadd3a40b5ec6a949c5ff6947f627b05d0a88f1a7c3efc48507dda06c5b7ca7484dc94709b8d40a90491e4f596a5f11eeb53d312a9f5e
-MISC ChangeLog 3543 SHA256 097371152f6dd0604496b5da94bf73c345166473f34dbba1cc44d7f80fac8f1a SHA512 7bf7fb27a8495acb1e92a964b0e610fcd1eff6280052f17137b8bd3e650fb83749a87257178e90256a3d762e21a8c661c737c06cce5d4613cfa2357cf0e62b8f WHIRLPOOL 426b3966e4fb7d3f6a16733e4c423478dc6295fd42ca3777bf18b16bbae9060b208232920cc958134d05b9580a97f61065fdb3a1205745ccee0cf6bb6881f20e
+EBUILD mytop-1.6-r4.ebuild 1010 SHA256 88de096bc963733b1e22dcc998aff1b7dcd74306730dde9b6094ab63423e695f SHA512 2f9cacf45c07ec7e57fbdec978dae895325a9ac6d95fe4b614fbfb29d21a1664bb38403899b0ff83e5d32fc4d123984ee2441edf5444aba965ec2a24217ff8a7 WHIRLPOOL b27a9c3a3e78b27397e6426e7b171f39de16df4c6edefd4964041ba455bf9d7119286ed1827f6d840bb067d04d826bd4462156c51a46e0bdaa33892b7ef69685
+MISC ChangeLog 3760 SHA256 272fbc60a2153fb9671ae3fadcd125573fdec187e9ba09bbdd231b5221c6c798 SHA512 42f49b031e5feff32b40ec0bcb5206de9d3ad082bf3ea687eec486c08cdde2e2b1790ca7eafbb9c1fc75f62ed24501f065f4ae836c4904b533485ceed62fd33f WHIRLPOOL 5b6ed07a4cbfddf994606caddba3967098f6006613bea2f71d81584471d4dc5f81b870d1191505acd1344950b3eee89ffd61517ba9e7893edc7f367e024cca64
 MISC metadata.xml 158 SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 SHA512 538b01075e7bf3f429546654620fa773f3926594d7747d778ce6250263a7ba32fd7e63e14232fd89d503780b783fb7ab401ff2a0040a8d36c99c5c232609ca56 WHIRLPOOL 1739fa77f8bf21977b25d7c05d8da902f0a30335da5fcaca2b35200e504199c645d4115b8d2b4790ccdb692d7010c7a2cc09b27994679af8be6164f1c007e964
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlIfcREACgkQso7CE7gHKw2sKACeJg+jHyWmcrXkB+nkzrdp6KPw
+fOAAoK+4VYoweHGsVZUh6Ts3KMQpd0MH
+=+f1U
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mytop/mytop-1.4.ebuild b/dev-db/mytop/mytop-1.4.ebuild
deleted file mode 100644
index cdad2a7c829d..000000000000
--- a/dev-db/mytop/mytop-1.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.4.ebuild,v 1.18 2008/11/18 16:01:44 tove Exp $
-
-inherit perl-app
-
-DESCRIPTION="mytop - a top clone for mysql"
-HOMEPAGE="http://jeremy.zawodny.com/mysql/mytop/"
-SRC_URI="http://jeremy.zawodny.com/mysql/mytop/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 ppc sparc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-perl/DBD-mysql
-	virtual/perl-Getopt-Long
-	dev-perl/TermReadKey
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-HiRes
-	>=sys-apps/sed-4"
-
-src_install() {
-	perl-module_src_install
-	sed -i -r\
-		-e "s|socket( +)=> '',|socket\1=> '/var/run/mysqld/mysqld.sock',|g" \
-		"${D}"/usr/bin/mytop
-}
diff --git a/dev-db/mytop/mytop-1.6-r2.ebuild b/dev-db/mytop/mytop-1.6-r4.ebuild
index 98137f61d663..7820c4bf7af1 100644
--- a/dev-db/mytop/mytop-1.6-r2.ebuild
+++ b/dev-db/mytop/mytop-1.6-r4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.6-r2.ebuild,v 1.1 2009/02/15 01:38:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.6-r4.ebuild,v 1.1 2013/08/29 16:04:28 idella4 Exp $
 
-inherit perl-app
+EAPI=5
+
+inherit perl-module
 
 DESCRIPTION="mytop - a top clone for mysql"
 HOMEPAGE="http://jeremy.zawodny.com/mysql/mytop/"
@@ -13,15 +15,19 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-perl/DBD-mysql
+RDEPEND="dev-perl/DBD-mysql
 	virtual/perl-Getopt-Long
 	dev-perl/TermReadKey
 	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-HiRes
+	virtual/perl-Time-HiRes"
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-PATCHES="${FILESDIR}/${P}-global-status.patch
-		 ${FILESDIR}/${P}-queries-vs-questions-mysql-5.0.76.patch"
+PATCHES=( "${FILESDIR}/${PN}-1.6-global-status.patch"
+		  "${FILESDIR}/${PN}-1.6-queries-vs-questions-mysql-5.0.76.patch"
+		  "${FILESDIR}/${PN}-1.6-getopt-long-2.38-fixup.patch"
+		)
+SRC_TEST="do"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-db/mytop/mytop-1.6.ebuild b/dev-db/mytop/mytop-1.6.ebuild
deleted file mode 100644
index 6d9695ca8b62..000000000000
--- a/dev-db/mytop/mytop-1.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.6.ebuild,v 1.3 2008/11/18 16:01:44 tove Exp $
-
-inherit perl-app
-
-DESCRIPTION="mytop - a top clone for mysql"
-HOMEPAGE="http://jeremy.zawodny.com/mysql/mytop/"
-SRC_URI="http://jeremy.zawodny.com/mysql/mytop/${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="alpha amd64 ppc sparc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-perl/DBD-mysql
-	virtual/perl-Getopt-Long
-	dev-perl/TermReadKey
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-HiRes
-	>=sys-apps/sed-4"
-
-src_install() {
-	perl-module_src_install
-	sed -i -r\
-		-e "s|socket( +)=> '',|socket\1=> '/var/run/mysqld/mysqld.sock',|g" \
-		"${D}"/usr/bin/mytop
-}