EAPI bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 29 insertions, 85 deletions

diff --git a/net-analyzer/sqlninja/ChangeLog b/net-analyzer/sqlninja/ChangeLog
index 3d824b8c8317..47bdd4d7c0fd 100644
--- a/net-analyzer/sqlninja/ChangeLog
+++ b/net-analyzer/sqlninja/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sqlninja
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sqlninja/ChangeLog,v 1.2 2012/12/09 00:39:50 zerochaos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sqlninja/ChangeLog,v 1.3 2014/07/17 15:07:43 jer Exp $
+
+  17 Jul 2014; Jeroen Roovers <jer@gentoo.org> -sqlninja-0.2.6_p1.ebuild,
+  sqlninja-0.2.6_p1-r1.ebuild:
+  EAPI bump.
 
 *sqlninja-0.2.6_p1-r1 (09 Dec 2012)
 
diff --git a/net-analyzer/sqlninja/Manifest b/net-analyzer/sqlninja/Manifest
index b6c1a0ccaf95..1e718b3178de 100644
--- a/net-analyzer/sqlninja/Manifest
+++ b/net-analyzer/sqlninja/Manifest
@@ -1,26 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX sqlninja 47 SHA256 67593808c0f076b9155ea0e0cd93d378642808835dd495f9f07d72502c8f6f82 SHA512 5ad7443ca0691e5e9a309d698d3503e683cf38d9ac980c7aaff562e008fc5120736a826ee87a44ea6c65da15fa868d9fcdf3291f97ad2f747ad3ceddb66065c4 WHIRLPOOL e2024d99119c6c704776a7352a40f5708d58fb02158cf964ba100e81be2e796ee82fb9e6defe5453a7ede8bbb2ca4fb0faa3e45e8a4bd702e3cb789cda508416
 DIST sqlninja-0.2.6-r1.tgz 454841 SHA256 7f8e9103d3fe58eb6e6f1476474589f7e5ca501703a82ae5299bd7a708342bc5 SHA512 18f6c8f0f1eca59d9ce6df80267f1f6bf45d151dfcd395b32d349119e1480389ba28f057778349b4276d480f60c41ca03578a1ca9c4e246f3fcb63653bc6ccf9 WHIRLPOOL 03b389d49e1854a16984db7272d391827488ca5004fa75e52e0a7b2708cfeeb1c6371c49ddf57dae332387f1ca0feca06d7b22547e1ed23ea2ba6627f9b8a9ac
