QA: add missing user eclass to 'inherit' call, escape some variables, remove redundant 'die' in epatch

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

4 files changed, 26 insertions, 21 deletions

diff --git a/net-ftp/frox/ChangeLog b/net-ftp/frox/ChangeLog
index 72ffbd956503..16478d6f179f 100644
--- a/net-ftp/frox/ChangeLog
+++ b/net-ftp/frox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/frox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.22 2013/06/17 14:37:31 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.23 2013/06/17 14:41:03 pinkbyte Exp $
+
+  17 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> frox-0.7.18-r4.ebuild,
+  frox-0.7.18-r5.ebuild:
+  QA: add missing user eclass to 'inherit' call, escape some variables, remove
+  redundant 'die' in epatch
 
   17 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> -frox-0.7.18-r2.ebuild:
   Drop old
diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index ca69090a6658..216d2f21c0b5 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -8,18 +8,18 @@ AUX frox-0.7.18-config.patch 1960 SHA256 dd6b2bd265d20b569c4b897d66f5b1317b46429
 AUX frox.initd 978 SHA256 cbc9ecb21488c37abbc97b8808c149fcea7dddf52418cb322bda61a9fcd92dbf SHA512 a9b88a73ba85b103b5a8fb64ec50692bdbdceed0f31a10001a666ff8aa2334e6ee54ad027cded4ccbc9cde6d78273f7c5deade5af2a07d2f3af75adc30c5694e WHIRLPOOL b66cf212b43da0330508e91d81f19a85cb6badc7adeb64a40773436776be2bebf156c86ff22d6e6ea294064bceff074f0aebc05e842f4d2ceaff62f949846e14
 AUX frox.rc 1069 SHA256 2ad11b059524b4bfd8284326f498ebf37bf31b5bed4d92776807f67046634f5e SHA512 a3b94c248a888f1de26281f2b54320e0ddf037281b1225978b39e21800f23273119c7ec3e3d30b78b419d901ce036fe1667fea8e3984033b5e77fc2198fd36e2 WHIRLPOOL 269b79475ae9d62f83156e4787ff627400c37d8657b4e7f6fee00da840333ea2d37f784348d092e2f74b06f7e2b7eb86e66a2b4503c0d4a427b51112404acaa1
 DIST frox-0.7.18.tar.bz2 173355 SHA256 f7b637dd108444ff9c2302aa134f434e1606a2f965c01492abfbdc9b1c0bd0fc
-EBUILD frox-0.7.18-r4.ebuild 2134 SHA256 e2d953bf7d82d2f394d160c7b27cbd3d76f7d571145497f4375c6e9a3b75aedf SHA512 3ed67e89c1056eae8433fd4b25abc3effda22cd070c8db0f00231521b45513f265386f526f38e1abf045043f3565069b8169fb1f1efb2bf61552b62b1ccdbfe3 WHIRLPOOL da5769a6cc22adc44ff7436ccd49a6b3abed376b5a70fb03da58633172493e0ec1ebfbce90178596add29666cb0da0bf7c3ef9f9fc7b2d62e55de890125217d8
-EBUILD frox-0.7.18-r5.ebuild 1975 SHA256 9431bef1908cd2153e18413cc77984dcf73226c8499f6efbe9962545054b8592 SHA512 84742980f325e21473f1324255283c437e855ffec75d4bd026ff79827232c150d99286d0580d92938d619836d2631db8a563b708c9eb700eee2890912bdf6414 WHIRLPOOL dbb5a0521f941908312332ce9d1e5195e7a41e50502d7f0b9b2903356dd5612e2f5f0434bf3b89c981c8071521e42de26344eeeaac8ecb4a5e4eed7666f9c3de
-MISC ChangeLog 3633 SHA256 ec83aaa04ac9d0fa832322c6e534db509babf8d203dd1838166ba18d07f41ede SHA512 b5ce62a54f11cb74dd06da4b82b30223e1f62d16b63936b832b829860c6a20a55ad9a8d571f2b23b1d5c7af19ae3621e57ce50c4bde3b8fa840646613c4adc9b WHIRLPOOL 13ef10994f1715478f92e64056ab27d1f0f8560dfeaa5539a09cd1fc15f79a8d728bb971df0a748065bdfb803c1b8ef9940de2ff5256ca6aa9890bd6770897ef
+EBUILD frox-0.7.18-r4.ebuild 2121 SHA256 27addbaaef98e8dde4e378cffab1d5d825659f0e1ba117af006450ccef192836 SHA512 ea5333fc81fb281c039fc94fd951f49550dd7c338bd070b7bf515d9c88199a23672d6d744a5677d71223a340b7108af4c3fe0208f17abad7574af75ba5fef306 WHIRLPOOL ca98cae3e85487914c66b50eaec7f295ccbea362d5ba7d00e27a3e7fb44c3cd0f294aa2fc6d3d3932508116d0f8e87c7d06779c618dbe2f0f88e09f937df6c3c
+EBUILD frox-0.7.18-r5.ebuild 1980 SHA256 06877e5112a5a840f5ca91adba221bc329a3cf2892e4ab0f9399d3d12e3b83ea SHA512 25cfc1717ae50404343c7d91b109b7de204835c7fe442b61f51a96a11a4bce898fd09671f4ca8acaecd6beda307f449f1a6aee821abe316fac9dc13c38130e3f WHIRLPOOL af54ba4aa8d237094861e7cafbb3692994e17d6d592f549f59e6855d8c9f8d2bd6c6c468a83ac9da0cc87a6a6ec5fc9c7606786ccc280e854948e62551118884
+MISC ChangeLog 3839 SHA256 dd8741493e52791f1fe8d0e4f9485234c1c0137e2e7aa0564a52bc3c27b9c446 SHA512 672947f332f9f08b92eb4a2de1f2a16da93e2b0736ad859595e059722791e94945ea8cb8b231fc8fbab8a32b00b0b204c0de17e4f4d7c541a95ff0fb004cfb84 WHIRLPOOL b045081eb2c29efa425c7a2305a8a3aae440db5bdc9c84a6d1c8bb26a1dca6431143e9d66512d1c42c4405631534eb13c2101d261caf1b7e5da88154583aba78
 MISC metadata.xml 341 SHA256 684946b86c6a12c6799fe043728f4d51ef626d0bb528bdf267c13d1843e5e1fb SHA512 e2072841820169a7cdabafeb8ac995773c261ac29693fab2aa398bf9ee2e8d3059eff7a14898ecdf2c7bf9e1ad6574bd1a6977f3739a9ecbb3ec0ac0be145d25 WHIRLPOOL b4d1e5f15124d0019e4f746c3a8c939b0347848b6456ba8896484d22979626bef0477d84a7d21711a2f555c890aa39b157910ddbe3d977cf709ad53636070ccd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRvx+nAAoJECo/aRed9267VtsIAJagXfXY18TBiPJ3hz9L6AMu
