Make build format-security save, bug #521084; bump to EAPI=5; drop base.eclass usage

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

4 files changed, 145 insertions, 17 deletions

diff --git a/app-misc/detox/ChangeLog b/app-misc/detox/ChangeLog
index 2dc7344cb293..e7a8f6392268 100644
--- a/app-misc/detox/ChangeLog
+++ b/app-misc/detox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/detox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/ChangeLog,v 1.34 2015/06/09 11:38:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/ChangeLog,v 1.35 2015/06/23 07:11:07 jlec Exp $
+
+*detox-1.2.0-r3 (23 Jun 2015)
+
+  23 Jun 2015; Justin Lecher <jlec@gentoo.org> +detox-1.2.0-r3.ebuild,
+  +files/detox-1.2.0-format-security.patch:
+  Make build format-security save, bug #521084; bump to EAPI=5; drop base.eclass
+  usage
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index ae62f3605aa8..cd7fd282f0fb 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -3,28 +3,30 @@ Hash: SHA512
 
 AUX detox-1.2.0-LDFLAGS.patch 501 SHA256 81302dfb3e792686cb467d7e5889e7c871df927f12770beb4703b713263a1bdc SHA512 a3d59bef705d763be2831d03ccfef5fd69859a8e6f6900a1b6558135d2fa38a7844c16276bedab1b5af15f3e287cada615ea4c83f4c6737919c7c55daa7e55bf WHIRLPOOL cd092bbd4ee7781a901fb2d7dade8a530b433690389d9d021593fada96d2d5791fc31ba77e8bd37c23f3e0a314b744f77921ee4c20d72ba049f900ccb0b134c2
 AUX detox-1.2.0-change-default-sequence-to-use-utf8-table.patch 379 SHA256 0312a07812d9cacf836b7270ac00248014cb80a8483654dd8c2f8da03378448b SHA512 8804afdb7a5b37b01d2e16d68ae2e7b381cdfe75fd10de7a20388079bce9f137765e11b4e1d8d4cdabc6e521af7deb3309d84e42308e4c9108edb9537cb2706e WHIRLPOOL 29599d9234dab852a76c63b3f6afb57809e7970dfcbd9144cb87fcf98b62a3fd501fe998cf8ad4f32452e2968e1b837b8b35d6548fdcb51c91afc6573b3223b1
+AUX detox-1.2.0-format-security.patch 1964 SHA256 3765b9e74768caa47a94b60e3b5144affc41b89956b1f76056929bf97aa20554 SHA512 c0ce9ac00500399a28bc4d2bc4dff5c20386817d154c2185ebf29df1544ff400199d2884139f7f68c3f5e260d1742877f0b8b53787d8a585f9ff04028f878a2a WHIRLPOOL 0cb4ae947394d23bcb9c3a0f2020e6c965f91a0411f683c613fc6f2d7db7d9779df0c86badea6c65260aca6f20b10ef276b99d78f0e7e36ae68dada87b190322
 AUX detox-1.2.0-install-missing-file.patch 642 SHA256 8efdebceceaecd3f543595a2ac1ff362232f92397a70bd6d2046d5128f826e81 SHA512 32f83f700a508729c27941ae627c544dd2ba1900a647285d4160038e69dbad8f1205c5056daa9c5c19a56a70a6e528db187a59d56dfcfee7d772eb0fd809d087 WHIRLPOOL e888676013fa249425a563fa30568459baf6ad06448150a02a1c9491847a359ae1a9542c923c52f05c90a02ca759c592520ddb12cc9b7e9833b1f7be8af1ec94
 AUX detox-1.2.0-parallel.patch 1120 SHA256 a5e06bf299e127e172f4cd58937b9e20f746313e15d4b0ff5e1d03cce3f509c4 SHA512 5a9c964cd46a1cd4463460a400226a80a9c1705bd60655362ca02950a06acacbafed1c039793eb6445988e91a47888dbf1c643bf8c34003e7c34a02398f58855 WHIRLPOOL d950af36e5462144e6cb51c260560d4c9417c6659dfa21fd39e2aeeb29cfd396a432bd3dc20acd1345a853726163d17a681e637a5fb118ccf425912f8a20dd9b
 DIST detox-1.2.0.tar.bz2 86118 SHA256 abfad90ee7d3e0fc53ce3b9da3253f9a800cdd92e3f8cc12a19394a7b1dcdbf8 SHA512 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a WHIRLPOOL f8169f10e1713e3b2fd3ea736b22d0c024d6698bb2e80c30124bbf70be0afb764d496df5fba4f5b68383327590b2c90dd0ebb2481c0b62859ceb26a820265657
 EBUILD detox-1.2.0-r2.ebuild 1034 SHA256 d8bbfb3798b40b46d83fbe95d483a48193c8292145589fd2f4b0cdfd056c300f SHA512 953074e01cf33107fc58fbbde5f061c9a44bb653573ba19109e0a16575d3c3492ead9f55974f3f8c7357f8acb11e802805d69823726cc041774df9d1a3105168 WHIRLPOOL 120b9f062919981c22b09250aaebcd1d0c12453900e0ad54b6f2e56e59c3915a483813b84c80a0e623d0006b0080e72aeae2e9a0fa1064120a90a634e41091f3