-EBUILD sqlninja-0.2.6_p1-r1.ebuild 1277 SHA256 617befa71b5462ce24787f32cfffc1726eeb2d0ed295babbbb1df70370059451 SHA512 459f2c80e94db4ecbf69f8d3b26650536202a4a68d3e4d649bb71fdb30088021560d9d08a7abb379a93ef37d6d11752e25189dd65ab7a51cfbbfd7eb2b76aac5 WHIRLPOOL 477b692eead7d4b24ecf44a6ba4853f4cc3f9b57446e9cfae8461a5f76a12e0ab252cafb3363002bd2a15f8a9a34f979004cc25fff18c7719836cfb15f1722b8
-EBUILD sqlninja-0.2.6_p1.ebuild 1329 SHA256 06ea34ce997f92b0906575269fdb954e168ba9b4e97cc7c73039bf1c354a0c90 SHA512 491784260f2f28bd7bbb4626ac160e5f6ad1d1c0c994daf6b36319fd0f64d8da4599a8edc8f3b44f4e821fea1f9fca6995de6ea0d6408f062d6fe9f2510e1c5e WHIRLPOOL 11f29fb74a7cebb29a337631e42a030b9f328e0cc23be5f82b220aa525e1ccddd7b74f3695fed37817f86717d786deae82ceb58a460b4dab86e012acfdf5ea9d
-MISC ChangeLog 626 SHA256 d0c0fe788926b9c5099ff01b9813739ae4a962adc88d24702fa630d8bbed462f SHA512 7dc9f6918a4ead89a064a45d8b1ee19a88f073c6269fa09a9f0e507cef0254b6e4754fd27f782d478455ee0a52e9302b3167fc5890f469d672497e7145666d41 WHIRLPOOL 57767e887d82fda6a6871582e730269e60e7dffa7ba793a60f00aedb78ffbb00996bcee266cbbfddcf888cc3770a7ed3b91158d4b2b0cb1438e5570ddf64c1f0
+EBUILD sqlninja-0.2.6_p1-r1.ebuild 1187 SHA256 36b421be1e50d6400ae8ae00197eb6fef6f33f969c0e58da81e4fb134d9034ec SHA512 0978d1b5c36ea66f77672da994e74203f4ad44cf3450ce8cebb3db0c4c7081b44151f8abc3102a34348f49a91fffa97f2cb1d27246a7de7daa4fdf77ff20b1f6 WHIRLPOOL 80576de50d8ed3f14996a2940681cafc28508c9ee0686331f887fa361cd4423f9440135d7746b6005b0298fe32e47ccaa750957ec4f93edbf55caf24baad8cf4
+MISC ChangeLog 739 SHA256 eb602402242fdcd4433c2d736a2e82ad4b09613184370c7c8c6a8b9bc8df6210 SHA512 f78182b79d271e8dcfa1e89712435f37d0761ceb436b9c1b77114229ccf103e0c717b50acab5552557f039ee63dbd14210af2983ebd52f6c024bc06f5a5254a9 WHIRLPOOL 2d39d61e2a63f29b61cc5e7ff739678a55f563121edea8c41f4dff7e344944af5f63314219a1cef88252c113696504680c04d1448a936152124dc38c294b3c2c
 MISC metadata.xml 254 SHA256 e52c9cf66790c5d0546903589295bdbd82d8987534c9916670dedbed6b8874b1 SHA512 c83f5af17d5c3f334bae635762f6b62ef5d98c52705b67a8036b60edbdeb7d48f18e8b6b50895c421023023c95423dcfec3fcc5c6c363480ee596729b6be8021 WHIRLPOOL a95c23a3ef77afbadc01d64ac0e1e2c876a322f10454ea64e2ca729c9512fe6eb903e08c99e2a238cc5e4d63f12222c325428928908db78b4ed26dffd1712d65
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCgAGBQJQw941AAoJEKXdFCfdEflKKU0P/A83vhredbxQYUcIHd893EWk
-+1dm9MF0cSrTOSWZmqGKk4A37ioA3E7xm/1h00lzUJ+88cHxGf+XH8GJWp6VTdGr
-H/6z5B0bwkCV97C466MpmoW1t333BEJlcT+j3ypNVa6VIJejfrPkKCnjlseUPgJC
-H4eV34ibENrDSE7sWz8P5jOfzbbzop4GlB4LiMjiemTRBjehDaDAT9wtZ0xzv9qN
-87Ein+Rg927CiT0Qd6EXSI/DYnPYH1HhQwHDotP2uUbQ1WUHIVNVSIbTCLD4ZKUG
-yPNGuZ7rwpnGP8J2e/REA0hCRkEwQ6Vn7bd5DCceAi5UNkZEhnO9dfPBVzJBk+Jc
-dKpaeHYr8MRKMkESZG1Np30gUEjSDyGnxiXr6Z+HGz3bGnDOPOxfH+bzQOrnaJUr
-6sDj5c0RiZIAKaseMzW9/JPcQ4nnh33OY+aJDRXLDYouB3PK5hDQt9oOxQ+XQ1RM
-EmX4xSZQOvglF4qt/ujZKXpFTIiCRYXEBwdS/w04ZUOSHfQ2wLSgPj5JhL631WTW
-SAsIEEnpEASa3CAGU/D0LZWPJVNTKcxv1nl/agm1Kw7eTKiHT+r5x4nnPu4GQPVX
-MNxlUIJg9TMozpuIIbjGS308HVNKeCP5vqWEahDvUIkfALW0ygQm9tPxrH0Cmt21
-VxtS60k7HlICskW4RJxL
-=MaUA
+iEYEAREIAAYFAlPH5sEACgkQVWmRsqeSphNR9ACfSaXQMRRcGlDQmatwRCT1pBUr
+pMAAn3EmzlsHRgl7OSTDZ9j7794AYfH2
+=t8T8
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
index 1406936b42d2..201b0a6115ce 100644
--- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
+++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild,v 1.1 2012/12/09 00:39:50 zerochaos Exp $
-
-EAPI=4
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild,v 1.2 2014/07/17 15:07:43 jer Exp $
 
