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

(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)

4 files changed, 92 insertions, 1 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/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}