Fix typo in manpage, #407923 & http://sourceforge.net/tracker/?func=detail&aid=3034084&group_id=101612&atid=630103 ; import some patches from debian, including moving default encoding to utf8

Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64

5 files changed, 99 insertions, 5 deletions

diff --git a/app-misc/detox/ChangeLog b/app-misc/detox/ChangeLog
index a00b1d0ae55a..5cf0b55e06e2 100644
--- a/app-misc/detox/ChangeLog
+++ b/app-misc/detox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/detox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/ChangeLog,v 1.27 2012/02/15 18:41:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/detox/ChangeLog,v 1.28 2012/03/25 09:14:54 jlec Exp $
+
+*detox-1.2.0-r2 (25 Mar 2012)
+
+  25 Mar 2012; Justin Lecher <jlec@gentoo.org> +detox-1.2.0-r2.ebuild,
+  +files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch,
+  +files/detox-1.2.0-install-missing-file.patch:
+  Fix typo in manpage, #407923 &
+  http://sourceforge.net/tracker/?func=detail&aid=3034084&group_id=101612&atid=
+  630103 ; import some patches from debian, including moving default encoding
+  to utf8
 
 *detox-1.2.0-r1 (15 Feb 2012)
 
diff --git a/app-misc/detox/Manifest b/app-misc/detox/Manifest
index de8c9cb27d53..1f616b684238 100644
--- a/app-misc/detox/Manifest
+++ b/app-misc/detox/Manifest
@@ -2,16 +2,19 @@
 Hash: SHA512
 
 AUX detox-1.2.0-LDFLAGS.patch 501 RMD160 37964fa86b90b28536366d3d470bd4a079b0f56b SHA1 cc259b72899b129752b0a8f2e9ed77b70f6b6f0b SHA256 81302dfb3e792686cb467d7e5889e7c871df927f12770beb4703b713263a1bdc
+AUX detox-1.2.0-change-default-sequence-to-use-utf8-table.patch 379 RMD160 a958e34e7488b9a94c3f9b69e486d863b7e958de SHA1 f7ca46d0a0c91886c878f6a5bbc9272218365586 SHA256 0312a07812d9cacf836b7270ac00248014cb80a8483654dd8c2f8da03378448b
+AUX detox-1.2.0-install-missing-file.patch 642 RMD160 33f51ab4f13a052498a48400c14e5dbe1cf48fa4 SHA1 d862072f1cc4aee1e25c0315abb3861fbbd3fd67 SHA256 8efdebceceaecd3f543595a2ac1ff362232f92397a70bd6d2046d5128f826e81
 AUX detox-1.2.0-parallel.patch 1120 RMD160 fb5461ed985a8018347598cd04841cb8fbf52b99 SHA1 bfc081ae0f73ff0fb14646a428995c1cec281b76 SHA256 a5e06bf299e127e172f4cd58937b9e20f746313e15d4b0ff5e1d03cce3f509c4
 DIST detox-1.2.0.tar.bz2 86118 RMD160 02eb1a5ebc28f6f6e024d58b998758d156002a70 SHA1 cfb88a1adefaf4ee3933baf9a6530c102baa47ce SHA256 abfad90ee7d3e0fc53ce3b9da3253f9a800cdd92e3f8cc12a19394a7b1dcdbf8
 EBUILD detox-1.2.0-r1.ebuild 854 RMD160 2a4610b34bd95d3c53daf4e900654410cf412f29 SHA1 ab3e879f7e8bbb958a52ffc801626205f1a2e3c2 SHA256 b1004f7dbdb570e00e246cd2ef3b6a2e6a15b092f523c531136e968ee7582fd0
+EBUILD detox-1.2.0-r2.ebuild 1041 RMD160 a80aaf7398c2e66446109ffbc294560148f58ba4 SHA1 cf9347cb3010f6d2014b24e9c58b4ac651b128e1 SHA256 a3fe3e6e4986d94e4738e446634ff2421948275d6b0036df5a38bba2f5905e41
 EBUILD detox-1.2.0.ebuild 933 RMD160 0dd805f419c3bec168984098355c6d43e783b3bb SHA1 e2a3fbff0ab0813d743dc007596ad867ee67bc64 SHA256 8abc21b7c7ecce86663089bed123e1c62ac7012c42cbe0be17b356ee9520f6e3