-dK2LVun5OyJS0q51rfZMzCBVUhVZERxmPHaNIUT4f+VSWQXReXeAWahYGNslKDCS
-pT/xdFdRtqG40UFTe3EGc/0f93TOcAT1Yl18BCRdPwThhL9Yyp+R521rUjiDjMut
-brZJrcYqhuwBNWLwqopUM9eR42zcHVoWILQ7KBv8LPr+//3ImfEgE/c3ccgTIEiV
-TJvzZF8N7RSYdz5r7+3nTG8XZqM8tvTZYIn9pSDTObulWlMt0Q3j+zvx8nr6nlm2
-tc8/q1+jScHW/WHuO4g6Y4m5Ke//uIWMqNhcm7wfbJNK8Lr7QAPGQqJGh5WuxQY=
-=T+kl
+iQEcBAEBCAAGBQJRvyB7AAoJECo/aRed9267sW4IAIWKFJts9/Cyye+IqBWkz4rF
+g1hCRFEs8e0kGWq7uvs89lpp5HclKcfwU2aUvK5BsJ5jq5WGAe9fgzzrTQPGmiSm
+AI3adHRqjx1tPyyGa5HztohBFiuGHgtkheslnfwr62yvU0JhRW0nZf0Ef7B34t+W
+BsxLtGXrg0cNhf52oEoK6VQwiQq4OVISX6piZzvsaaYsZwMzxEtyUDoRr20EJEa+
+Xj7xr9E4/JkuzmxKRY+IvVz0Etqb/F7VZ1t+TwGuppN8LXQy7Q1d0sR7rtK78mEH
+rMd7XypvTqTUaVO3UWGuOjCWQMN9uRPw0as1OejbAKcuEgjd77+hasVYVe/Wxxw=
+=2hDF
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/frox/frox-0.7.18-r4.ebuild b/net-ftp/frox/frox-0.7.18-r4.ebuild
index 2e820b4eda7b..a04d9de7d6ff 100644
--- a/net-ftp/frox/frox-0.7.18-r4.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r4.ebuild,v 1.4 2012/07/29 17:18:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r4.ebuild,v 1.5 2013/06/17 14:41:03 pinkbyte Exp $
 
 EAPI=4
-inherit eutils autotools
+inherit eutils autotools user
 
 IUSE="clamav ssl transparent"
 
@@ -49,7 +49,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install
+	emake DESTDIR="${D}" install
 
 	keepdir /var/run/frox
 	keepdir /var/spool/frox
@@ -70,15 +70,15 @@ src_install() {
 	mv doc/frox.conf.man doc/frox.conf.man.8
 	doman doc/frox.man.8 doc/frox.conf.man.8
 
-	newinitd ${FILESDIR}/frox.rc frox
+	newinitd "${FILESDIR}"/frox.rc frox
 
 	cd src
-	epatch ${FILESDIR}/config-${PV}.patch || die "config patch failed"
+	epatch "${FILESDIR}/config-${PV}.patch"
 
-	cp frox.conf ${D}/etc/frox.conf.example
+	cp frox.conf "${D}/etc/frox.conf.example"
 	if use clamav ; then
 		sed -i \
 		  -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \
-			${D}/etc/frox.conf.example || die
+			"${D}/etc/frox.conf.example" || die
 	fi
 }
diff --git a/net-ftp/frox/frox-0.7.18-r5.ebuild b/net-ftp/frox/frox-0.7.18-r5.ebuild
index 072f0a9d816d..c1e08ee47806 100644
--- a/net-ftp/frox/frox-0.7.18-r5.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r5.ebuild,v 1.1 2013/06/17 14:36:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r5.ebuild,v 1.2 2013/06/17 14:41:03 pinkbyte Exp $
 
 EAPI=5
 
-inherit autotools eutils
+inherit autotools eutils user
 
 DESCRIPTION="A transparent ftp proxy"
 SRC_URI="http://frox.sourceforge.net/download/${P}.tar.bz2"