+EAPI=5
 inherit versionator
 
 MY_PV="$(replace_version_separator 3 '-')"
@@ -18,34 +17,38 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/NetPacket
-	dev-perl/Net-Pcap
+RDEPEND="
+	dev-lang/perl
+	dev-perl/IO-Socket-SSL
+	dev-perl/List-MoreUtils
 	dev-perl/Net-DNS
+	dev-perl/Net-Pcap
 	dev-perl/Net-RawIP
-	dev-perl/IO-Socket-SSL
-	dev-perl/List-MoreUtils"
+	dev-perl/NetPacket
+"
 
 S="${WORKDIR}/${MY_P}"
 
 src_install () {
 	dodoc sqlninja-howto.html ChangeLog README
+
 	if use doc; then
 		dodoc -r sources
 		docompress -x /usr/share/doc/"${P}"/sources
 	fi
+
 	insinto /etc/"${PN}"
 	doins sqlninja.conf.example
 
-	rm -r sources sqlninja-howto.html ChangeLog README LICENSE || die 'removing docs failed'
-	rm -r apps || die 'removing bundles apps failed'
-	rm sqlninja.conf.example || die 'removing config failed'
+	rm -r sources sqlninja-howto.html ChangeLog README LICENSE || die
+	rm -r apps || die
+	rm sqlninja.conf.example || die
 
 	dodir /usr/lib/"${PN}"
 	insinto /usr/lib/"${PN}"
 	exeinto /usr/lib/"${PN}"
 	doins -r *
+
 	doexe sqlninja
 	dosbin "${FILESDIR}"/"${PN}"
 }
diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1.ebuild
deleted file mode 100644
index f70c95bba019..000000000000
--- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sqlninja/sqlninja-0.2.6_p1.ebuild,v 1.1 2012/10/06 13:13:46 pinkbyte Exp $
-
-EAPI=4
-
-inherit versionator
-
-MY_PV="$(replace_version_separator 3 '-')"
-MY_PV="${MY_PV/p/r}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A SQL Server injection & takeover tool"
-HOMEPAGE="http://sqlninja.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	dev-perl/NetPacket
-	dev-perl/Net-Pcap
-	dev-perl/Net-DNS
-	dev-perl/Net-RawIP
-	dev-perl/IO-Socket-SSL
-	dev-perl/List-MoreUtils"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install () {
-	dodoc sqlninja-howto.html ChangeLog README
-	if use doc; then
-		dodoc -r sources
-		docompress -x /usr/share/doc/"${P}"/sources
-	fi
-	insinto /etc/"${PN}"
-	doins sqlninja.conf.example
-
-	rm -r sources sqlninja-howto.html ChangeLog README LICENSE || die 'removing docs failed'
-	rm -r apps || die 'removing bundles apps failed'
-	rm sqlninja.conf.example || die 'removing config failed'
-
-	dodir /usr/lib/"${PN}"
-	insinto /usr/lib/"${PN}"
-	exeinto /usr/lib/"${PN}"
-	doins -r *
-	doexe sqlninja
-	dosbin "${FILESDIR}"/"${PN}"
-	dosym /usr/lib/"${PN}"/makescr.pl /usr/sbin/makescr.pl
-}