-MISC ChangeLog 4962 SHA256 f5ae73c2d2e1c5fc82488aa00048d1429f418a405c41d1c0a00871f0ec31ca9f SHA512 2379ca7cbde7612bc11c24c183e339996020eacd65b94e7e4ae790a205f3d8f647bbcdcbf04e41a7af5cdfe816cf0e7edf3c5e36c5dcec658afcfb3e4f54fe68 WHIRLPOOL b1c6f47ab69721d8e58533630037185b83e9c5b2b35c41578de2199756fcd51ca73902f59918d200d8883f05a76677958aef9d81857cc69669ace30adbfae192
+EBUILD detox-1.2.0-r3.ebuild 1084 SHA256 c82bf2e94b84a393120c616dac4f95b45a955e4b11ca3db66d0eb9423b7e35e8 SHA512 8ebdcddf2f76598b64717312eba678a2ee0f2269e5ef04cf3454f1243efad17c8d4369d02af95b1da1aa42ef9a91c64c32d533bc6306ce13025553d977fc76e7 WHIRLPOOL 28c8bace5e22a24bd4f94c119c40c5f71bb71dc9e300ee575374a2255f9254ee4005a58dd82be8c6772396dec829b214a3fdcb81e16d9ddaf0379d8b3fe73ac3
+MISC ChangeLog 5198 SHA256 5ed4dd0054ef5ff2a761c4b3490451f0fbafe293c298c51eca3a435805b3ec50 SHA512 89ac9b4f34a96a919b8aef4f72a71cb395f4d0a0bdbbd8c78a2e66c7e60f07d1f08352add0662184cf7a3e036cd7dc42c572dd2c1fe2853731438d259a1f9489 WHIRLPOOL ce743580fab3eee1e7487e44564d441db5687f79f177e0433fb96a8066af2dc2a12220d0feb6af692a2e18adac2c43b1c67a2a0cd33fb3d1ed1ace7ea94cbf26
 MISC metadata.xml 240 SHA256 c311d60c5a3ad52c17d7950d8fdc76dba6ecfa724817d29a04339825d1532d60 SHA512 82a6a21b5898b8947a06e5c7eba2de513319d8e07e9617f6d71ff458ffc6a7c545e814578436a61ae7898da6fa9423584bfa7bc2d9cf4a7c31ff8c1403ddf55e WHIRLPOOL f8c4ba03a939f13e61cf708fe735d863bb48b5c0c191ddcbe32b31578da2b74c1a8f282c86e40404a2d275827a31b832f02ed22563de49a325d528c02722da28
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVdtBKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJViQaMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmix5kQALoyy2kztsKOGa4hdCNp8DZz
-ARYtdunrI5PqPc5fa/uQ7CS6kQ5KuI0ms+kku3cDMGxgY1tnR2aXrioEMl1Qu+Zp
-j0K9nzt6MwuW0O3pwr70LCnHaZbG4uRF3ygeJrDe2hvt8zjvINxeo/8ZOl0Wrntx
-3QQ8aZOGcz7zj58T7+Lzh2ROyqHsuxJas0jYrvr+BZlSgSgQzCO8yM05f0SLZaJB
-d6XgCPPdTGRNrqF6iZXNTXmLFjqWBDwn9mlVzXy/3iWh1pg+ezB93Y6OjprA+dJI
-1id8JIHziEC0PGMvWTQdQMrpfbospfkLVqk0kgox7ug/76iYOhk6YXijg9QVV3PH
-NtJubQH9RshqEy1ix4jafvX5aNb92kB0yQBFeqo3UQGzlDxxK5DNCG9dWJJwHUkK
-3+lUlQsMwWiv2CgpyAtzWtQXb8dczSj7Q5ZNgYq+3fRRQlHjwS/i7rhFx3I1i7Xe
-oWMs68ZEdkBI1qPZZ/84Wnu3ohIRmXpSlRMC74eTZXj2kbDVHQsGiYw9oiUlzVLc
-vNRjSj4CwjLZxjTlKUPqS8Oes/0YyNAH1Nn+RNyWwcMsRnmAW7mdF/UnSmZOENfw
-YNpKAFnXVskfE2ZCOuYxLEGLsUO4yxzcYMoMVUqU8J8BMfQ5IGIg9TqL7KU6nQyU
-40FGnYzGJ93XLgYU9nP0
-=5TfE
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5/EQAJ9/w6PsB1LSNzoHXGnElbEa
+veRz+5XskOmLMmp67cXm2EXIvuQLVj+CLTouxQoUCD5ipSPXxI7p5rppIFdx5tDh
+bPN9cBu/8kvKzOoI2bY6Yi17y75w8Cvb42y/b0suu35LV3nWROeoImuwzVV5wQre
+4QHIl2mVUDhj3DnTpuwWDRGnYH5fnjBZnLUXE+8MsReovZDAQhE/9pL9/0CN1jsL
+pjMpWDl9SHQNGhdPUY4M9cXqilN/4UTUKiTiYRltfRGuREYmKafc33qOyT/bk2nH
+h8UeVj+3xGwDx7x9UjKgvFjkrO6CuEdi0gH/gwhLJNdYUcRYxh0cm8o7JVtFHDJ2
+sDRsV3af5Oc/J2AM0C+ErFm6JNz1AW9r6LetbPNB6HdfJeaXMSpwgQAssbfYCi2V
+hKslGNQWdDNHjB+iuAcCeSkReJEcf4bBXWQY5pwIY63dYhZLIRwazthJzv+/rkiT
+96v8gV38WsPqXv5PLOIgGkX473Skzfwb4iy4lgUq55e/IiY3C9n0GFRd2i8+8zWD
+ufLZQJOx+sp9vjKgnWMkzmyXTAFWXToPekAwFm6tO/+EL2H8yxo8K6E+unmjxdnX
+eu1E+mm/EX0W7BOinnxUGfZ+oSioxomtfxafw8m/W9uAY5XlDl7Ys4XSKWnmk6CX
+cy7UMo/m+ekA2IAeRQ2b
+=FGXL
 -----END PGP SIGNATURE-----