-MISC ChangeLog 3870 RMD160 f1bfdf6a66c619f4e86f0e71dcd1aa9819a567a0 SHA1 247771468b8bac67f91f5bb6bbe7cd8ad174a609 SHA256 6fc5a948b5f12c47aed10660b1d550e2ede6cab666893eb5c8cdb407e9e7fbee
+MISC ChangeLog 4293 RMD160 9e86b0d9b42b55c96115b34068a8d12e781dd91a SHA1 5fc5e90c874c134f64c55490370507b2e96380ec SHA256 e9d71cec779408ff9544728af2b00389b26c28fa42e33b67b5d5b4086f7de4b3
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk87/G0ACgkQgAnW8HDreRasHACg0JvtrNQ44SJgCNLnpptku8PI
-bHMAoJjPd9/9AmSnw1tsEKiIuAINQ5dN
-=BEm5
+iEYEAREKAAYFAk9u4hMACgkQgAnW8HDreRYt8wCfV8bWBrB8ua6eDtPqic7iq28o
+WHwAnRvcFv8bZ+yHCsGQgeruDW8lqZVn
+=nxqd
 -----END PGP SIGNATURE-----
diff --git a/app-misc/detox/detox-1.2.0-r2.ebuild b/app-misc/detox/detox-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..6002b6e0949a
--- /dev/null
+++ b/app-misc/detox/detox-1.2.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/03/25 09:14:54 jlec Exp $
+
+EAPI=4
+
+inherit base
+
+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 ~sparc ~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
+	)
+
+src_prepare() {
+	sed \
+		-e 's:Fl c Ar:Fl f Ar:g' \
+		-i ${PN}.1 || die
+	base_src_prepare
+	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-change-default-sequence-to-use-utf8-table.patch b/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch
new file mode 100644
index 000000000000..2e54642f45b9
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-change-default-sequence-to-use-utf8-table.patch
@@ -0,0 +1,17 @@
+# Patch from Teemu Likonen <tlikonen@iki.fi>
+# to change the default sequence to use utf8 instead of iso8859-1
+--- detox-1.2.0/detoxrc~	2006-07-03 19:45:54.000000000 +0300
++++ detox-1.2.0/detoxrc	2009-05-28 15:34:26.497832449 +0300
+@@ -32,10 +32,10 @@
+ #
+ 
+ #
+-# Basically just ISO8859_1
++# Basically just utf_8
+ #
+ sequence default {
+-	iso8859_1;
++	utf_8;
+ 	safe;
+ 	wipeup;
+ };
diff --git a/app-misc/detox/files/detox-1.2.0-install-missing-file.patch b/app-misc/detox/files/detox-1.2.0-install-missing-file.patch
new file mode 100644
index 000000000000..97863268bc48
--- /dev/null
+++ b/app-misc/detox/files/detox-1.2.0-install-missing-file.patch
@@ -0,0 +1,18 @@
+# Patch by Nelson A. de Oliveira <naoliv@debian.org>
+#
+# Patch upstream Makefile to install missing safe.tbl (#566785)
+
+--- detox-1.2.0/Makefile.in	2010-06-20 23:41:34.000000000 -0300
++++ detox-1.2.0/Makefile.in	2010-06-20 23:42:34.000000000 -0300
+@@ -147,6 +147,11 @@
+ 	else \
+ 		echo "${DESTDIR}${datadir}/detox/unicode.tbl exists, skipping"; \
+ 	fi
++	@if [ ! -f ${DESTDIR}${datadir}/detox/safe.tbl ]; then \
++		${INSTALL} -m 644 safe.tbl ${DESTDIR}${datadir}/detox; \
++	else \
++		echo "${DESTDIR}${datadir}/detox/safe.tbl exists, skipping"; \
++	fi
+ 
+ install-unsafe-config: install-base
+ 	${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}