diff --git a/app-misc/detox/detox-1.2.0-r3.ebuild b/app-misc/detox/detox-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..ed46ceaa2657
--- /dev/null
+++ b/app-misc/detox/detox-1.2.0-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/detox-1.2.0-r3.ebuild,v 1.1 2015/06/23 07:11:07 jlec Exp $
+
+EAPI=5
+
+inherit eutils
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Safely remove spaces and strange characters from filenames"
+HOMEPAGE="http://detox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-parallel.patch
+	"${FILESDIR}"/${P}-LDFLAGS.patch
+	"${FILESDIR}"/${P}-change-default-sequence-to-use-utf8-table.patch
+	"${FILESDIR}"/${P}-install-missing-file.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	)
+
+src_prepare() {
+	sed \
+		-e 's:Fl c Ar:Fl f Ar:g' \
+		-i ${PN}.1 || die
+	epatch "${PATCHES[@]}"
+	sed \
+		-e '/detoxrc.sample/d' \
+		-i Makefile.in || die
+}
+
+src_configure() {
+	econf --with-popt="${EPREFIX}/usr"
+}
diff --git a/app-misc/detox/files/detox-1.2.0-format-security.patch b/app-misc/detox/files/detox-1.2.0-format-security.patch
new file mode 100644
index 000000000000..c03a98aa046c
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-format-security.patch
@@ -0,0 +1,72 @@
+ parse_options_getopt.c | 8 ++++----
+ parse_options_popt.c   | 8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/parse_options_getopt.c b/parse_options_getopt.c
+index 1f80966..ea2b266 100644
+--- a/parse_options_getopt.c
++++ b/parse_options_getopt.c
+@@ -98,9 +98,9 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
+ #endif
+ 		switch (optcode) {
+ 			case 'h':
+-				printf(usage_message);
++				printf("%s", usage_message);
+ 				printf("\n");
+-				printf(help_message);
++				printf("%s", help_message);
+ 				exit(EXIT_SUCCESS);
+ 
+ 			case 'f':
+@@ -138,7 +138,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
+ 				exit(EXIT_SUCCESS);
+ 
+ 			case '?':
+-				printf(usage_message);
++				printf("%s", usage_message);
+ 				exit(EXIT_SUCCESS);
+ 
+ 			case 0:
+@@ -195,7 +195,7 @@ struct detox_options *parse_options_getopt(int argc, char **argv)
+ 	}
+ 	else {
+ #ifndef INLINE_MODE
+-		printf(usage_message);
++		printf("%s", usage_message);
+ 		exit(EXIT_FAILURE);
+ #endif
+ 	}
+diff --git a/parse_options_popt.c b/parse_options_popt.c
+index 60dad7a..370c3cc 100644
+--- a/parse_options_popt.c
++++ b/parse_options_popt.c
+@@ -94,9 +94,9 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
+ 	while ((c = poptGetNextOpt(optCon)) >= 0) {
+ 		switch (c) {
+ 			case 'h':
+-				printf(usage_message);
++				printf("%s", usage_message);
+ 				printf("\n");
+-				printf(help_message);
++				printf("%s", help_message);
+ 				exit(EXIT_SUCCESS);
+ 
+ 			case 'f':
+@@ -142,7 +142,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
+ 				break;
+ 
+ 			case '?':
+-				printf(usage_message);
++				printf("%s", usage_message);
+ 				exit(EXIT_SUCCESS);
+ 
+ 		}
+@@ -177,7 +177,7 @@ struct detox_options *parse_options_popt(int argc, const char **argv)
+ 
+ #ifndef INLINE_MODE
+ 	if (i == 0) {
+-		fprintf(stderr, usage_message);
++		fprintf(stderr, "%s", usage_message);
+ 		exit(EXIT_FAILURE);
+ 	}
+ #endif